aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/code/package-lock.json22
-rw-r--r--editors/code/package.json4
-rw-r--r--editors/code/src/commands/runnables.ts4
3 files changed, 15 insertions, 15 deletions
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 0b6d72917..51c72f019 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -2535,27 +2535,27 @@
2535 "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==" 2535 "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="
2536 }, 2536 },
2537 "vscode-languageclient": { 2537 "vscode-languageclient": {
2538 "version": "5.1.1", 2538 "version": "5.2.1",
2539 "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.1.1.tgz", 2539 "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.2.1.tgz",
2540 "integrity": "sha512-jMxshi+BPRQFNG8GB00dJv7ldqMda0be26laYYll/udtJuHbog6RqK10GSxHWDN0PgY0b0m5fePyTk3bq8a0TA==", 2540 "integrity": "sha512-7jrS/9WnV0ruqPamN1nE7qCxn0phkH5LjSgSp9h6qoJGoeAKzwKz/PF6M+iGA/aklx4GLZg1prddhEPQtuXI1Q==",
2541 "requires": { 2541 "requires": {
2542 "semver": "5.5.1", 2542 "semver": "5.5.1",
2543 "vscode-languageserver-protocol": "3.13.0" 2543 "vscode-languageserver-protocol": "3.14.1"
2544 } 2544 }
2545 }, 2545 },
2546 "vscode-languageserver-protocol": { 2546 "vscode-languageserver-protocol": {
2547 "version": "3.13.0", 2547 "version": "3.14.1",
2548 "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz", 2548 "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz",
2549 "integrity": "sha512-2ZGKwI+P2ovQll2PGAp+2UfJH+FK9eait86VBUdkPd9HRlm8e58aYT9pV/NYanHOcp3pL6x2yTLVCFMcTer0mg==", 2549 "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==",
2550 "requires": { 2550 "requires": {
2551 "vscode-jsonrpc": "4.0.0", 2551 "vscode-jsonrpc": "4.0.0",
2552 "vscode-languageserver-types": "3.13.0" 2552 "vscode-languageserver-types": "3.14.0"
2553 } 2553 }
2554 }, 2554 },
2555 "vscode-languageserver-types": { 2555 "vscode-languageserver-types": {
2556 "version": "3.13.0", 2556 "version": "3.14.0",
2557 "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz", 2557 "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz",
2558 "integrity": "sha512-BnJIxS+5+8UWiNKCP7W3g9FlE7fErFw0ofP5BXJe7c2tl0VeWh+nNHFbwAS2vmVC4a5kYxHBjRy0UeOtziemVA==" 2558 "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="
2559 }, 2559 },
2560 "vso-node-api": { 2560 "vso-node-api": {
2561 "version": "6.1.2-preview", 2561 "version": "6.1.2-preview",
diff --git a/editors/code/package.json b/editors/code/package.json
index f196ecc60..d53e44b21 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -13,7 +13,7 @@
13 "Other" 13 "Other"
14 ], 14 ],
15 "engines": { 15 "engines": {
16 "vscode": "^1.26.0" 16 "vscode": "^1.30.0"
17 }, 17 },
18 "scripts": { 18 "scripts": {
19 "vscode:prepublish": "npm run compile", 19 "vscode:prepublish": "npm run compile",
@@ -31,7 +31,7 @@
31 "singleQuote": true 31 "singleQuote": true
32 }, 32 },
33 "dependencies": { 33 "dependencies": {
34 "vscode-languageclient": "^5.1.1" 34 "vscode-languageclient": "^5.2.1"
35 }, 35 },
36 "devDependencies": { 36 "devDependencies": {
37 "@types/mocha": "^2.2.42", 37 "@types/mocha": "^2.2.42",
diff --git a/editors/code/src/commands/runnables.ts b/editors/code/src/commands/runnables.ts
index c234bfaec..be17c8944 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 {
44 env: spec.env 44 env: spec.env
45 }; 45 };
46 46
47 const execCmd = `${definition.command} ${definition.args.join(' ')}`;
48 const execOption: vscode.ShellExecutionOptions = { 47 const execOption: vscode.ShellExecutionOptions = {
49 cwd: '.', 48 cwd: '.',
50 env: definition.env 49 env: definition.env
51 }; 50 };
52 const exec = new vscode.ShellExecution(`clear; ${execCmd}`, execOption); 51 const exec = new vscode.ShellExecution(definition.command, definition.args, execOption);
53 52
54 const f = vscode.workspace.workspaceFolders![0]; 53 const f = vscode.workspace.workspaceFolders![0];
55 const t = new vscode.Task( 54 const t = new vscode.Task(
@@ -60,6 +59,7 @@ function createTask(spec: Runnable): vscode.Task {
60 exec, 59 exec,
61 ['$rustc'] 60 ['$rustc']
62 ); 61 );
62 t.presentationOptions.clear = true
63 return t; 63 return t;
64} 64}
65 65