From 46c7dd54a8812f6a7291909b69f63f984c639558 Mon Sep 17 00:00:00 2001 From: Colen Garoutte-Carson Date: Thu, 19 Dec 2024 15:00:13 -0800 Subject: [PATCH 1/2] Don't reset everyones databases --- Extension/src/LanguageServer/client.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts index 47e5d2821..64dcdce95 100644 --- a/Extension/src/LanguageServer/client.ts +++ b/Extension/src/LanguageServer/client.ts @@ -1385,6 +1385,9 @@ export class DefaultClient implements Client { let filesEncodingChanged: boolean = false; if (workspaceFolder) { const lastFilesEncoding: PersistentFolderState = new PersistentFolderState("CPP.lastFilesEncoding", "", workspaceFolder); + if (lastFilesEncoding.Value === "") { + lastFilesEncoding.Value = filesEncoding; + } filesEncodingChanged = lastFilesEncoding.Value !== filesEncoding; } const result: WorkspaceFolderSettingsParams = { @@ -1520,6 +1523,9 @@ export class DefaultClient implements Client { } const workspaceFallbackEncoding: string = workspaceOtherSettings.filesEncoding; const lastWorkspaceFallbackEncoding: PersistentState = new PersistentState("CPP.lastWorkspaceFallbackEncoding", ""); + if (lastWorkspaceFallbackEncoding.Value === "") { + lastWorkspaceFallbackEncoding.Value = workspaceFallbackEncoding; + } const workspaceFallbackEncodingChanged = lastWorkspaceFallbackEncoding.Value !== workspaceFallbackEncoding; return { filesAssociations: workspaceOtherSettings.filesAssociations, From 450d2144af5c0be2cc199f216049a8e7d262598f Mon Sep 17 00:00:00 2001 From: Colen Garoutte-Carson Date: Thu, 19 Dec 2024 15:14:54 -0800 Subject: [PATCH 2/2] Address PR feedback --- Extension/src/LanguageServer/client.ts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts index 64dcdce95..ed807275a 100644 --- a/Extension/src/LanguageServer/client.ts +++ b/Extension/src/LanguageServer/client.ts @@ -1384,10 +1384,7 @@ export class DefaultClient implements Client { const filesEncoding: string = otherSettings.filesEncoding; let filesEncodingChanged: boolean = false; if (workspaceFolder) { - const lastFilesEncoding: PersistentFolderState = new PersistentFolderState("CPP.lastFilesEncoding", "", workspaceFolder); - if (lastFilesEncoding.Value === "") { - lastFilesEncoding.Value = filesEncoding; - } + const lastFilesEncoding: PersistentFolderState = new PersistentFolderState("CPP.lastFilesEncoding", filesEncoding, workspaceFolder); filesEncodingChanged = lastFilesEncoding.Value !== filesEncoding; } const result: WorkspaceFolderSettingsParams = { @@ -1522,10 +1519,7 @@ export class DefaultClient implements Client { void util.promptForReloadWindowDueToSettingsChange(); } const workspaceFallbackEncoding: string = workspaceOtherSettings.filesEncoding; - const lastWorkspaceFallbackEncoding: PersistentState = new PersistentState("CPP.lastWorkspaceFallbackEncoding", ""); - if (lastWorkspaceFallbackEncoding.Value === "") { - lastWorkspaceFallbackEncoding.Value = workspaceFallbackEncoding; - } + const lastWorkspaceFallbackEncoding: PersistentState = new PersistentState("CPP.lastWorkspaceFallbackEncoding", workspaceFallbackEncoding); const workspaceFallbackEncodingChanged = lastWorkspaceFallbackEncoding.Value !== workspaceFallbackEncoding; return { filesAssociations: workspaceOtherSettings.filesAssociations,