Fix issue with settings changes not handled properly in multiroot (#10458)

Author: Colengms

Extension/src/LanguageServer/client.ts

@@ -38,7 +38,7 @@ import { createProtocolFilter } from './protocolFilter';
 import { DataBinding } from './dataBinding';
 import minimatch = require("minimatch");
 import { updateLanguageConfigurations, CppSourceStr, clients } from './extension';
-import { SettingsTracker, getTracker } from './settingsTracker';
+import { SettingsTracker } from './settingsTracker';
 import { getTestHook, TestHook } from '../testHook';
 import { getCustomConfigProviders, CustomConfigurationProvider1, isSameProviderExtensionId } from '../LanguageServer/customProviders';
 import * as fs from 'fs';
@@ -1083,7 +1083,7 @@ export class DefaultClient implements Client {
         }
         this.storagePath = storagePath;
         const rootUri: vscode.Uri | undefined = this.RootUri;
-        this.settingsTracker = getTracker(rootUri);
+        this.settingsTracker = new SettingsTracker(rootUri);
 
         try {
             let isFirstClient: boolean = false;

Extension/src/LanguageServer/settingsTracker.ts

@@ -14,7 +14,6 @@ type FilterFunction = (key: string, val: string, settings: vscode.WorkspaceConfi
 type KeyValuePair = { key: string; value: string };
 
 const maxSettingLengthForTelemetry: number = 50;
-let cache: SettingsTracker;
 
 export class SettingsTracker {
     private previousCppSettings: { [key: string]: any } = {};
@@ -207,10 +206,3 @@ export class SettingsTracker {
         return value1 === value2;
     }
 }
-
-export function getTracker(resource: vscode.Uri | undefined): SettingsTracker {
-    if (!cache) {
-        cache = new SettingsTracker(resource);
-    }
-    return cache;
-}