diff options
| -rw-r--r-- | editors/code/src/config.ts | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts index 30ff9784829..561b69f0100 100644 --- a/editors/code/src/config.ts +++ b/editors/code/src/config.ts @@ -11,9 +11,7 @@ export type RunnableEnvCfg = export class Config { readonly extensionId = "rust-lang.rust-analyzer"; - configureLang: - | { handle: vscode.Disposable; typingContinueCommentsOnNewline: boolean } - | undefined; + configureLang: vscode.Disposable | undefined; readonly rootSection = "rust-analyzer"; private readonly requiresReloadOpts = [ @@ -45,7 +43,7 @@ export class Config { } dispose() { - this.configureLang?.handle.dispose(); + this.configureLang?.dispose(); } private refreshLogging() { @@ -89,12 +87,8 @@ export class Config { */ private configureLanguage() { // Only need to dispose of the config if there's a change - if ( - this.configureLang && - this.typingContinueCommentsOnNewline !== - this.configureLang.typingContinueCommentsOnNewline - ) { - this.configureLang.handle.dispose(); + if (this.configureLang) { + this.configureLang.dispose(); this.configureLang = undefined; } @@ -167,12 +161,9 @@ export class Config { ]; } - this.configureLang = { - handle: vscode.languages.setLanguageConfiguration("rust", { - onEnterRules, - }), - typingContinueCommentsOnNewline: this.typingContinueCommentsOnNewline, - }; + this.configureLang = vscode.languages.setLanguageConfiguration("rust", { + onEnterRules, + }); } // We don't do runtime config validation here for simplicity. More on stackoverflow: |