Merge remote-tracking branch 'upstream/master'

DonJayamanne · DonJayamanne · commit 4b30f2c42632 · 2017-11-21T16:36:37.000-08:00
* upstream/master: Resolve pythonPath before comparing it to shebang (#273)
diff --git a/src/client/interpreter/display/shebangCodeLensProvider.ts b/src/client/interpreter/display/shebangCodeLensProvider.ts
@@ -53,7 +53,9 @@ export class ShebangCodeLensProvider implements vscode.CodeLensProvider {
 
     private async createShebangCodeLens(document: TextDocument) {
         const shebang = await ShebangCodeLensProvider.detectShebang(document);
-        if (!shebang || shebang === settings.PythonSettings.getInstance(document.uri).pythonPath) {
+        const pythonPath = settings.PythonSettings.getInstance(document.uri).pythonPath;
+        const resolvedPythonPath = await ShebangCodeLensProvider.getFullyQualifiedPathToInterpreter(pythonPath);
+        if (!shebang || shebang === resolvedPythonPath) {
             return [];
         }
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,9 @@ export class ShebangCodeLensProvider implements vscode.CodeLensProvider {`
`53`	`53`
`54`	`54`	`private async createShebangCodeLens(document: TextDocument) {`
`55`	`55`	`const shebang = await ShebangCodeLensProvider.detectShebang(document);`
`56`		`- if (!shebang \|\| shebang === settings.PythonSettings.getInstance(document.uri).pythonPath) {`
	`56`	`+ const pythonPath = settings.PythonSettings.getInstance(document.uri).pythonPath;`
	`57`	`+ const resolvedPythonPath = await ShebangCodeLensProvider.getFullyQualifiedPathToInterpreter(pythonPath);`
	`58`	`+ if (!shebang \|\| shebang === resolvedPythonPath) {`
`57`	`59`	`return [];`
`58`	`60`	`}`
`59`	`61`