bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'editors/code/src/config.ts')
-rw-r--r--editors/code/src/config.ts29
1 files changed, 8 insertions, 21 deletions
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 1931cfe381..ca77215004 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -4,13 +4,14 @@ import * as path from "path";
import * as vscode from "vscode";
import { type Env, log, unwrapUndefinable, expectNotUndefined } from "./util";
import type { JsonProject } from "./rust_project";
+import type { Disposable } from "./ctx";
export type RunnableEnvCfgItem = {
mask?: string;
env: Record<string, string>;
platform?: string | string[];
};
-export type RunnableEnvCfg = undefined | Record<string, string> | RunnableEnvCfgItem[];
+export type RunnableEnvCfg = Record<string, string> | RunnableEnvCfgItem[];
export class Config {
readonly extensionId = "rust-lang.rust-analyzer";
@@ -29,22 +30,9 @@ export class Config {
(opt) => `${this.rootSection}.${opt}`,
);
- readonly package: {
- version: string;
- releaseTag: string | null;
- enableProposedApi: boolean | undefined;
- } = vscode.extensions.getExtension(this.extensionId)!.packageJSON;
-
- readonly globalStorageUri: vscode.Uri;
-
- constructor(ctx: vscode.ExtensionContext) {
- this.globalStorageUri = ctx.globalStorageUri;
+ constructor(disposables: Disposable[]) {
this.discoveredWorkspaces = [];
- vscode.workspace.onDidChangeConfiguration(
- this.onDidChangeConfiguration,
- this,
- ctx.subscriptions,
- );
+ vscode.workspace.onDidChangeConfiguration(this.onDidChangeConfiguration, this, disposables);
this.refreshLogging();
this.configureLanguage();
}
@@ -55,7 +43,10 @@ export class Config {
private refreshLogging() {
log.setEnabled(this.traceExtension ?? false);
- log.info("Extension version:", this.package.version);
+ log.info(
+ "Extension version:",
+ vscode.extensions.getExtension(this.extensionId)!.packageJSON.version,
+ );
const cfg = Object.entries(this.cfg).filter(([_, val]) => !(val instanceof Function));
log.info("Using configuration", Object.fromEntries(cfg));
@@ -277,10 +268,6 @@ export class Config {
return this.get<string[]>("runnables.problemMatcher") || [];
}
- get cargoRunner() {
- return this.get<string | undefined>("cargoRunner");
- }
-
get testExplorer() {
return this.get<boolean | undefined>("testExplorer");
}