Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #2620

Browse source 
2620: Update packages r=matklad a=kjeremy



Co-authored-by: kjeremy <kjeremy@gmail.com>
This commit is contained in:
bors[bot] 2019-12-20 19:09:02 +00:00 committed by GitHub
commit 9467f81c58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,9 +60,9 @@
"dev": true
},
"@types/node": {
"version": "10.17.6",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.6.tgz",
"integrity": "sha512-0a2X6cgN3RdPBL2MIlR6Lt0KlM7fOFsutuXcdglcOq6WvLnYXgPQSh0Mx6tO1KCAE8MxbHSOSTWDoUxRq+l3DA==",
"version": "12.12.21",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.21.tgz",
"integrity": "sha512-8sRGhbpU+ck1n0PGAUgVrWrWdjSW2aqNeyC15W88GRsMpSwzv6RJGlLhE7s2RhVSOdyDmxbqlWSeThq4/7xqlA==",
"dev": true
},
"@types/resolve": {
@ -81,9 +81,9 @@
"dev": true
},
"@types/vscode": {
"version": "1.40.0",
"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.40.0.tgz",
"integrity": "sha512-5kEIxL3qVRkwhlMerxO7XuMffa+0LBl+iG2TcRa0NsdoeSFLkt/9hJ02jsi/Kvc6y8OVF2N2P2IHP5S4lWf/5w==",
"version": "1.41.0",
"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.41.0.tgz",
"integrity": "sha512-7SfeY5u9jgiELwxyLB3z7l6l/GbN9CqpCQGkcRlB7tKRFBxzbz2PoBfGrLxI1vRfUCIq5+hg5vtDHExwq5j3+A==",
"dev": true
},
"acorn": {
@ -791,9 +791,9 @@
}
},
"lookpath": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/lookpath/-/lookpath-1.0.3.tgz",
"integrity": "sha512-XIdgzlX26g10XnzyZdO/4obybEmfGnZyWQZ2DgmmEfVB79X+n3lhUoIzMe501C6s7RmCpAo66OPegWc+CsxYMg=="
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/lookpath/-/lookpath-1.0.4.tgz",
"integrity": "sha512-xVFrWlfo7n8VZs1YjBWKkbSIJU7DKE/0Mep62KeT94V1Ui1IY9w5fXfgiCsDIDZkakIYSXSeaW2FLbCqfw9/Cw=="
},
"magic-string": {
"version": "0.25.3",
@ -1140,9 +1140,9 @@
}
},
"rollup": {
"version": "1.27.9",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-1.27.9.tgz",
"integrity": "sha512-8AfW4cJTPZfG6EXWwT/ujL4owUsDI1Xl8J1t+hvK4wDX81F5I4IbwP9gvGbHzxnV19fnU4rRABZQwZSX9J402Q==",
"version": "1.27.13",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-1.27.13.tgz",
"integrity": "sha512-hDi7M07MpmNSDE8YVwGVFA8L7n8jTLJ4lG65nMAijAyqBe//rtu4JdxjUBE7JqXfdpqxqDTbCDys9WcqdpsQvw==",
"dev": true,
"requires": {
"@types/estree": "*",
@ -1514,9 +1514,9 @@
"dev": true
},
"vsce": {
"version": "1.70.0",
"resolved": "https://registry.npmjs.org/vsce/-/vsce-1.70.0.tgz",
"integrity": "sha512-mBTbVrWL348jODwfmaR+yXrlzb8EABGCT067C4shKOXriWiuMQi4/uCbFm6TUBcfnzTYLJv+DKa0VnKU8yEAjA==",
"version": "1.71.0",
"resolved": "https://registry.npmjs.org/vsce/-/vsce-1.71.0.tgz",
"integrity": "sha512-7k+LPC4oJYPyyxs0a5nh4A8CleQ6+2EMPiAiX/bDyN+PmwJFm2FFPqLRxdIsIWfFnkW4ZMQBf10+W62dCRd9kQ==",
"dev": true,
"requires": {
"azure-devops-node-api": "^7.2.0",
@ -1547,12 +1547,12 @@
"integrity": "sha512-k9akfglxWgr0dtLNscq2uBq48XJwnhf4EaDxn05KQowRwR0DkNML0zeYqFRLtXZe6x5vpL5ppyu4o6GqL+23YQ=="
},
"vscode-languageclient": {
"version": "6.0.0-next.8",
"resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.0.0-next.8.tgz",
"integrity": "sha512-452jskmuT7YKYnPd5uh7aELK4M25OITcnBq4ylPIyUtE5LQRgA9N9pR9NrviTTX/Hh6q6VGzm70OK9SpMO/zcA==",
"version": "6.0.0-next.9",
"resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.0.0-next.9.tgz",
"integrity": "sha512-NEpeeFM9FKrrRqlBHXGfwpkhtnjruDz3zfFBP+Cymr10qigAEtE/JsODJsIG/ErGqjh3/JXxu8SUOVTGu5oK+w==",
"requires": {
"semver": "^6.3.0",
"vscode-languageserver-protocol": "^3.15.0-next.13"
"vscode-languageserver-protocol": "^3.15.0-next.14"
},
"dependencies": {
"semver": {
@ -1563,9 +1563,9 @@
}
},
"vscode-languageserver-protocol": {
"version": "3.15.0-next.13",
"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.13.tgz",
"integrity": "sha512-2UGxOKc5VHav15n3zY5dtaOXGL/JuV0K2Mem/n6lhF8i3vaqIAnKv004SPU0flYHXIfCcQM7kCL+nwWVJ1K1qw==",
"version": "3.15.0-next.14",
"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.14.tgz",
"integrity": "sha512-xUwwno6Q6RFd2Z2EWV9D3dQlsKPnHyiZMNWq+EC7JJdp2WH1gRlD+KPX4UGRCnJK0WI5omqHV313IESPwRY5xA==",
"requires": {
"vscode-jsonrpc": "^5.0.0-next.5",
"vscode-languageserver-types": "^3.15.0-next.9"
@ -1577,9 +1577,9 @@
"integrity": "sha512-Rl/8qJ6932nrHCdPn+9y0x08uLVQaSLRG+U4JzhyKpWU4eJbVaDRoAcz1Llj7CErJGbPr6kdBvShPy5fRfR+Uw=="
},
"vscode-test": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.2.3.tgz",
"integrity": "sha512-mKRTNso33NaUULiPBFg6zRjyntjcCpIgkrogyPQuKlvoQREQR8jLKN5UD4L5rkTSD+oBhcKtaLR2/g34FexURw==",
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.3.0.tgz",
"integrity": "sha512-LddukcBiSU2FVTDr3c1D8lwkiOvwlJdDL2hqVbn6gIz+rpTqUCkMZSKYm94Y1v0WXlHSDQBsXyY+tchWQgGVsw==",
"dev": true,
"requires": {
"http-proxy-agent": "^2.1.0",

16
editors/code/package.json
View file

@ -13,7 +13,7 @@
"Other"
],
"engines": {
"vscode": "^1.40.0"
"vscode": "^1.41.0"
},
"scripts": {
"vscode:prepublish": "npm run compile",
@ -32,20 +32,20 @@
"trailingComma": "all"
},
"dependencies": {
"lookpath": "^1.0.3",
"lookpath": "^1.0.4",
"seedrandom": "^3.0.5",
"vscode-languageclient": "^6.0.0-next.8"
"vscode-languageclient": "^6.0.0-next.9"
},
"devDependencies": {
"@types/glob": "^7.1.1",
"@types/mocha": "^5.2.7",
"@types/node": "^10.17.6",
"@types/node": "^12.12.21",
"@types/seedrandom": "^2.4.28",
"@types/vscode": "^1.40.0",
"@types/vscode": "^1.41.0",
"glob": "^7.1.6",
"mocha": "^6.2.2",
"prettier": "^1.19.1",
"rollup": "^1.27.9",
"rollup": "^1.27.13",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-sourcemaps": "^0.4.2",
@ -55,8 +55,8 @@
"tslint-config-prettier": "^1.18.0",
"tslint-plugin-prettier": "^2.0.1",
"typescript": "^3.7.3",
"vsce": "^1.70.0",
"vscode-test": "^1.2.3"
"vsce": "^1.71.0",
"vscode-test": "^1.3.0"
},
"activationEvents": [
"onLanguage:rust",

9
editors/code/src/commands/cargo_watch.ts
View file

@ -111,8 +111,13 @@ export class CargoWatchProvider implements vscode.Disposable {
},
);
if (!this.cargoProcess) {
vscode.window.showErrorMessage('Cargo Watch failed to start');
return;
}
const stdoutData = new LineBuffer();
this.cargoProcess.stdout.on('data', (s: string) => {
this.cargoProcess.stdout?.on('data', (s: string) => {
stdoutData.processOutput(s, line => {
this.logInfo(line);
try {
@ -124,7 +129,7 @@ export class CargoWatchProvider implements vscode.Disposable {
});
const stderrData = new LineBuffer();
this.cargoProcess.stderr.on('data', (s: string) => {
this.cargoProcess.stderr?.on('data', (s: string) => {
stderrData.processOutput(s, line => {
this.logError('Error on cargo-watch : {\n' + line + '}\n');
});