From 9cfd5ea2b44ece1d2ef521c44f7655bf05c4a61a Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 15 Dec 2018 22:33:09 +0300
Subject: [PATCH] use new clear-terminal feature

---
 editors/code/package-lock.json         | 22 +++++++++++-----------
 editors/code/package.json              |  4 ++--
 editors/code/src/commands/runnables.ts |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 0b6d729171..51c72f019e 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -2535,27 +2535,27 @@
             "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="
         },
         "vscode-languageclient": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.1.1.tgz",
-            "integrity": "sha512-jMxshi+BPRQFNG8GB00dJv7ldqMda0be26laYYll/udtJuHbog6RqK10GSxHWDN0PgY0b0m5fePyTk3bq8a0TA==",
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.2.1.tgz",
+            "integrity": "sha512-7jrS/9WnV0ruqPamN1nE7qCxn0phkH5LjSgSp9h6qoJGoeAKzwKz/PF6M+iGA/aklx4GLZg1prddhEPQtuXI1Q==",
             "requires": {
                 "semver": "5.5.1",
-                "vscode-languageserver-protocol": "3.13.0"
+                "vscode-languageserver-protocol": "3.14.1"
             }
         },
         "vscode-languageserver-protocol": {
-            "version": "3.13.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz",
-            "integrity": "sha512-2ZGKwI+P2ovQll2PGAp+2UfJH+FK9eait86VBUdkPd9HRlm8e58aYT9pV/NYanHOcp3pL6x2yTLVCFMcTer0mg==",
+            "version": "3.14.1",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz",
+            "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==",
             "requires": {
                 "vscode-jsonrpc": "4.0.0",
-                "vscode-languageserver-types": "3.13.0"
+                "vscode-languageserver-types": "3.14.0"
             }
         },
         "vscode-languageserver-types": {
-            "version": "3.13.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz",
-            "integrity": "sha512-BnJIxS+5+8UWiNKCP7W3g9FlE7fErFw0ofP5BXJe7c2tl0VeWh+nNHFbwAS2vmVC4a5kYxHBjRy0UeOtziemVA=="
+            "version": "3.14.0",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz",
+            "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="
         },
         "vso-node-api": {
             "version": "6.1.2-preview",
diff --git a/editors/code/package.json b/editors/code/package.json
index f196ecc605..d53e44b217 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -13,7 +13,7 @@
         "Other"
     ],
     "engines": {
-        "vscode": "^1.26.0"
+        "vscode": "^1.30.0"
     },
     "scripts": {
         "vscode:prepublish": "npm run compile",
@@ -31,7 +31,7 @@
         "singleQuote": true
     },
     "dependencies": {
-        "vscode-languageclient": "^5.1.1"
+        "vscode-languageclient": "^5.2.1"
     },
     "devDependencies": {
         "@types/mocha": "^2.2.42",
diff --git a/editors/code/src/commands/runnables.ts b/editors/code/src/commands/runnables.ts
index c234bfaec5..be17c8944f 100644
--- a/editors/code/src/commands/runnables.ts
+++ b/editors/code/src/commands/runnables.ts
@@ -44,12 +44,11 @@ function createTask(spec: Runnable): vscode.Task {
         env: spec.env
     };
 
-    const execCmd = `${definition.command} ${definition.args.join(' ')}`;
     const execOption: vscode.ShellExecutionOptions = {
         cwd: '.',
         env: definition.env
     };
-    const exec = new vscode.ShellExecution(`clear; ${execCmd}`, execOption);
+    const exec = new vscode.ShellExecution(definition.command, definition.args, execOption);
 
     const f = vscode.workspace.workspaceFolders![0];
     const t = new vscode.Task(
@@ -60,6 +59,7 @@ function createTask(spec: Runnable): vscode.Task {
         exec,
         ['$rustc']
     );
+    t.presentationOptions.clear = true
     return t;
 }