Simplifies LS startup and update test baselines (#1762)

Mikhail Arkhipov · web-flow · commit 9b7ebf66ef41 · 2018-05-29T11:17:35.000-07:00
* Undo changes * Test fixes * Increase timeout * Remove double event listening * Remove test * Revert "Remove test" This reverts commit e240c3f. * Revert "Remove double event listening" This reverts commit af573be. * #1096 The if statement is automatically formatted incorrectly * Merge fix * Add more tests * More tests * Typo * Test * Also better handle multiline arguments * Add a couple missing periods [skip ci] * Undo changes * Test fixes * Increase timeout * Remove double event listening * Remove test * Revert "Remove test" This reverts commit e240c3f. * Revert "Remove double event listening" This reverts commit af573be. * Merge fix * #1257 On type formatting errors for args and kwargs * Handle f-strings * Stop importing from test code * #1308 Single line statements leading to an indentation on the next line * #726 editing python after inline if statement invalid indent * Undo change * Move constant * Harden LS startup error checks * #1364 Intellisense doesn't work after specific const string * Telemetry for the analysis enging * PR feedback * Fix typo * Test baseline update * Jedi 0.12 * Priority to goto_defition * News * Replace unzip * Linux flavors + test * Grammar check * Grammar test * Test baselines * Add news * Pin dependency [skip ci] * Specify markdown as preferable format * Improve function argument detection * Specify markdown * Pythia setting * Baseline updates * Baseline update * Improve startup * Handle missing interpreter better * Handle interpreter change * Delete old file * Fix LS startup time reporting * Remove Async suffix from IFileSystem * Remove Pythia * Remove pre-packaged MSIL * Exe name on Unix * Plain linux * Fix casing * Fix message * Update PTVS engine activation steps * Type formatter eats space in from . * fIX CASING * Remove flag * Don't wait for LS * Small test fixes * Update hover baselines
diff --git a/src/client/activation/analysis.ts b/src/client/activation/analysis.ts
@@ -4,11 +4,9 @@
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
 import { ExtensionContext, OutputChannel } from 'vscode';
-import { Message } from 'vscode-jsonrpc';
-import { CloseAction, Disposable, ErrorAction, ErrorHandler, LanguageClient, LanguageClientOptions, ServerOptions } from 'vscode-languageclient';
+import { Disposable, LanguageClient, LanguageClientOptions, ServerOptions } from 'vscode-languageclient';
 import { IApplicationShell } from '../common/application/types';
 import { isTestExecution, STANDARD_OUTPUT_CHANNEL } from '../common/constants';
-import { createDeferred, Deferred } from '../common/helpers';
 import { IFileSystem, IPlatformService } from '../common/platform/types';
 import { StopWatch } from '../common/stopWatch';
 import { IConfigurationService, IExtensionContext, IOutputChannel } from '../common/types';
@@ -18,8 +16,7 @@ import { IServiceContainer } from '../ioc/types';
 import {
     PYTHON_ANALYSIS_ENGINE_DOWNLOADED,
     PYTHON_ANALYSIS_ENGINE_ENABLED,
-    PYTHON_ANALYSIS_ENGINE_ERROR,
-    PYTHON_ANALYSIS_ENGINE_STARTUP
+    PYTHON_ANALYSIS_ENGINE_ERROR
 } from '../telemetry/constants';
 import { getTelemetryReporter } from '../telemetry/telemetry';
 import { AnalysisEngineDownloader } from './downloader';
@@ -32,18 +29,6 @@ const dotNetCommand = 'dotnet';
 const languageClientName = 'Python Tools';
 const analysisEngineFolder = 'analysis';
 
-class LanguageServerStartupErrorHandler implements ErrorHandler {
-    constructor(private readonly deferred: Deferred<void>) { }
-    public error(error: Error, message: Message, count: number): ErrorAction {
-        this.deferred.reject(error);
-        return ErrorAction.Continue;
-    }
-    public closed(): CloseAction {
-        this.deferred.reject();
-        return CloseAction.Restart;
-    }
-}
-
 @injectable()
 export class AnalysisExtensionActivator implements IExtensionActivator {
     private readonly configuration: IConfigurationService;
@@ -102,8 +87,6 @@ export class AnalysisExtensionActivator implements IExtensionActivator {
 
     private async startLanguageServer(context: ExtensionContext, clientOptions: LanguageClientOptions): Promise<boolean> {
         // Determine if we are running MSIL/Universal via dotnet or self-contained app.
-        const mscorlib = path.join(context.extensionPath, analysisEngineFolder, 'mscorlib.dll');
-        const downloader = new AnalysisEngineDownloader(this.services, analysisEngineFolder);
 
         const reporter = getTelemetryReporter();
         reporter.sendTelemetryEvent(PYTHON_ANALYSIS_ENGINE_ENABLED);
@@ -112,20 +95,21 @@ export class AnalysisExtensionActivator implements IExtensionActivator {
         if (!settings.downloadCodeAnalysis) {
             // Depends on .NET Runtime or SDK. Typically development-only case.
             this.languageClient = this.createSimpleLanguageClient(context, clientOptions);
-            await this.tryStartLanguageClient(context, this.languageClient);
+            await this.startLanguageClient(context);
             return true;
         }
 
+        const mscorlib = path.join(context.extensionPath, analysisEngineFolder, 'mscorlib.dll');
         if (!await this.fs.fileExists(mscorlib)) {
+            const downloader = new AnalysisEngineDownloader(this.services, analysisEngineFolder);
             await downloader.downloadAnalysisEngine(context);
             reporter.sendTelemetryEvent(PYTHON_ANALYSIS_ENGINE_DOWNLOADED);
         }
 
         const serverModule = path.join(context.extensionPath, analysisEngineFolder, this.platformData.getEngineExecutableName());
-        // Now try to start self-contained app
         this.languageClient = this.createSelfContainedLanguageClient(context, serverModule, clientOptions);
         try {
-            await this.tryStartLanguageClient(context, this.languageClient);
+            await this.startLanguageClient(context);
             return true;
         } catch (ex) {
             this.appShell.showErrorMessage(`Language server failed to start. Error ${ex}`);
@@ -134,31 +118,10 @@ export class AnalysisExtensionActivator implements IExtensionActivator {
         }
     }
 
-    private async tryStartLanguageClient(context: ExtensionContext, lc: LanguageClient): Promise<void> {
-        let disposable: Disposable | undefined;
-        const deferred = createDeferred<void>();
-        try {
-            const sw = new StopWatch();
-            lc.clientOptions.errorHandler = new LanguageServerStartupErrorHandler(deferred);
-
-            disposable = lc.start();
-            lc.onReady()
-                .then(() => deferred.resolve())
-                .catch((reason) => {
-                    deferred.reject(reason);
-                });
-            await deferred.promise;
-
-            this.output.appendLine(`Language server ready: ${this.sw.elapsedTime} ms`);
-            context.subscriptions.push(disposable);
-
-            const reporter = getTelemetryReporter();
-            reporter.sendTelemetryEvent(PYTHON_ANALYSIS_ENGINE_STARTUP, {}, { startup_time: sw.elapsedTime });
-        } catch (ex) {
-            if (disposable) {
-                disposable.dispose();
-            }
-            throw ex;
+    private async startLanguageClient(context: ExtensionContext): Promise<void> {
+        context.subscriptions.push(this.languageClient!.start());
+        if (isTestExecution()) {
+            await this.languageClient!.onReady();
         }
     }
 
diff --git a/src/test/definitions/hover.ptvs.test.ts b/src/test/definitions/hover.ptvs.test.ts
@@ -53,7 +53,7 @@ suite('Hover Definition (Analysis Engine)', () => {
         const expected = [
             'obj.method1:',
             '```python',
-            'method method1 of one.Class1 objects',
+            'method method1 of pythonFiles.autocomp.one.Class1 objects',
             '```',
             'This is method1'
         ];
@@ -70,7 +70,7 @@ suite('Hover Definition (Analysis Engine)', () => {
         const expected = [
             'two.ct().fun:',
             '```python',
-            'method fun of two.ct objects',
+            'method fun of pythonFiles.autocomp.two.ct objects',
             '```',
             'This is fun'
         ];
@@ -86,7 +86,7 @@ suite('Hover Definition (Analysis Engine)', () => {
         const actual = normalizeMarkedString(def[0].contents[0]).splitLines();
         const expected = [
             '```python',
-            'four.Foo.bar() -> bool',
+            'pythonFiles.autocomp.four.Foo.bar() -> bool',
             'declared in Foo',
             '```',
             '说明 - keep this line, it works',
@@ -105,7 +105,7 @@ suite('Hover Definition (Analysis Engine)', () => {
         const actual = normalizeMarkedString(def[0].contents[0]).splitLines();
         const expected = [
             '```python',
-            'four.showMessage()',
+            'pythonFiles.autocomp.four.showMessage()',
             '```',
             'Кюм ут жэмпэр пошжим льаборэж, коммюны янтэрэсщэт нам ед, декта игнота ныморэ жят эи.',
             'Шэа декам экшырки эи, эи зыд эррэм докэндё, векж факэтэ пэрчыквюэрёж ку.'
@@ -138,7 +138,7 @@ suite('Hover Definition (Analysis Engine)', () => {
         const actual = normalizeMarkedString(def[0].contents[0]).splitLines();
         const expected = [
             '```python',
-            'class misc.Random(_random.Random)',
+            'class pythonFiles.autocomp.misc.Random(_random.Random)',
             '```',
             'Random number generator base class used by bound module functions.',
             'Used to instantiate instances of Random to get generators that don\'t',
@@ -162,7 +162,7 @@ suite('Hover Definition (Analysis Engine)', () => {
         const expected = [
             'rnd2.randint:',
             '```python',
-            'method randint of misc.Random objects  -> int',
+            'method randint of pythonFiles.autocomp.misc.Random objects -> int',
             '```',
             'Return random integer in range [a, b], including both end points.'
         ];
@@ -195,7 +195,7 @@ suite('Hover Definition (Analysis Engine)', () => {
         const actual = normalizeMarkedString(def[0].contents[0]).splitLines();
         const expected = [
             '```python',
-            'class misc.Thread(_Verbose)',
+            'class pythonFiles.autocomp.misc.Thread(_Verbose)',
             '```',
             'A class that represents a thread of control.',
             'This class can be safely subclassed in a limited fashion.'
