Merge branch 'CommonToolExecution' into YarnAndCodeCoverage

DonJayamanne · DonJayamanne · commit b55ad34b0bc6 · 2018-01-03T12:11:42.000-08:00
* CommonToolExecution: Refactor parsing of environment variables (after 439) (#466) Refactor extension to remove old way of spawning python processes (#439)
diff --git a/src/client/interpreter/interpreterVersion.ts b/src/client/interpreter/interpreterVersion.ts
@@ -25,6 +25,6 @@ export class InterpreterVersionService implements IInterpreterVersionService {
                 return matches[0].trim();
             }
         }
-        throw new Error(`Unable to determine Pip version from output '${output.stdout}'`);
+        throw new Error(`Unable to determine pip version from output '${output.stdout}'`);
     }
 }
diff --git a/src/client/providers/jediProxy.ts b/src/client/providers/jediProxy.ts
@@ -348,27 +348,9 @@ export class JediProxy implements vscode.Disposable {
                         return;
                     }
 
-                    switch (cmd.command) {
-                        case CommandType.Completions:
-                            this.onCompletion(cmd, response);
-                            break;
-                        case CommandType.Definitions:
-                            this.onDefinition(cmd, response);
-                            break;
-                        case CommandType.Hover:
-                            this.onHover(cmd, response);
-                            break;
-                        case CommandType.Symbols:
-                            this.onSymbols(cmd, response);
-                            break;
-                        case CommandType.Usages:
-                            this.onUsages(cmd, response);
-                            break;
-                        case CommandType.Arguments:
-                            this.onArguments(cmd, response);
-                            break;
-                        default:
-                            break;
+                    const handler = this.getCommandHandler(cmd.command);
+                    if (handler) {
+                        handler.call(this, cmd, response);
                     }
                     // Check if too many pending requests.
                     this.checkQueueLength();
@@ -378,7 +360,24 @@ export class JediProxy implements vscode.Disposable {
             error => this.handleError('subscription.error', `${error}`)
         );
     }
