language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-26 20:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Always reload onEnter configuration

Browse source 
Configuration reload doesn't happen often anyway,
and there will always be a set of onEnter rules to load
This commit is contained in:
DropDemBits 2023-02-10 14:55:17 -05:00
parent 992bafa773
commit c7bd3c682f
No known key found for this signature in database
GPG key ID: D550F8DFBB392533
1 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
editors/code/src/config.ts
View file

@ -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: