hanyixuanten/vscode-cpptools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix settings not getting sent after add folder. (#5021)

Browse Source
This commit is contained in:
Sean McManus
2020-02-27 16:41:17 -08:00
committed by GitHub
parent 5567e3abd8
commit 8e7c8357ac
2 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Extension/src/LanguageServer/client.ts
+40 -34
View File
@@ -1138,44 +1138,50 @@ export class DefaultClient implements Client {
return new LanguageClient(`cpptools`, serverOptions, clientOptions);
}
public sendDidChangeSettings(): void {
let cppSettingsScoped: { [key: string]: any } = {};
// Gather the C_Cpp settings
{
let cppSettingsResourceScoped: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("C_Cpp", this.RootUri);
let cppSettingsNonScoped: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("C_Cpp");
for (let key in cppSettingsResourceScoped) {
let curSetting: any = util.packageJson.contributes.configuration.properties["C_Cpp." + key];
if (curSetting === undefined) {
continue;
}
let settings: vscode.WorkspaceConfiguration = (curSetting.scope === "resource" || curSetting.scope === "machine-overridable") ? cppSettingsResourceScoped : cppSettingsNonScoped;
cppSettingsScoped[key] = settings.get(key);
}
cppSettingsScoped["default"] = { systemIncludePath: cppSettingsResourceScoped.get("default.systemIncludePath") };
}
// Unlike the LSP message, the event does not contain all settings as a payload, so we need to
// build a new JSON object with everything we need on the native side.
let settings: any = {
C_Cpp: {
...cppSettingsScoped,
tabSize: vscode.workspace.getConfiguration("editor.tabSize", this.RootUri)
},
files: {
exclude: vscode.workspace.getConfiguration("files.exclude", this.RootUri)
},
search: {
exclude: vscode.workspace.getConfiguration("search.exclude", this.RootUri)
}
};
// Send settings json to native side
this.notifyWhenReady(() => {
this.languageClient.sendNotification(DidChangeSettingsNotification, {settings, workspaceFolderUri: this.RootPath});
});
}
public onDidChangeSettings(event: vscode.ConfigurationChangeEvent): { [key: string]: string } {
let changedSettings: { [key: string]: string };
this.sendDidChangeSettings();
this.notifyWhenReady(() => {
changedSettings = this.settingsTracker.getChangedSettings();
let cppSettingsScoped: { [key: string]: any } = {};
// Gather the C_Cpp settings
{
let cppSettingsResourceScoped: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("C_Cpp", this.RootUri);
let cppSettingsNonScoped: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("C_Cpp");
for (let key in cppSettingsResourceScoped) {
let curSetting: any = util.packageJson.contributes.configuration.properties["C_Cpp." + key];
if (curSetting === undefined) {
continue;
}
let settings: vscode.WorkspaceConfiguration = (curSetting.scope === "resource" || curSetting.scope === "machine-overridable") ? cppSettingsResourceScoped : cppSettingsNonScoped;
cppSettingsScoped[key] = settings.get(key);
}
cppSettingsScoped["default"] = { systemIncludePath: cppSettingsResourceScoped.get("default.systemIncludePath") };
}
// Unlike the LSP message, the event does not contain all settings as a payload, so we need to
// build a new JSON object with everything we need on the native side.
let settings: any = {
C_Cpp: {
...cppSettingsScoped,
tabSize: vscode.workspace.getConfiguration("editor.tabSize", this.RootUri)
},
files: {
exclude: vscode.workspace.getConfiguration("files.exclude", this.RootUri)
},
search: {
exclude: vscode.workspace.getConfiguration("search.exclude", this.RootUri)
}
};
// Send settings json to native side
this.languageClient.sendNotification(DidChangeSettingsNotification, {settings, workspaceFolderUri: this.RootPath});
let colorizationNeedsReload: boolean = event.affectsConfiguration("workbench.colorTheme")
|| event.affectsConfiguration("editor.tokenColorCustomizations");
Extension/src/LanguageServer/clientCollection.ts
+4
View File
@@ -166,6 +166,8 @@ export class ClientCollection {
let newClient: cpptools.Client = cpptools.createClient(this, folder);
this.languageClients.set(path, newClient);
newClient.deactivate(); // e.g. prevent the current config from switching.
let defaultClient: cpptools.DefaultClient = <cpptools.DefaultClient>newClient;
defaultClient.sendDidChangeSettings();
}
});
}
@@ -188,6 +190,8 @@ export class ClientCollection {
let newClient: cpptools.Client = cpptools.createClient(this, folder);
this.languageClients.set(key, newClient);
getCustomConfigProviders().forEach(provider => newClient.onRegisterCustomConfigurationProvider(provider));
let defaultClient: cpptools.DefaultClient = <cpptools.DefaultClient>newClient;
defaultClient.sendDidChangeSettings();
}
return this.languageClients.get(key);
}