-
+    private getCommandHandler(command: CommandType): undefined | ((command: IExecutionCommand<ICommandResult>, response: object) => void) {
+        switch (command) {
+            case CommandType.Completions:
+                return this.onCompletion;
+            case CommandType.Definitions:
+                return this.onDefinition;
+            case CommandType.Hover:
+                return this.onHover;
+            case CommandType.Symbols:
+                return this.onSymbols;
+            case CommandType.Usages:
+                return this.onUsages;
+            case CommandType.Arguments:
+                return this.onArguments;
+            default:
+                return;
+        }
+    }
     private onCompletion(command: IExecutionCommand<ICommandResult>, response: object): void {
         let results = JediProxy.getProperty<IAutoCompleteItem[]>(response, 'results');
         results = Array.isArray(results) ? results : [];
diff --git a/src/test/autocomplete/base.test.ts b/src/test/autocomplete/base.test.ts
@@ -22,13 +22,12 @@ const fileSuppress = path.join(autoCompPath, 'suppress.py');
 
 // tslint:disable-next-line:max-func-body-length
 suite('Autocomplete', () => {
-    let isPython3: boolean;
+    let isPython2: boolean;
     let ioc: UnitTestIocContainer;
     suiteSetup(async () => {
         await initialize();
         initializeDI();
-        const version = await ioc.getPythonVersion(rootWorkspaceUri);
-        isPython3 = version.indexOf('3.') >= 0;
+        isPython2 = await ioc.getPythonMajorVersion(rootWorkspaceUri) === 2;
     });
     setup(initializeTest);
     suiteTeardown(closeActiveWindows);
@@ -80,7 +79,7 @@ suite('Autocomplete', () => {
 
     // https://github.com/DonJayamanne/pythonVSCode/issues/265
     test('For "lambda"', async function () {
-        if (!isPython3) {
+        if (isPython2) {
             // tslint:disable-next-line:no-invalid-this
             this.skip();
             return;
diff --git a/src/test/autocomplete/pep484.test.ts b/src/test/autocomplete/pep484.test.ts
@@ -9,13 +9,12 @@ const autoCompPath = path.join(__dirname, '..', '..', '..', 'src', 'test', 'pyth
 const filePep484 = path.join(autoCompPath, 'pep484.py');
 
 suite('Autocomplete PEP 484', () => {
-    let isPython3: boolean;
+    let isPython2: boolean;
     let ioc: UnitTestIocContainer;
     suiteSetup(async () => {
         await initialize();
         initializeDI();
-        const version = await ioc.getPythonVersion(rootWorkspaceUri);
-        isPython3 = version.indexOf('3.') >= 0;
+        isPython2 = await ioc.getPythonMajorVersion(rootWorkspaceUri) === 2;
     });
     setup(initializeTest);
     suiteTeardown(closeActiveWindows);
@@ -31,7 +30,7 @@ suite('Autocomplete PEP 484', () => {
     }
 
     test('argument', async function () {
-        if (!isPython3) {
+        if (isPython2) {
             // tslint:disable-next-line:no-invalid-this
             this.skip();
             return;
@@ -47,7 +46,7 @@ suite('Autocomplete PEP 484', () => {
     });
 
     test('return value', async () => {
-        if (!isPython3) {
+        if (isPython2) {
             return;
         }
         const textDocument = await vscode.workspace.openTextDocument(filePep484);
diff --git a/src/test/autocomplete/pep526.test.ts b/src/test/autocomplete/pep526.test.ts
@@ -9,13 +9,12 @@ const autoCompPath = path.join(__dirname, '..', '..', '..', 'src', 'test', 'pyth
 const filePep526 = path.join(autoCompPath, 'pep526.py');
 
 suite('Autocomplete PEP 526', () => {
-    let isPython3: boolean;
+    let isPython2: boolean;
     let ioc: UnitTestIocContainer;
     suiteSetup(async () => {
         await initialize();
         initializeDI();
-        const version = await ioc.getPythonVersion(rootWorkspaceUri);
-        isPython3 = version.indexOf('3.') >= 0;
+        isPython2 = await ioc.getPythonMajorVersion(rootWorkspaceUri) === 2;
     });
     setup(initializeTest);
     suiteTeardown(closeActiveWindows);
@@ -31,7 +30,7 @@ suite('Autocomplete PEP 526', () => {
     }
 
     test('variable (abc:str)', async function () {
-        if (!isPython3) {
+        if (isPython2) {
             // tslint:disable-next-line:no-invalid-this
             this.skip();
             return;
@@ -47,7 +46,7 @@ suite('Autocomplete PEP 526', () => {
     });
 
     test('variable (abc: str = "")', async function () {
-        if (!isPython3) {
+        if (isPython2) {
             // tslint:disable-next-line:no-invalid-this
             this.skip();
         }
@@ -62,7 +61,7 @@ suite('Autocomplete PEP 526', () => {
     });
 
     test('variable (abc = UNKNOWN # type: str)', async function () {
-        if (!isPython3) {
+        if (isPython2) {
             // tslint:disable-next-line:no-invalid-this
             this.skip();
             return;
@@ -78,7 +77,7 @@ suite('Autocomplete PEP 526', () => {
     });
 
     test('class methods', async function () {
-        if (!isPython3) {
+        if (isPython2) {
             // tslint:disable-next-line:no-invalid-this
             this.skip();
             return;
@@ -96,7 +95,7 @@ suite('Autocomplete PEP 526', () => {
     });
 
     test('class method types', async function () {
-        if (!isPython3) {
+        if (isPython2) {
             // tslint:disable-next-line:no-invalid-this
             this.skip();
             return;
diff --git a/src/test/serviceRegistry.ts b/src/test/serviceRegistry.ts
@@ -98,4 +98,13 @@ export class IocContainer {
         this.serviceManager.addSingleton<IPathUtils>(IPathUtils, PathUtils);
         this.serviceManager.addSingleton<ICurrentProcess>(ICurrentProcess, MockProcess);
     }
+
+    public registerMockProcess() {
+        this.serviceManager.addSingletonInstance<boolean>(IsWindows, IS_WINDOWS);
+        this.serviceManager.addSingletonInstance<boolean>(Is64Bit, IS_64_BIT);
+
+        this.serviceManager.addSingleton<ILogger>(ILogger, Logger);
+        this.serviceManager.addSingleton<IPathUtils>(IPathUtils, PathUtils);
+        this.serviceManager.addSingleton<ICurrentProcess>(ICurrentProcess, MockProcess);
+    }
 }
diff --git a/src/test/signature/signature.test.ts b/src/test/signature/signature.test.ts
@@ -21,13 +21,12 @@ class SignatureHelpResult {
 
 // tslint:disable-next-line:max-func-body-length
 suite('Signatures', () => {
-    let isPython3: boolean;
+    let isPython2: boolean;
     let ioc: UnitTestIocContainer;
     suiteSetup(async () => {
         await initialize();
         initializeDI();
-        const version = await ioc.getPythonVersion(rootWorkspaceUri);
-        isPython3 = version.indexOf('3.') >= 0;
+        isPython2 = await ioc.getPythonMajorVersion(rootWorkspaceUri) === 2;
     });
     setup(initializeTest);
     suiteTeardown(closeActiveWindows);
@@ -86,7 +85,7 @@ suite('Signatures', () => {
     });
 
     test('For ellipsis', async function () {
-        if (!isPython3) {
+        if (isPython2) {
             // tslint:disable-next-line:no-invalid-this
             this.skip();
             return;
@@ -110,10 +109,10 @@ suite('Signatures', () => {
 
     test('For pow', async () => {
         let expected: SignatureHelpResult;
-        if (isPython3) {
-            expected = new SignatureHelpResult(0, 4, 1, 0, null);
-        } else {
+        if (isPython2) {
             expected = new SignatureHelpResult(0, 4, 1, 0, 'x');
+        } else {
+            expected = new SignatureHelpResult(0, 4, 1, 0, null);
         }
 
         const document = await openDocument(path.join(autoCompPath, 'noSigPy3.py'));
diff --git a/src/test/unittests/serviceRegistry.ts b/src/test/unittests/serviceRegistry.ts
@@ -30,9 +30,10 @@ export class UnitTestIocContainer extends IocContainer {
     constructor() {
         super();
     }
-    public getPythonVersion(resource: Uri) {
+    public getPythonMajorVersion(resource: Uri) {
         return this.serviceContainer.get<IPythonExecutionFactory>(IPythonExecutionFactory).create(resource)
-            .then(pythonProcess => pythonProcess.getVersion());
+            .then(pythonProcess => pythonProcess.exec(['-c', 'import sys;print(sys.version_info[0])'], {}))
+            .then(output => parseInt(output.stdout.trim(), 10));
     }
     public registerTestVisitors() {
         this.serviceManager.add<ITestVisitor>(ITestVisitor, TestFlatteningVisitor, 'TestFlatteningVisitor');

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ export class InterpreterVersionService implements IInterpreterVersionService {`
`25`	`25`	`return matches[0].trim();`
`26`	`26`	`}`
`27`	`27`	`}`
`28`		- throw new Error(`Unable to determine Pip version from output '${output.stdout}'`);
	`28`	+ throw new Error(`Unable to determine pip version from output '${output.stdout}'`);
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,4 +98,13 @@ export class IocContainer {`
`98`	`98`	`this.serviceManager.addSingleton<IPathUtils>(IPathUtils, PathUtils);`
`99`	`99`	`this.serviceManager.addSingleton<ICurrentProcess>(ICurrentProcess, MockProcess);`
`100`	`100`	`}`
	`101`	`+`
	`102`	`+ public registerMockProcess() {`
	`103`	`+ this.serviceManager.addSingletonInstance<boolean>(IsWindows, IS_WINDOWS);`
	`104`	`+ this.serviceManager.addSingletonInstance<boolean>(Is64Bit, IS_64_BIT);`
	`105`	`+`
	`106`	`+ this.serviceManager.addSingleton<ILogger>(ILogger, Logger);`
	`107`	`+ this.serviceManager.addSingleton<IPathUtils>(IPathUtils, PathUtils);`
	`108`	`+ this.serviceManager.addSingleton<ICurrentProcess>(ICurrentProcess, MockProcess);`
	`109`	`+ }`
`101`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,10 @@ export class UnitTestIocContainer extends IocContainer {`
`30`	`30`	`constructor() {`
`31`	`31`	`super();`
`32`	`32`	`}`
`33`		`- public getPythonVersion(resource: Uri) {`
	`33`	`+ public getPythonMajorVersion(resource: Uri) {`
`34`	`34`	`return this.serviceContainer.get<IPythonExecutionFactory>(IPythonExecutionFactory).create(resource)`
`35`		`- .then(pythonProcess => pythonProcess.getVersion());`
	`35`	`+ .then(pythonProcess => pythonProcess.exec(['-c', 'import sys;print(sys.version_info[0])'], {}))`
	`36`	`+ .then(output => parseInt(output.stdout.trim(), 10));`
`36`	`37`	`}`
`37`	`38`	`public registerTestVisitors() {`
`38`	`39`	`this.serviceManager.add<ITestVisitor>(ITestVisitor, TestFlatteningVisitor, 'TestFlatteningVisitor');`