From b1f5efc128aa66fec6df60881f02dca81b662695 Mon Sep 17 00:00:00 2001
From: Anton Schur <tonich.sh@gmail.com>
Date: Sun, 24 Feb 2019 21:47:54 +0300
Subject: [PATCH 1/2] vscode: pyls executable path can be configured via
 "pyls.executable" parameter.

---
 README.rst                     | 3 +--
 vscode-client/package.json     | 9 +++++++--
 vscode-client/src/extension.ts | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index 26ad2d2a..fb56f7d5 100644
--- a/README.rst
+++ b/README.rst
@@ -119,8 +119,7 @@ Develop against VS Code
 
 The Python language server can be developed against a local instance of Visual Studio Code.
 
-1. Install `VSCode for Mac <http://code.visualstudio.com/docs/?dv=osx>`_
-2. From within VSCode View -> Command Palette, then type *shell* and run ``install 'code' command in PATH``
+1. Install `VSCode <https://code.visualstudio.com/download`_
 
 .. code-block:: bash
 
diff --git a/vscode-client/package.json b/vscode-client/package.json
index 2cd3c434..9a37c641 100644
--- a/vscode-client/package.json
+++ b/vscode-client/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "vscode-client",
-    "description": "VSCode extension for running multiple language servers",
+    "name": "pyls",
+    "description": "Python language server",
     "author": "Sourcegraph",
     "repository": "https://github.com/Microsoft/vscode-languageserver-node",
     "license": "MIT",
@@ -20,6 +20,11 @@
             "title": "Python Language Server Configuration",
             "type": "object",
             "properties": {
+                "pyls.executable": {
+                    "type": "string",
+                    "default": "pyls",
+                    "description": "Language server executable"
+                },
                 "pyls.configurationSources": {
                     "type": "array",
                     "default": ["pycodestyle"],
diff --git a/vscode-client/src/extension.ts b/vscode-client/src/extension.ts
index 3eea77e3..48d2b77e 100644
--- a/vscode-client/src/extension.ts
+++ b/vscode-client/src/extension.ts
@@ -43,7 +43,8 @@ function startLangServerTCP(addr: number, documentSelector: string[]): Disposabl
 }
 
 export function activate(context: ExtensionContext) {
-    context.subscriptions.push(startLangServer("pyls", ["-vv"], ["python"]));
+	const executable = workspace.getConfiguration("pyls").get<string>("executable");
+    context.subscriptions.push(startLangServer(executable, ["-vv"], ["python"]));
     // For TCP server needs to be started seperately
     // context.subscriptions.push(startLangServerTCP(2087, ["python"]));
 }

From 0e828baf959275256fa2aaf71e931e39550fb211 Mon Sep 17 00:00:00 2001
From: Anton Schur <anton_s@florist.ru>
Date: Mon, 25 Feb 2019 09:59:19 +0300
Subject: [PATCH 2/2] vscode: fixed identation

---
 vscode-client/src/extension.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vscode-client/src/extension.ts b/vscode-client/src/extension.ts
index 48d2b77e..5816f9df 100644
--- a/vscode-client/src/extension.ts
+++ b/vscode-client/src/extension.ts
@@ -43,7 +43,7 @@ function startLangServerTCP(addr: number, documentSelector: string[]): Disposabl
 }
 
 export function activate(context: ExtensionContext) {
-	const executable = workspace.getConfiguration("pyls").get<string>("executable");
+    const executable = workspace.getConfiguration("pyls").get<string>("executable");
     context.subscriptions.push(startLangServer(executable, ["-vv"], ["python"]));
     // For TCP server needs to be started seperately
     // context.subscriptions.push(startLangServerTCP(2087, ["python"]));