Only display folder name for more than one workspace folder scenario

microsoft · Jul 11, 2022 · c24cb01 · c24cb01
1 parent 1dc6bc6
commit c24cb01
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/client/application/diagnostics/checks/pythonInterpreter.ts b/src/client/application/diagnostics/checks/pythonInterpreter.ts
@@ -48,11 +48,15 @@ export class InvalidPythonInterpreterDiagnostic extends BaseDiagnostic {
         scope = DiagnosticScope.WorkspaceFolder,
     ) {
         let formatArg = '';
-        if (workspaceService.workspaceFile) {
+        if (
+            workspaceService.workspaceFile &&
+            workspaceService.workspaceFolders &&
+            workspaceService.workspaceFolders?.length > 1
+        ) {
             // Specify folder name in case of multiroot scenarios
             const folder = workspaceService.getWorkspaceFolder(resource);
             if (folder) {
-                formatArg = ` for ${path.basename(folder.uri.fsPath)}`;
+                formatArg = ` ${localize('Common.for', 'for')} ${path.basename(folder.uri.fsPath)}`;
             }
         }
         super(code, messages[code].format(formatArg), DiagnosticSeverity.Error, scope, resource, undefined, 'always');