Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-16 09:48:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #277

Browse source 
277: use new clear-terminal feature r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2018-12-15 19:35:49 +00:00
commit c5472f820b
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
editors/code/package-lock.json generated
View file

@ -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",

4
editors/code/package.json
View file

@ -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",

4
editors/code/src/commands/runnables.ts
View file

@ -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;
}