Corrected configSettings bug

Author: Kartik Raj

src/client/activation/languageServer/analysisOptions.ts

@@ -5,7 +5,7 @@
 
 import { inject, injectable, named } from 'inversify';
 import * as path from 'path';
-import { CancellationToken, CompletionContext, ConfigurationChangeEvent, Disposable, DocumentFilter, Event, EventEmitter, OutputChannel, Position, TextDocument } from 'vscode';
+import { CancellationToken, CompletionContext, ConfigurationChangeEvent, Disposable, Event, EventEmitter, OutputChannel, Position, TextDocument } from 'vscode';
 import { LanguageClientOptions, ProvideCompletionItemsSignature } from 'vscode-languageclient';
 import { IWorkspaceService } from '../../common/application/types';
 import { isTestExecution, PYTHON_LANGUAGE, STANDARD_OUTPUT_CHANNEL } from '../../common/constants';

src/client/activation/languageServer/manager.ts

@@ -86,7 +86,7 @@ export class LanguageServerExtension implements ILanguageServerExtension {
             this.disposable.dispose();
         }
     }
-    public async register(): Promise<void> {
+    public register(): Promise<void> {
         if (this.disposable) {
             return;
         }

src/client/activation/types.ts

@@ -92,7 +92,7 @@ export const ILanguageServerExtension = Symbol('ILanguageServerExtension');
 export interface ILanguageServerExtension extends IDisposable {
     readonly invoked: Event<void>;
     loadExtensionArgs?: {};
-    register(): Promise<void>;
+    register(): void;
 }
 export const ILanguageServer = Symbol('ILanguageServer');
 export interface ILanguageServer extends IDisposable {

src/client/common/configSettings.ts

@@ -373,6 +373,15 @@ export class PythonSettings implements IPythonSettings {
     protected getPythonExecutable(pythonPath: string) {
         return getPythonExecutable(pythonPath);
     }
+    protected onWorkspaceFoldersChanged() {
+        //If an activated workspace folder was removed, delete its key
+        const workspaceKeys = this.workspace.workspaceFolders!.map(workspaceFolder => workspaceFolder.uri.fsPath);
+        const activatedWkspcKeys = Array.from(PythonSettings.pythonSettings.keys());
+        const activatedWkspcFoldersRemoved = activatedWkspcKeys.filter(x => workspaceKeys.indexOf(x) < 0);
+        if (activatedWkspcFoldersRemoved.length > 0) {
+            PythonSettings.pythonSettings.delete(activatedWkspcFoldersRemoved[0]);
+        }
+    }
     protected initialize(): void {
         const onDidChange = () => {
             const currentConfig = this.workspace.getConfiguration('python', this.workspaceRoot);
@@ -382,6 +391,7 @@ export class PythonSettings implements IPythonSettings {
             // Let's defer the change notification.
             this.debounceChangeNotification();
         };
+        this.disposables.push(this.workspace.onDidChangeWorkspaceFolders(this.onWorkspaceFoldersChanged, this));
         this.disposables.push(this.interpreterAutoSelectionService.onDidChangeAutoSelectedInterpreter(onDidChange.bind(this)));
         this.disposables.push(this.workspace.onDidChangeConfiguration((event: ConfigurationChangeEvent) => {
             if (event.affectsConfiguration('python')) {

src/test/activation/activationManager.unit.test.ts

@@ -174,7 +174,7 @@ suite('Activation - ActivationManager', () => {
 
         documentManager.verifyAll();
         verify(workspaceService.onDidChangeWorkspaceFolders).once();
-        verify(workspaceService.workspaceFolders).once();
+        verify(workspaceService.workspaceFolders).atLeast(1);
         verify(workspaceService.hasWorkspaceFolders).once();
         verify(workspaceService.getWorkspaceFolder(anything())).atLeast(1);
         verify(activationService1.activate(resource)).once();
@@ -230,7 +230,7 @@ suite('Activation - ActivationManager', () => {
 
         documentManager.verifyAll();
         verify(workspaceService.onDidChangeWorkspaceFolders).once();
-        verify(workspaceService.workspaceFolders).once();
+        verify(workspaceService.workspaceFolders).atLeast(1);
         verify(workspaceService.hasWorkspaceFolders).once();
 
         //Removed no. of folders to one
@@ -240,7 +240,7 @@ suite('Activation - ActivationManager', () => {
 
         workspaceFoldersChangedHandler.call(managerTest);
 
-        verify(workspaceService.workspaceFolders).twice();
+        verify(workspaceService.workspaceFolders).atLeast(1);
         verify(workspaceService.hasWorkspaceFolders).twice();
     });
 });

src/test/activation/languageServer/manager.unit.test.ts

@@ -89,6 +89,7 @@ suite('xLanguage Server - Manager', () => {
             verify(analysisOptions.getAnalysisOptions()).once();
             verify(serviceContainer.get<ILanguageServer>(ILanguageServer)).once();
             verify(languageServer.start(resource, languageClientOptions)).once();
+            expect(invoked).to.be.true;
             expect(analysisHandlerRegistered).to.be.true;
             verify(languageServer.dispose()).never();
         }
@@ -176,21 +177,6 @@ suite('xLanguage Server - Manager', () => {
             verify(serviceContainer.get<ILanguageServer>(ILanguageServer)).thrice();
             verify(languageServer.start(resource, languageClientOptions)).thrice();
         });
-        // Write system test to test this
-        // test('Must load extension when command is sent', async () => {
-        //     const args = { x: 1 };
-        //     when(lsExtension.loadExtensionArgs).thenReturn(undefined);
-        //     await startLanguageServer();
-
-        //     verify(languageServer.loadExtension(args)).never();
-
-        //     await extension.register();
-        //     const cb = capture(commandManager.registerCommand).first()[1] as Function;
-        //     cb.call(manager, args);
-
-        //     verify(languageServer.loadExtension(args)).once();
-        //     commandRegistrationDisposable.verify(d => d.dispose(), typemoq.Times.never());
-        // });
         test('Must load extension when command was been sent before starting LS', async () => {
             const args = { x: 1 };
             when(lsExtension.loadExtensionArgs).thenReturn(args as any);