Merge pull request #115 from mhzed/multiroot

Add support for multi-root workspace

client/src/extension.ts

@@ -10,43 +10,79 @@
 */
 
 import * as path from 'path';
-import { ExtensionContext } from 'vscode';
+import { ExtensionContext, workspace as Workspace, TextDocument, OutputChannel, window as Window } from 'vscode';
 import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } from 'vscode-languageclient';
 import { ProgressReporting } from './progress';
 
+let clients: Map<string, LanguageClient> = new Map();
+
 export function activate(context: ExtensionContext) {
+	let outputChannel: OutputChannel = Window.createOutputChannel('pyright');
 	let serverModule = context.asAbsolutePath(path.join('server', 'server.js'));
 	let debugOptions = { execArgv: ["--nolazy", "--inspect=6600"] };
-	
+
 	// If the extension is launched in debug mode, then the debug server options are used.
 	// Otherwise the run options are used.
 	let serverOptions: ServerOptions = {
 		run : { module: serverModule, transport: TransportKind.ipc },
 		debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions }
 	}
-	
-	// Options to control the language client
-	let clientOptions: LanguageClientOptions = {
-		// Register the server for python source files.
-		documentSelector: [{
-			scheme: 'file',
-			language: 'python'
-		}],
-		synchronize: {
-			// Synchronize the setting section to the server.
-			configurationSection: 'python'
-		}
-	}
-	
-	// Create the language client and start the client.
-	let languageClient = new LanguageClient('python', 'Pyright', serverOptions, clientOptions);
-	let disposable = languageClient.start();
-	
-	// Push the disposable to the context's subscriptions so that the 
-	// client can be deactivated on extension deactivation.
-	context.subscriptions.push(disposable);
 
-	// Allocate a progress reporting object.
-	const progressReporting = new ProgressReporting(languageClient);
-	context.subscriptions.push(progressReporting);
+	const detectDoc = (document: TextDocument) => {
+		if (!(document.languageId === 'python' && document.uri.scheme === 'file')) {
+			return;
+		}
+		let folder = Workspace.getWorkspaceFolder(document.uri);
+		if (!folder || clients.has(folder.uri.toString())) {
+			return;
+		}
+
+		// Create the language client and start the client.
+		// Options to control the language client
+		let clientOptions: LanguageClientOptions = {
+			// Register the server for python source files.
+			documentSelector: [{
+				scheme: 'file',
+				language: 'python',
+				pattern:  `${folder.uri.fsPath}/**/*`
+			}],
+			synchronize: {
+				// Synchronize the setting section to the server.
+				configurationSection: 'python'
+			},
+			workspaceFolder: folder,
+			outputChannel: outputChannel
+		}
+		let languageClient = new LanguageClient('python', 'Pyright', serverOptions, clientOptions);
+		let disposable = languageClient.start();
+
+		// Push the disposable to the context's subscriptions so that the 
+		// client can be deactivated on extension deactivation.
+		context.subscriptions.push(disposable);
+
+		// Allocate a progress reporting object.
+		const progressReporting = new ProgressReporting(languageClient);
+		context.subscriptions.push(progressReporting);
+
+		clients.set(folder.uri.toString(), languageClient);
+	};
+	Workspace.onDidOpenTextDocument(detectDoc);
+	Workspace.textDocuments.forEach(detectDoc);
+	Workspace.onDidChangeWorkspaceFolders((event) => {
+		for (let folder of event.removed) {
+			let client = clients.get(folder.uri.toString());
+			if (client) {
+				clients.delete(folder.uri.toString());
+				client.stop();
+			}
+		}
+	});
 }
+
+export function deactivate(): Thenable<void> {
+	let promises: Thenable<void>[] = [];
+	for (let client of clients.values()) {
+		promises.push(client.stop());
+	}
+	return Promise.all(promises).then(() => undefined);
+}

server/src/server.ts

@@ -34,7 +34,6 @@ interface Settings {
 // Create a connection for the server. The connection uses Node's IPC as a transport
 let _connection: IConnection = createConnection(new IPCMessageReader(process), new IPCMessageWriter(process));
 
-_connection.console.log('Pyright language server starting');
 
 // Create a simple text document manager. The text document manager
 // supports full document sync only.
@@ -57,7 +56,7 @@ _documents.listen(_connection);
 // in the passed params the rootPath of the workspace plus the client capabilities.
 _connection.onInitialize((params): InitializeResult => {
     _rootPath = params.rootPath || '/';
-
+    _connection.console.log(`Pyright language server starting in ${_rootPath}`);
     // Don't allow the analysis engine to go too long without
     // reporting results. This will keep it responsive.
     _analyzerService.setMaxAnalysisDuration({