bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'editors/code/src/ctx.ts')
-rw-r--r--editors/code/src/ctx.ts11
1 files changed, 9 insertions, 2 deletions
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index e55754fb9f..a7b7be03b5 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -125,7 +125,7 @@ export class Ctx implements RustAnalyzerExtensionApi {
extCtx.subscriptions.push(this);
this.version = extCtx.extension.packageJSON.version ?? "<unknown>";
this._serverVersion = "<not running>";
- this.config = new Config(extCtx.subscriptions);
+ this.config = new Config(extCtx);
this.statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
this.updateStatusBarVisibility(vscode.window.activeTextEditor);
this.statusBarActiveEditorListener = vscode.window.onDidChangeActiveTextEditor((editor) =>
@@ -150,6 +150,13 @@ export class Ctx implements RustAnalyzerExtensionApi {
});
}
+ async addConfiguration(
+ extensionId: string,
+ configuration: Record<string, unknown>,
+ ): Promise<void> {
+ await this.config.addExtensionConfiguration(extensionId, configuration);
+ }
+
dispose() {
this.config.dispose();
this.statusBar.dispose();
@@ -230,7 +237,7 @@ export class Ctx implements RustAnalyzerExtensionApi {
debug: run,
};
- let rawInitializationOptions = vscode.workspace.getConfiguration("rust-analyzer");
+ let rawInitializationOptions = this.config.cfg;
if (this.workspace.kind === "Detached Files") {
rawInitializationOptions = {