Handle rejected scenario

Kartik Raj · Kartik Raj · commit 7b95c8669f07 · 2020-09-21T07:31:25.000-07:00
diff --git a/src/client/pythonEnvironments/base/info/interpreter.ts b/src/client/pythonEnvironments/base/info/interpreter.ts
@@ -26,7 +26,7 @@ export type InterpreterInformation = {
  * @param python - the path to the Python executable
  * @param raw - the information returned by the `interpreterInfo.py` script
  */
-export function extractPythonEnvInfo(python: string, raw: PythonEnvInfo): InterpreterInformation {
+function extractInterpreterInfo(python: string, raw: PythonEnvInfo): InterpreterInformation {
     const rawVersion = `${raw.versionInfo.slice(0, 3).join('.')}-${raw.versionInfo[3]}`;
     const version = parseVersion(rawVersion);
     version.sysVersion = raw.sysVersion;
@@ -89,5 +89,5 @@ export async function getInterpreterInfo(
     if (logger) {
         logger.info(`Found interpreter for ${argv}`);
     }
-    return extractPythonEnvInfo(python.pythonExecutable, json);
+    return extractInterpreterInfo(python.pythonExecutable, json);
 }
diff --git a/src/client/pythonEnvironments/info/environmentInfoService.ts b/src/client/pythonEnvironments/info/environmentInfoService.ts
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 import { injectable } from 'inversify';
+import { traceError } from '../../common/logger';
 import { createDeferred, Deferred } from '../../common/utils/async';
 import { createWorkerPool, IWorkerPool, QueuePosition } from '../../common/utils/workerPool';
 import { getInterpreterInfo, InterpreterInformation } from '../base/info/interpreter';
@@ -66,6 +67,10 @@ export class EnvironmentInfoService implements IEnvironmentInfoService {
                 this.cache.delete(interpreterPath);
             }
             return r;
+        }).catch((ex) => {
+            traceError('Fetching interpreter information failed with error', ex);
+            deferred.resolve(undefined);
+            return undefined;
         });
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`	`4`	`import { injectable } from 'inversify';`
	`5`	`+import { traceError } from '../../common/logger';`
`5`	`6`	`import { createDeferred, Deferred } from '../../common/utils/async';`
`6`	`7`	`import { createWorkerPool, IWorkerPool, QueuePosition } from '../../common/utils/workerPool';`
`7`	`8`	`import { getInterpreterInfo, InterpreterInformation } from '../base/info/interpreter';`
`@@ -66,6 +67,10 @@ export class EnvironmentInfoService implements IEnvironmentInfoService {`
`66`	`67`	`this.cache.delete(interpreterPath);`
`67`	`68`	`}`
`68`	`69`	`return r;`
	`70`	`+ }).catch((ex) => {`
	`71`	`+ traceError('Fetching interpreter information failed with error', ex);`
	`72`	`+ deferred.resolve(undefined);`
	`73`	`+ return undefined;`
`69`	`74`	`});`
`70`	`75`	`}`
`71`	`76`	`}`