Refactor

microsoft · Mar 28, 2023 · 2201f39 · 2201f39
1 parent 606d501
commit 2201f39
Showing 1 changed file with 18 additions and 32 deletions.
diff --git a/src/client/application/diagnostics/checks/pythonInterpreter.ts b/src/client/application/diagnostics/checks/pythonInterpreter.ts
@@ -76,15 +76,13 @@ export class InvalidPythonInterpreterDiagnostic extends BaseDiagnostic {
     }
 }
 
+type DefaultShellDiagnostics =
+    | DiagnosticCodes.InvalidComspecDiagnostic
+    | DiagnosticCodes.IncompletePathVarDiagnostic
+    | DiagnosticCodes.DefaultShellErrorDiagnostic;
+
 export class DefaultShellDiagnostic extends BaseDiagnostic {
-    constructor(
-        code:
-            | DiagnosticCodes.InvalidComspecDiagnostic
-            | DiagnosticCodes.IncompletePathVarDiagnostic
-            | DiagnosticCodes.DefaultShellErrorDiagnostic,
-        resource: Resource,
-        scope = DiagnosticScope.Global,
-    ) {
+    constructor(code: DefaultShellDiagnostics, resource: Resource, scope = DiagnosticScope.Global) {
         super(code, messages[code], DiagnosticSeverity.Error, scope, resource, undefined, 'always');
     }
 }
@@ -106,6 +104,7 @@ export class InvalidPythonInterpreterService extends BaseDiagnosticsService
                 DiagnosticCodes.InvalidPythonInterpreterDiagnostic,
                 DiagnosticCodes.InvalidComspecDiagnostic,
                 DiagnosticCodes.IncompletePathVarDiagnostic,
+                DiagnosticCodes.DefaultShellErrorDiagnostic,
             ],
             serviceContainer,
             disposableRegistry,
@@ -262,35 +261,22 @@ export class InvalidPythonInterpreterService extends BaseDiagnosticsService
 
     private getCommandPrompts(diagnostic: IDiagnostic): { prompt: string; command?: IDiagnosticCommand }[] {
         const commandFactory = this.serviceContainer.get<IDiagnosticsCommandFactory>(IDiagnosticsCommandFactory);
-        if (diagnostic.code === DiagnosticCodes.InvalidComspecDiagnostic) {
-            return [
-                {
-                    prompt: Common.seeInstructions,
-                    command: commandFactory.createCommand(diagnostic, {
-                        type: 'launch',
-                        options: 'https://aka.ms/AAk3djo',
-                    }),
-                },
-            ];
-        }
-        if (diagnostic.code === DiagnosticCodes.IncompletePathVarDiagnostic) {
-            return [
-                {
-                    prompt: Common.seeInstructions,
-                    command: commandFactory.createCommand(diagnostic, {
-                        type: 'launch',
-                        options: 'https://aka.ms/AAk744c',
-                    }),
-                },
-            ];
-        }
-        if (diagnostic.code === DiagnosticCodes.DefaultShellErrorDiagnostic) {
+        if (
+            diagnostic.code === DiagnosticCodes.InvalidComspecDiagnostic ||
+            diagnostic.code === DiagnosticCodes.IncompletePathVarDiagnostic ||
+            diagnostic.code === DiagnosticCodes.DefaultShellErrorDiagnostic
+        ) {
+            const links: Record<DefaultShellDiagnostics, string> = {
+                InvalidComspecDiagnostic: 'https://aka.ms/AAk3djo',
+                IncompletePathVarDiagnostic: 'https://aka.ms/AAk744c',
+                DefaultShellErrorDiagnostic: 'https://aka.ms/AAk7qix',
+            };
             return [
                 {
                     prompt: Common.seeInstructions,
                     command: commandFactory.createCommand(diagnostic, {
                         type: 'launch',
-                        options: 'https://aka.ms/AAk7qix',
+                        options: links[diagnostic.code],
                     }),
                 },
             ];