aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-12-20 19:09:02 +0000
committerGitHub <[email protected]>2019-12-20 19:09:02 +0000
commit9467f81c588bf7a62ec882f293e0870c187b368b (patch)
tree08c131e1433ca40c9dfdf716b4b4f47b77d26ceb
parent02f9e04ee926241389f8c9e41fec9281de1e0af9 (diff)
parent6049f60a052b4097ab45a631480f8207ac5f6009 (diff)
Merge #2620
2620: Update packages r=matklad a=kjeremy Co-authored-by: kjeremy <[email protected]>
-rw-r--r--editors/code/package-lock.json50
-rw-r--r--editors/code/package.json16
-rw-r--r--editors/code/src/commands/cargo_watch.ts9
3 files changed, 40 insertions, 35 deletions
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 127cdcfa1..4c5c13646 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -60,9 +60,9 @@
60 "dev": true 60 "dev": true
61 }, 61 },
62 "@types/node": { 62 "@types/node": {
63 "version": "10.17.6", 63 "version": "12.12.21",
64 "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.6.tgz", 64 "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.21.tgz",
65 "integrity": "sha512-0a2X6cgN3RdPBL2MIlR6Lt0KlM7fOFsutuXcdglcOq6WvLnYXgPQSh0Mx6tO1KCAE8MxbHSOSTWDoUxRq+l3DA==", 65 "integrity": "sha512-8sRGhbpU+ck1n0PGAUgVrWrWdjSW2aqNeyC15W88GRsMpSwzv6RJGlLhE7s2RhVSOdyDmxbqlWSeThq4/7xqlA==",
66 "dev": true 66 "dev": true
67 }, 67 },
68 "@types/resolve": { 68 "@types/resolve": {
@@ -81,9 +81,9 @@
81 "dev": true 81 "dev": true
82 }, 82 },
83 "@types/vscode": { 83 "@types/vscode": {
84 "version": "1.40.0", 84 "version": "1.41.0",
85 "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.40.0.tgz", 85 "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.41.0.tgz",
86 "integrity": "sha512-5kEIxL3qVRkwhlMerxO7XuMffa+0LBl+iG2TcRa0NsdoeSFLkt/9hJ02jsi/Kvc6y8OVF2N2P2IHP5S4lWf/5w==", 86 "integrity": "sha512-7SfeY5u9jgiELwxyLB3z7l6l/GbN9CqpCQGkcRlB7tKRFBxzbz2PoBfGrLxI1vRfUCIq5+hg5vtDHExwq5j3+A==",
87 "dev": true 87 "dev": true
88 }, 88 },
89 "acorn": { 89 "acorn": {
@@ -791,9 +791,9 @@
791 } 791 }
792 }, 792 },
793 "lookpath": { 793 "lookpath": {
794 "version": "1.0.3", 794 "version": "1.0.4",
795 "resolved": "https://registry.npmjs.org/lookpath/-/lookpath-1.0.3.tgz", 795 "resolved": "https://registry.npmjs.org/lookpath/-/lookpath-1.0.4.tgz",
796 "integrity": "sha512-XIdgzlX26g10XnzyZdO/4obybEmfGnZyWQZ2DgmmEfVB79X+n3lhUoIzMe501C6s7RmCpAo66OPegWc+CsxYMg==" 796 "integrity": "sha512-xVFrWlfo7n8VZs1YjBWKkbSIJU7DKE/0Mep62KeT94V1Ui1IY9w5fXfgiCsDIDZkakIYSXSeaW2FLbCqfw9/Cw=="
797 }, 797 },
798 "magic-string": { 798 "magic-string": {
799 "version": "0.25.3", 799 "version": "0.25.3",
@@ -1140,9 +1140,9 @@
1140 } 1140 }
1141 }, 1141 },
1142 "rollup": { 1142 "rollup": {
1143 "version": "1.27.9", 1143 "version": "1.27.13",
1144 "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.27.9.tgz", 1144 "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.27.13.tgz",
1145 "integrity": "sha512-8AfW4cJTPZfG6EXWwT/ujL4owUsDI1Xl8J1t+hvK4wDX81F5I4IbwP9gvGbHzxnV19fnU4rRABZQwZSX9J402Q==", 1145 "integrity": "sha512-hDi7M07MpmNSDE8YVwGVFA8L7n8jTLJ4lG65nMAijAyqBe//rtu4JdxjUBE7JqXfdpqxqDTbCDys9WcqdpsQvw==",
1146 "dev": true, 1146 "dev": true,
1147 "requires": { 1147 "requires": {
1148 "@types/estree": "*", 1148 "@types/estree": "*",
@@ -1514,9 +1514,9 @@
1514 "dev": true 1514 "dev": true
1515 }, 1515 },
1516 "vsce": { 1516 "vsce": {
1517 "version": "1.70.0", 1517 "version": "1.71.0",
1518 "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.70.0.tgz", 1518 "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.71.0.tgz",
1519 "integrity": "sha512-mBTbVrWL348jODwfmaR+yXrlzb8EABGCT067C4shKOXriWiuMQi4/uCbFm6TUBcfnzTYLJv+DKa0VnKU8yEAjA==", 1519 "integrity": "sha512-7k+LPC4oJYPyyxs0a5nh4A8CleQ6+2EMPiAiX/bDyN+PmwJFm2FFPqLRxdIsIWfFnkW4ZMQBf10+W62dCRd9kQ==",
1520 "dev": true, 1520 "dev": true,
1521 "requires": { 1521 "requires": {
1522 "azure-devops-node-api": "^7.2.0", 1522 "azure-devops-node-api": "^7.2.0",
@@ -1547,12 +1547,12 @@
1547 "integrity": "sha512-k9akfglxWgr0dtLNscq2uBq48XJwnhf4EaDxn05KQowRwR0DkNML0zeYqFRLtXZe6x5vpL5ppyu4o6GqL+23YQ==" 1547 "integrity": "sha512-k9akfglxWgr0dtLNscq2uBq48XJwnhf4EaDxn05KQowRwR0DkNML0zeYqFRLtXZe6x5vpL5ppyu4o6GqL+23YQ=="
1548 }, 1548 },
1549 "vscode-languageclient": { 1549 "vscode-languageclient": {
1550 "version": "6.0.0-next.8", 1550 "version": "6.0.0-next.9",
1551 "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.0.0-next.8.tgz", 1551 "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.0.0-next.9.tgz",
1552 "integrity": "sha512-452jskmuT7YKYnPd5uh7aELK4M25OITcnBq4ylPIyUtE5LQRgA9N9pR9NrviTTX/Hh6q6VGzm70OK9SpMO/zcA==", 1552 "integrity": "sha512-NEpeeFM9FKrrRqlBHXGfwpkhtnjruDz3zfFBP+Cymr10qigAEtE/JsODJsIG/ErGqjh3/JXxu8SUOVTGu5oK+w==",
1553 "requires": { 1553 "requires": {
1554 "semver": "^6.3.0", 1554 "semver": "^6.3.0",
1555 "vscode-languageserver-protocol": "^3.15.0-next.13" 1555 "vscode-languageserver-protocol": "^3.15.0-next.14"
1556 }, 1556 },
1557 "dependencies": { 1557 "dependencies": {
1558 "semver": { 1558 "semver": {
@@ -1563,9 +1563,9 @@
1563 } 1563 }
1564 }, 1564 },
1565 "vscode-languageserver-protocol": { 1565 "vscode-languageserver-protocol": {
1566 "version": "3.15.0-next.13", 1566 "version": "3.15.0-next.14",
1567 "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.13.tgz", 1567 "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.14.tgz",
1568 "integrity": "sha512-2UGxOKc5VHav15n3zY5dtaOXGL/JuV0K2Mem/n6lhF8i3vaqIAnKv004SPU0flYHXIfCcQM7kCL+nwWVJ1K1qw==", 1568 "integrity": "sha512-xUwwno6Q6RFd2Z2EWV9D3dQlsKPnHyiZMNWq+EC7JJdp2WH1gRlD+KPX4UGRCnJK0WI5omqHV313IESPwRY5xA==",
1569 "requires": { 1569 "requires": {
1570 "vscode-jsonrpc": "^5.0.0-next.5", 1570 "vscode-jsonrpc": "^5.0.0-next.5",
1571 "vscode-languageserver-types": "^3.15.0-next.9" 1571 "vscode-languageserver-types": "^3.15.0-next.9"
@@ -1577,9 +1577,9 @@
1577 "integrity": "sha512-Rl/8qJ6932nrHCdPn+9y0x08uLVQaSLRG+U4JzhyKpWU4eJbVaDRoAcz1Llj7CErJGbPr6kdBvShPy5fRfR+Uw==" 1577 "integrity": "sha512-Rl/8qJ6932nrHCdPn+9y0x08uLVQaSLRG+U4JzhyKpWU4eJbVaDRoAcz1Llj7CErJGbPr6kdBvShPy5fRfR+Uw=="
1578 }, 1578 },
1579 "vscode-test": { 1579 "vscode-test": {
1580 "version": "1.2.3", 1580 "version": "1.3.0",
1581 "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.2.3.tgz", 1581 "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.3.0.tgz",
1582 "integrity": "sha512-mKRTNso33NaUULiPBFg6zRjyntjcCpIgkrogyPQuKlvoQREQR8jLKN5UD4L5rkTSD+oBhcKtaLR2/g34FexURw==", 1582 "integrity": "sha512-LddukcBiSU2FVTDr3c1D8lwkiOvwlJdDL2hqVbn6gIz+rpTqUCkMZSKYm94Y1v0WXlHSDQBsXyY+tchWQgGVsw==",
1583 "dev": true, 1583 "dev": true,
1584 "requires": { 1584 "requires": {
1585 "http-proxy-agent": "^2.1.0", 1585 "http-proxy-agent": "^2.1.0",
diff --git a/editors/code/package.json b/editors/code/package.json
index f2e8e647e..f75fafeb9 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.40.0" 16 "vscode": "^1.41.0"
17 }, 17 },
18 "scripts": { 18 "scripts": {
19 "vscode:prepublish": "npm run compile", 19 "vscode:prepublish": "npm run compile",
@@ -32,20 +32,20 @@
32 "trailingComma": "all" 32 "trailingComma": "all"
33 }, 33 },
34 "dependencies": { 34 "dependencies": {
35 "lookpath": "^1.0.3", 35 "lookpath": "^1.0.4",
36 "seedrandom": "^3.0.5", 36 "seedrandom": "^3.0.5",
37 "vscode-languageclient": "^6.0.0-next.8" 37 "vscode-languageclient": "^6.0.0-next.9"
38 }, 38 },
39 "devDependencies": { 39 "devDependencies": {
40 "@types/glob": "^7.1.1", 40 "@types/glob": "^7.1.1",
41 "@types/mocha": "^5.2.7", 41 "@types/mocha": "^5.2.7",
42 "@types/node": "^10.17.6", 42 "@types/node": "^12.12.21",
43 "@types/seedrandom": "^2.4.28", 43 "@types/seedrandom": "^2.4.28",
44 "@types/vscode": "^1.40.0", 44 "@types/vscode": "^1.41.0",
45 "glob": "^7.1.6", 45 "glob": "^7.1.6",
46 "mocha": "^6.2.2", 46 "mocha": "^6.2.2",
47 "prettier": "^1.19.1", 47 "prettier": "^1.19.1",
48 "rollup": "^1.27.9", 48 "rollup": "^1.27.13",
49 "rollup-plugin-commonjs": "^10.1.0", 49 "rollup-plugin-commonjs": "^10.1.0",
50 "rollup-plugin-node-resolve": "^5.2.0", 50 "rollup-plugin-node-resolve": "^5.2.0",
51 "rollup-plugin-sourcemaps": "^0.4.2", 51 "rollup-plugin-sourcemaps": "^0.4.2",
@@ -55,8 +55,8 @@
55 "tslint-config-prettier": "^1.18.0", 55 "tslint-config-prettier": "^1.18.0",
56 "tslint-plugin-prettier": "^2.0.1", 56 "tslint-plugin-prettier": "^2.0.1",
57 "typescript": "^3.7.3", 57 "typescript": "^3.7.3",
58 "vsce": "^1.70.0", 58 "vsce": "^1.71.0",
59 "vscode-test": "^1.2.3" 59 "vscode-test": "^1.3.0"
60 }, 60 },
61 "activationEvents": [ 61 "activationEvents": [
62 "onLanguage:rust", 62 "onLanguage:rust",
diff --git a/editors/code/src/commands/cargo_watch.ts b/editors/code/src/commands/cargo_watch.ts
index 748be535c..ac62bdd48 100644
--- a/editors/code/src/commands/cargo_watch.ts
+++ b/editors/code/src/commands/cargo_watch.ts
@@ -111,8 +111,13 @@ export class CargoWatchProvider implements vscode.Disposable {
111 }, 111 },
112 ); 112 );
113 113
114 if (!this.cargoProcess) {
115 vscode.window.showErrorMessage('Cargo Watch failed to start');
116 return;
117 }
118
114 const stdoutData = new LineBuffer(); 119 const stdoutData = new LineBuffer();
115 this.cargoProcess.stdout.on('data', (s: string) => { 120 this.cargoProcess.stdout?.on('data', (s: string) => {
116 stdoutData.processOutput(s, line => { 121 stdoutData.processOutput(s, line => {
117 this.logInfo(line); 122 this.logInfo(line);
118 try { 123 try {
@@ -124,7 +129,7 @@ export class CargoWatchProvider implements vscode.Disposable {
124 }); 129 });
125 130
126 const stderrData = new LineBuffer(); 131 const stderrData = new LineBuffer();
127 this.cargoProcess.stderr.on('data', (s: string) => { 132 this.cargoProcess.stderr?.on('data', (s: string) => {
128 stderrData.processOutput(s, line => { 133 stderrData.processOutput(s, line => {
129 this.logError('Error on cargo-watch : {\n' + line + '}\n'); 134 this.logError('Error on cargo-watch : {\n' + line + '}\n');
130 }); 135 });