From f5e0987c35384d736e2c2c32c291b364831501a6 Mon Sep 17 00:00:00 2001
From: Dirk Baeumer <dirkb@microsoft.com>
Date: Mon, 4 Sep 2017 21:40:34 +0200
Subject: [PATCH] Multi Server example cleanup

---
 lsp-multi-server-sample/README.md               |  3 +--
 lsp-multi-server-sample/client/package.json     | 17 ++++++++++++++---
 .../client/{ => src}/extension.ts               |  4 ++--
 lsp-multi-server-sample/client/tsconfig.json    |  1 +
 lsp-multi-server-sample/server/tsconfig.json    |  4 ++++
 5 files changed, 22 insertions(+), 7 deletions(-)
 rename lsp-multi-server-sample/client/{ => src}/extension.ts (94%)

diff --git a/lsp-multi-server-sample/README.md b/lsp-multi-server-sample/README.md
index 1ff16c23..86c6bd5f 100644
--- a/lsp-multi-server-sample/README.md
+++ b/lsp-multi-server-sample/README.md
@@ -12,5 +12,4 @@ The example uses proposed Language Server protocol. So the code demoed here migh
 - Switch to the Debug viewlet
 - Select `Launch Client` from the drop down
 - Run the lauch config
-- If you want to debug the server as well use the launch configuration `Attach to Server`
-
+- If you want to debug the server as well use the launch configuration `Attach to Server`
\ No newline at end of file
diff --git a/lsp-multi-server-sample/client/package.json b/lsp-multi-server-sample/client/package.json
index d09ebe3a..88c95d46 100644
--- a/lsp-multi-server-sample/client/package.json
+++ b/lsp-multi-server-sample/client/package.json
@@ -9,27 +9,38 @@
 	"activationEvents": [
 		"onLanguage:plaintext"
 	],
+	"main": "./out/src/extension",
 	"contributes": {
 		"configuration": {
 			"type": "object",
 			"title": "Multi LSP configuration",
 			"properties": {
-				"lsp-multi-server-example.enable": {
+				"lspMultiServerSample.enable": {
 					"scope": "resource",
 					"type": "boolean",
 					"default": true,
 					"description": "Controls the enablement."
 				},
-				"lsp-multi-server-example.options": {
+				"lspMultiServerSample.options": {
 					"scope": "resource",
 					"type": "object",
 					"default": {},
 					"description": "Additional options."
+				},
+				"lspMultiServerSample.trace.server": {
+					"scope": "window",
+					"type": "string",
+					"enum": [
+						"off",
+						"messages",
+						"verbose"
+					],
+					"default": "off",
+					"description": "Traces the communication between VSCode and the language server."
 				}
 			}
 		}
 	},
-	"main": "./out/extension",
 	"scripts": {
 		"vscode:prepublish": "tsc -p ./",
 		"compile": "tsc -p ./",
diff --git a/lsp-multi-server-sample/client/extension.ts b/lsp-multi-server-sample/client/src/extension.ts
similarity index 94%
rename from lsp-multi-server-sample/client/extension.ts
rename to lsp-multi-server-sample/client/src/extension.ts
index 4a285d2d..33f8c3b9 100644
--- a/lsp-multi-server-sample/client/extension.ts
+++ b/lsp-multi-server-sample/client/src/extension.ts
@@ -19,9 +19,9 @@ function getOuterMostWorkspaceFolder(folder: WorkspaceFolder): WorkspaceFolder {
 	return result;
 }
 
-export function activate(_context: ExtensionContext) {
+export function activate(context: ExtensionContext) {
 
-	let module = path.join(__dirname, '..', 'server', 'server.js');
+	let module = context.asAbsolutePath(path.join('server', 'server.js'));
 	let outputChannel: OutputChannel = Window.createOutputChannel('lsp-multi-server-example');
 	
 	function didOpenTextDocument(document: TextDocument): void {
diff --git a/lsp-multi-server-sample/client/tsconfig.json b/lsp-multi-server-sample/client/tsconfig.json
index 63d77358..f535e0ce 100644
--- a/lsp-multi-server-sample/client/tsconfig.json
+++ b/lsp-multi-server-sample/client/tsconfig.json
@@ -6,6 +6,7 @@
 		"noImplicitReturns": true,		
 		"module": "commonjs",
 		"target": "es6",
+		"rootDir": ".",
 		"outDir": "out",
 		"lib": [ "es6"],
 		"sourceMap": true
diff --git a/lsp-multi-server-sample/server/tsconfig.json b/lsp-multi-server-sample/server/tsconfig.json
index 6032b82b..27c7eebc 100644
--- a/lsp-multi-server-sample/server/tsconfig.json
+++ b/lsp-multi-server-sample/server/tsconfig.json
@@ -1,5 +1,9 @@
 {
 	"compilerOptions": {
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"noImplicitAny": true,
+		"noImplicitReturns": true,		
 		"target": "es6",
 		"module": "commonjs",
 		"moduleResolution": "node",