removed more unnecessary changes.

microsoft · Oct 3, 2022 · cf5deec · cf5deec
1 parent 356aeea
commit cf5deec
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 22 deletions.
diff --git a/src/client/activation/node/languageServerProxy.ts b/src/client/activation/node/languageServerProxy.ts
@@ -9,13 +9,7 @@ import {
     LanguageClientOptions,
 } from 'vscode-languageclient/node';
 
-import {
-    IConfigurationService,
-    IExperimentService,
-    IExtensions,
-    IInterpreterPathService,
-    Resource,
-} from '../../common/types';
+import { IExperimentService, IExtensions, IInterpreterPathService, Resource } from '../../common/types';
 import { IEnvironmentVariablesProvider } from '../../common/variables/types';
 import { PythonEnvironment } from '../../pythonEnvironments/info';
 import { captureTelemetry, sendTelemetryEvent } from '../../telemetry';
@@ -76,7 +70,6 @@ export class NodeLanguageServerProxy implements ILanguageServerProxy {
         private readonly environmentService: IEnvironmentVariablesProvider,
         private readonly workspace: IWorkspaceService,
         private readonly extensions: IExtensions,
-        private readonly configurationService: IConfigurationService,
     ) {
         // Empty
     }
@@ -111,22 +104,23 @@ export class NodeLanguageServerProxy implements ILanguageServerProxy {
         if (extension && (extension.exports as PylanceApi).startClient) {
             this.pylanceApi = extension.exports as PylanceApi;
             await this.pylanceApi.startClient!();
-        } else {
-            this.cancellationStrategy = new FileBasedCancellationStrategy();
-            options.connectionOptions = { cancellationStrategy: this.cancellationStrategy };
+            return;
+        }
 
-            const client = await this.factory.createLanguageClient(resource, interpreter, options);
-            this.registerHandlers(client, resource);
+        this.cancellationStrategy = new FileBasedCancellationStrategy();
+        options.connectionOptions = { cancellationStrategy: this.cancellationStrategy };
 
-            this.disposables.push(
-                this.workspace.onDidGrantWorkspaceTrust(() => {
-                    client.sendNotification('python/workspaceTrusted', { isTrusted: true });
-                }),
-            );
+        const client = await this.factory.createLanguageClient(resource, interpreter, options);
+        this.registerHandlers(client, resource);
 
-            await client.start();
-            this.languageClient = client;
-        }
+        this.disposables.push(
+            this.workspace.onDidGrantWorkspaceTrust(() => {
+                client.sendNotification('python/workspaceTrusted', { isTrusted: true });
+            }),
+        );
+
+        await client.start();
+        this.languageClient = client;
     }
 
     @traceDecoratorVerbose('Disposing language server')

diff --git a/src/client/languageServer/pylanceLSExtensionManager.ts b/src/client/languageServer/pylanceLSExtensionManager.ts
@@ -65,7 +65,6 @@ export class PylanceLSExtensionManager implements IDisposable, ILanguageServerEx
             environmentService,
             workspaceService,
             extensions,
-            configurationService,
         );
         this.serverManager = new NodeLanguageServerManager(
             serviceContainer,