Merge pull request #10728 from microsoft/main

Merge for 1.15.1
microsoft · Mar 22, 2023 · 42dfef3 · 42dfef3
2 parents 1ce1e9c + 10125df
commit 42dfef3
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 16 deletions.
diff --git a/Extension/.vscode/launch.json b/Extension/.vscode/launch.json
@@ -108,7 +108,7 @@
 			"request": "launch",
 			"runtimeExecutable": "${execPath}",
 			"args": [
-				"C:/git/Vcls-vscode-test/SingleRootProject",
+				"C:/git/Vcls-vscode-test/MultirootDeadlockTest/test.code-workspace",
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--extensionTestsPath=${workspaceFolder}/out/test/integrationTests/IntelliSenseFeatures/index"
 			],

diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
@@ -1,8 +1,9 @@
 # C/C++ for Visual Studio Code Changelog
 
-## Version 1.15.1: March 21, 2023
+## Version 1.15.1: March 22, 2023
 ### Bug Fixes
 * Fix crashes with a multiroot workspace. [#10636](https://github.com/microsoft/vscode-cpptools/issues/10636)
+* Fix a deadlock with a multiroot workspace. [#10719](https://github.com/microsoft/vscode-cpptools/issues/10719)
 
 ## Version 1.15.0: March 15, 2023
 ### Enhancements

diff --git a/Extension/src/LanguageServer/ui.ts b/Extension/src/LanguageServer/ui.ts
@@ -11,8 +11,6 @@ import { NewUI } from './ui_new';
 import { ReferencesCommandMode, referencesCommandModeToString } from './references';
 import { getCustomConfigProviders, CustomConfigurationProviderCollection, isSameProviderExtensionId } from './customProviders';
 import * as telemetry from '../telemetry';
-import { IExperimentationService } from 'tas-client';
-import { CppSettings } from './settings';
 
 nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
 const localize: nls.LocalizeFunc = nls.loadMessageBundle();
@@ -489,14 +487,8 @@ export async function getUI(): Promise<UI> {
 
 async function _getUI(): Promise<UI> {
     if (!ui) {
-        const experimentationService: IExperimentationService | undefined = await telemetry.getExperimentationService();
-        if (experimentationService !== undefined) {
-            const settings: CppSettings = new CppSettings();
-            const useNewUI: boolean | undefined = experimentationService.getTreatmentVariable<boolean>("vscode", "ShowLangStatBar");
-            ui = useNewUI || settings.experimentalFeatures ? new NewUI() : new OldUI();
-        } else {
-            ui = new NewUI();
-        }
+        const useNewUI: boolean = await telemetry.showLanguageStatusExperiment();
+        ui = useNewUI ? new NewUI() : new OldUI();
     }
     return ui;
 }
diff --git a/Extension/src/telemetry.ts b/Extension/src/telemetry.ts
@@ -6,6 +6,7 @@
 
 import TelemetryReporter from '@vscode/extension-telemetry';
 import { getExperimentationServiceAsync, IExperimentationService, IExperimentationTelemetry, TargetPopulation } from 'vscode-tas-client';
+import { CppSettings } from './LanguageServer/settings';
 import * as util from './common';
 
 interface IPackageInfo {
@@ -76,6 +77,15 @@ export function getExperimentationService(): Promise<IExperimentationService> |
     return initializationPromise;
 }
 
+export async function showLanguageStatusExperiment(): Promise<boolean> {
+    if (new CppSettings().experimentalFeatures) {
+        return true;
+    }
+    const experimentationService: IExperimentationService | undefined = await getExperimentationService();
+    const useNewUI: boolean | undefined = experimentationService?.getTreatmentVariable<boolean>("vscode", "ShowLangStatBar");
+    return useNewUI ?? false;
+}
+
 export async function deactivate(): Promise<void> {
     if (initializationPromise) {
         try {

diff --git a/Extension/test/integrationTests/IntelliSenseFeatures/inlayhints.test.ts b/Extension/test/integrationTests/IntelliSenseFeatures/inlayhints.test.ts
@@ -28,7 +28,7 @@ suite("[Inlay hints test]", function(): void {
     let referenceOperatorEnabledValue: any;
     let referenceOperatorShowSpaceValue: any;
     // Test setup
-    const rootUri: vscode.Uri = vscode.workspace.workspaceFolders[0].uri;
+    const rootUri: vscode.Uri = vscode.workspace.workspaceFolders[1].uri;
     const filePath: string | undefined = rootUri.fsPath + "/inlay_hints.cpp";
     const fileUri: vscode.Uri = vscode.Uri.file(filePath);
     const disposables: vscode.Disposable[] = [];

diff --git a/Extension/test/integrationTests/IntelliSenseFeatures/quickInfo.test.ts b/Extension/test/integrationTests/IntelliSenseFeatures/quickInfo.test.ts
@@ -12,7 +12,7 @@ import * as testHelpers from '../testHelpers';
 suite("[Quick info test]", function(): void {
     let cpptools: apit.CppToolsTestApi;
     const disposables: vscode.Disposable[] = [];
-    const filePath: string = vscode.workspace.workspaceFolders[0].uri.fsPath + "/quickInfo.cpp";
+    const filePath: string = vscode.workspace.workspaceFolders[1].uri.fsPath + "/quickInfo.cpp";
     const fileUri: vscode.Uri = vscode.Uri.file(filePath);
     let platform: string = "";
 

diff --git a/Extension/test/integrationTests/IntelliSenseFeatures/reference.test.ts b/Extension/test/integrationTests/IntelliSenseFeatures/reference.test.ts
@@ -11,7 +11,7 @@ import * as apit from 'vscode-cpptools/out/testApi';
 suite(`[Reference test]`, function(): void {
     let cpptools: apit.CppToolsTestApi;
     const disposables: vscode.Disposable[] = [];
-    const path: string = vscode.workspace.workspaceFolders[0].uri.fsPath + "/references.cpp";
+    const path: string = vscode.workspace.workspaceFolders[1].uri.fsPath + "/references.cpp";
     const fileUri: vscode.Uri = vscode.Uri.file(path);
     let testHook: apit.CppToolsTestHook;
     let getIntelliSenseStatus: any;

diff --git a/Extension/test/integrationTests/IntelliSenseFeatures/runTest.ts b/Extension/test/integrationTests/IntelliSenseFeatures/runTest.ts
@@ -12,7 +12,7 @@ async function main() {
         // Passed to --extensionTestsPath
         const extensionTestsPath = path.resolve(__dirname, './index');
 
-        // Note, when running tests locally, replace testWorkspace with local path to "~/Vcls-vscode-test/SingleRootProject"
+        // Note, when running tests locally, replace TESTS_WORKSPACE with local path to "~/Vcls-vscode-test/MultirootDeadlockTest/test.code-workspace"
         // in the Launch.json file.
         let testWorkspace: string | undefined = process.env.TESTS_WORKSPACE;
         if (!testWorkspace) {