From 1266810e5582f95db3a518373485f736cce9ffc4 Mon Sep 17 00:00:00 2001 From: kjeremy Date: Mon, 27 Jan 2020 10:25:22 -0500 Subject: vscode-languageclient 6.1.0 Adds support for proposed semantic highlighting extension --- editors/code/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index cd9c99b35..ce3de1e96 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -25,7 +25,7 @@ "dependencies": { "jsonc-parser": "^2.1.0", "seedrandom": "^3.0.5", - "vscode-languageclient": "^6.0.1" + "vscode-languageclient": "^6.1.0" }, "devDependencies": { "@rollup/plugin-commonjs": "^11.0.0", -- cgit v1.2.3 From c378133185be0af6e4a6cc6bb5587f808d03a16b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 28 Jan 2020 15:11:44 +0100 Subject: :arrow_up: node --- editors/code/package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index ce3de1e96..55d470fa0 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -28,16 +28,16 @@ "vscode-languageclient": "^6.1.0" }, "devDependencies": { - "@rollup/plugin-commonjs": "^11.0.0", - "@rollup/plugin-node-resolve": "^6.0.0", - "@rollup/plugin-typescript": "^2.0.1", - "@types/node": "^12.12.21", + "@rollup/plugin-commonjs": "^11.0.1", + "@rollup/plugin-node-resolve": "^6.1.0", + "@rollup/plugin-typescript": "^2.1.0", + "@types/node": "^12.12.25", "@types/seedrandom": "^2.4.28", "@types/vscode": "^1.41.0", - "rollup": "^1.27.14", + "rollup": "^1.30.1", "tslib": "^1.10.0", "tslint": "^5.20.1", - "typescript": "^3.7.3", + "typescript": "^3.7.5", "typescript-formatter": "^7.2.2", "vsce": "^1.71.0" }, -- cgit v1.2.3 From f08297983faac35e0b0fd475bc935ba0bc0726cb Mon Sep 17 00:00:00 2001 From: Veetaha Date: Sat, 1 Feb 2020 23:11:39 +0200 Subject: vscode: moved tslib to runtime dependencies and added \"importHelpers\": true --- editors/code/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index 55d470fa0..3e1903263 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -25,7 +25,8 @@ "dependencies": { "jsonc-parser": "^2.1.0", "seedrandom": "^3.0.5", - "vscode-languageclient": "^6.1.0" + "vscode-languageclient": "^6.1.0", + "tslib": "^1.10.0" }, "devDependencies": { "@rollup/plugin-commonjs": "^11.0.1", @@ -35,7 +36,6 @@ "@types/seedrandom": "^2.4.28", "@types/vscode": "^1.41.0", "rollup": "^1.30.1", - "tslib": "^1.10.0", "tslint": "^5.20.1", "typescript": "^3.7.5", "typescript-formatter": "^7.2.2", -- cgit v1.2.3 From 3d6d0819cce2d7bc13d720328e2bba8337b48602 Mon Sep 17 00:00:00 2001 From: Veetaha Date: Sun, 2 Feb 2020 12:16:41 +0200 Subject: fix repo link in package.json --- editors/code/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index 55d470fa0..4aefd4488 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -8,7 +8,8 @@ "version": "0.1.0", "publisher": "matklad", "repository": { - "url": "https://github.com/matklad/rust-analyzer/" + "url": "https://github.com/rust-analyzer/rust-analyzer.git", + "type": "git" }, "categories": [ "Other" -- cgit v1.2.3 From e9800b0023a55eaa7ab609c9b9fdaab2177ead6b Mon Sep 17 00:00:00 2001 From: Veetaha Date: Sun, 2 Feb 2020 23:38:04 +0200 Subject: vscode: updated rollup typescript so it typechecks the bundle --- editors/code/package.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index beb721210..15bcac624 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -21,7 +21,9 @@ "vscode:prepublish": "rollup -c", "package": "vsce package", "watch": "tsc -watch -p ./", - "fmt": "tsfmt -r && tslint -c tslint.json 'src/**/*.ts' --fix" + "fmt": "tsfmt -r && tslint -c tslint.json 'src/**/*.ts' --fix", + "bump-deps:dry-run": "npm-check-updates", + "bump-deps": "npm-check-updates --upgrade && npm install" }, "dependencies": { "jsonc-parser": "^2.1.0", @@ -32,10 +34,11 @@ "devDependencies": { "@rollup/plugin-commonjs": "^11.0.1", "@rollup/plugin-node-resolve": "^6.1.0", - "@rollup/plugin-typescript": "^2.1.0", + "@rollup/plugin-typescript": "^3.0.0", "@types/node": "^12.12.25", "@types/seedrandom": "^2.4.28", "@types/vscode": "^1.41.0", + "npm-check-updates": "^4.0.1", "rollup": "^1.30.1", "tslint": "^5.20.1", "typescript": "^3.7.5", -- cgit v1.2.3 From 0ade5cb2b331a3a1753c917a576111cd0f0a9915 Mon Sep 17 00:00:00 2001 From: Veetaha Date: Sun, 2 Feb 2020 23:47:52 +0200 Subject: vscode: dropped npm-check-updates script --- editors/code/package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index 15bcac624..e733ee2b4 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -21,9 +21,7 @@ "vscode:prepublish": "rollup -c", "package": "vsce package", "watch": "tsc -watch -p ./", - "fmt": "tsfmt -r && tslint -c tslint.json 'src/**/*.ts' --fix", - "bump-deps:dry-run": "npm-check-updates", - "bump-deps": "npm-check-updates --upgrade && npm install" + "fmt": "tsfmt -r && tslint -c tslint.json 'src/**/*.ts' --fix" }, "dependencies": { "jsonc-parser": "^2.1.0", @@ -38,7 +36,6 @@ "@types/node": "^12.12.25", "@types/seedrandom": "^2.4.28", "@types/vscode": "^1.41.0", - "npm-check-updates": "^4.0.1", "rollup": "^1.30.1", "tslint": "^5.20.1", "typescript": "^3.7.5", -- cgit v1.2.3 From 30f7e6590a37ef76ac53df665b54dade9aeece7d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 3 Feb 2020 14:57:14 +0100 Subject: Remove recent improvements to the build script tslib as a dev dependency and commonjs modules are definitely *wrong* in the ideal world, **but** in the real world that's the only combination that works. See https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0/topic/Problems.20with.20TypeScript.20build --- editors/code/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index e733ee2b4..06aa747fe 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -26,20 +26,20 @@ "dependencies": { "jsonc-parser": "^2.1.0", "seedrandom": "^3.0.5", - "vscode-languageclient": "^6.1.0", - "tslib": "^1.10.0" + "vscode-languageclient": "^6.1.0" }, "devDependencies": { "@rollup/plugin-commonjs": "^11.0.1", "@rollup/plugin-node-resolve": "^6.1.0", - "@rollup/plugin-typescript": "^3.0.0", + "@rollup/plugin-typescript": "^2.0.0", "@types/node": "^12.12.25", "@types/seedrandom": "^2.4.28", "@types/vscode": "^1.41.0", "rollup": "^1.30.1", + "tslib": "^1.10.0", "tslint": "^5.20.1", - "typescript": "^3.7.5", "typescript-formatter": "^7.2.2", + "typescript": "^3.7.5", "vsce": "^1.71.0" }, "activationEvents": [ -- cgit v1.2.3 From ad57726f9181d7b80d217d7bf1b6cdca282d0982 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 3 Feb 2020 16:37:12 +0100 Subject: Use simple prng instead of a dependency closes #2999 --- editors/code/package.json | 2 -- 1 file changed, 2 deletions(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index 06aa747fe..a46b0a82b 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -25,7 +25,6 @@ }, "dependencies": { "jsonc-parser": "^2.1.0", - "seedrandom": "^3.0.5", "vscode-languageclient": "^6.1.0" }, "devDependencies": { @@ -33,7 +32,6 @@ "@rollup/plugin-node-resolve": "^6.1.0", "@rollup/plugin-typescript": "^2.0.0", "@types/node": "^12.12.25", - "@types/seedrandom": "^2.4.28", "@types/vscode": "^1.41.0", "rollup": "^1.30.1", "tslib": "^1.10.0", -- cgit v1.2.3 From 0a68dfb491531595ff5836a954ae987558cf21ce Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 3 Feb 2020 16:49:25 +0100 Subject: Update some rollup packages --- editors/code/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index a46b0a82b..e4eae7b31 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -28,12 +28,12 @@ "vscode-languageclient": "^6.1.0" }, "devDependencies": { - "@rollup/plugin-commonjs": "^11.0.1", - "@rollup/plugin-node-resolve": "^6.1.0", + "@rollup/plugin-commonjs": "^11.0.2", + "@rollup/plugin-node-resolve": "^7.1.1", "@rollup/plugin-typescript": "^2.0.0", "@types/node": "^12.12.25", "@types/vscode": "^1.41.0", - "rollup": "^1.30.1", + "rollup": "^1.31.0", "tslib": "^1.10.0", "tslint": "^5.20.1", "typescript-formatter": "^7.2.2", -- cgit v1.2.3 From 9b8e3b80ee6c11770f1098f1244914c77ace9408 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 3 Feb 2020 17:39:34 +0100 Subject: Remove rollup-typescript It seems like just calling typescript directly is simpler and more reliable? --- editors/code/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index e4eae7b31..2d4a6f672 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -18,7 +18,7 @@ "vscode": "^1.41.0" }, "scripts": { - "vscode:prepublish": "rollup -c", + "vscode:prepublish": "tsc -p ./ && rollup -c", "package": "vsce package", "watch": "tsc -watch -p ./", "fmt": "tsfmt -r && tslint -c tslint.json 'src/**/*.ts' --fix" @@ -30,7 +30,6 @@ "devDependencies": { "@rollup/plugin-commonjs": "^11.0.2", "@rollup/plugin-node-resolve": "^7.1.1", - "@rollup/plugin-typescript": "^2.0.0", "@types/node": "^12.12.25", "@types/vscode": "^1.41.0", "rollup": "^1.31.0", -- cgit v1.2.3 From f0323de7e8a38113a4ceeba068b5c06b5b541182 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 3 Feb 2020 18:03:36 +0100 Subject: Remove unnecessary flags --- editors/code/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index 2d4a6f672..c0d8f0183 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -18,9 +18,9 @@ "vscode": "^1.41.0" }, "scripts": { - "vscode:prepublish": "tsc -p ./ && rollup -c", + "vscode:prepublish": "tsc && rollup -c", "package": "vsce package", - "watch": "tsc -watch -p ./", + "watch": "tsc --watch", "fmt": "tsfmt -r && tslint -c tslint.json 'src/**/*.ts' --fix" }, "dependencies": { -- cgit v1.2.3 From 23ef22dd4880606c4c3dc908d30c2cbeabc37f58 Mon Sep 17 00:00:00 2001 From: Gregoire Geis Date: Sun, 2 Feb 2020 02:21:04 +0100 Subject: Add regular onEnter command, allowing onEnter to be called without overriding the type command. --- editors/code/package.json | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index c0d8f0183..9987a28f5 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -114,6 +114,11 @@ "command": "rust-analyzer.reload", "title": "Restart server", "category": "Rust Analyzer" + }, + { + "command": "rust-analyzer.onEnter", + "title": "Enhanced enter key", + "category": "Rust Analyzer" } ], "keybindings": [ -- cgit v1.2.3 From 58c007674b8c746beab371ca13fce951af6cd1f2 Mon Sep 17 00:00:00 2001 From: Gregoire Geis Date: Sun, 2 Feb 2020 15:58:53 +0100 Subject: Change default enhanced typing behavior from using type to using keybindings. --- editors/code/package.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index 9987a28f5..05f55cb35 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -141,6 +141,11 @@ "command": "rust-analyzer.run", "key": "ctrl+r", "when": "editorTextFocus && editorLangId == rust" + }, + { + "command": "rust-analyzer.onEnter", + "key": "enter", + "when": "editorTextFocus && editorLangId == rust" } ], "configuration": { @@ -164,7 +169,7 @@ }, "rust-analyzer.enableEnhancedTyping": { "type": "boolean", - "default": true, + "default": false, "description": "Enables enhanced typing. NOTE: If using a VIM extension, you should set this to false" }, "rust-analyzer.raLspServerPath": { -- cgit v1.2.3 From b70ad7e5f3d524204fab88fe2a8c5a6fbef9e88e Mon Sep 17 00:00:00 2001 From: Gregoire Geis Date: Mon, 3 Feb 2020 20:24:50 +0100 Subject: Remove enableEnhancedTyping and type overriding infrastructure. --- editors/code/package.json | 5 ----- 1 file changed, 5 deletions(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index 05f55cb35..421124764 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -167,11 +167,6 @@ "default": {}, "description": "Fine grained feature flags to disable annoying features" }, - "rust-analyzer.enableEnhancedTyping": { - "type": "boolean", - "default": false, - "description": "Enables enhanced typing. NOTE: If using a VIM extension, you should set this to false" - }, "rust-analyzer.raLspServerPath": { "type": [ "string" -- cgit v1.2.3 From 7fd661f0853ef3a32bfb8a01617de8e5adb3ca01 Mon Sep 17 00:00:00 2001 From: Gregoire Geis Date: Mon, 3 Feb 2020 22:26:20 +0100 Subject: vscode: Only handle enter if the suggest widget is hidden. --- editors/code/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index 421124764..c9404a4dd 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -145,7 +145,7 @@ { "command": "rust-analyzer.onEnter", "key": "enter", - "when": "editorTextFocus && editorLangId == rust" + "when": "editorTextFocus && !suggestWidgetVisible && editorLangId == rust" } ], "configuration": { -- cgit v1.2.3 From 8153b60e1d8abdcefbf6c7c9657f1ce65a216d7a Mon Sep 17 00:00:00 2001 From: Veetaha Date: Wed, 5 Feb 2020 22:39:47 +0200 Subject: vscode: eliminate floating promises and insane amount of resource handle leaks --- editors/code/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index c9404a4dd..11d37053e 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -21,7 +21,7 @@ "vscode:prepublish": "tsc && rollup -c", "package": "vsce package", "watch": "tsc --watch", - "fmt": "tsfmt -r && tslint -c tslint.json 'src/**/*.ts' --fix" + "fmt": "tsfmt -r && tslint -p tsconfig.json -c tslint.json 'src/**/*.ts' --fix" }, "dependencies": { "jsonc-parser": "^2.1.0", -- cgit v1.2.3 From 3e0e4e90aeeff25db674f8db562c611bd8016482 Mon Sep 17 00:00:00 2001 From: Veetaha Date: Fri, 7 Feb 2020 03:11:24 +0200 Subject: added fetchLatestArtifactMetadata() and downloadFile() functions --- editors/code/package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index 11d37053e..8e23718cd 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -25,18 +25,22 @@ }, "dependencies": { "jsonc-parser": "^2.1.0", + "node-fetch": "^2.6.0", + "throttle-debounce": "^2.1.0", "vscode-languageclient": "^6.1.0" }, "devDependencies": { "@rollup/plugin-commonjs": "^11.0.2", "@rollup/plugin-node-resolve": "^7.1.1", "@types/node": "^12.12.25", + "@types/node-fetch": "^2.5.4", + "@types/throttle-debounce": "^2.1.0", "@types/vscode": "^1.41.0", "rollup": "^1.31.0", "tslib": "^1.10.0", "tslint": "^5.20.1", - "typescript-formatter": "^7.2.2", "typescript": "^3.7.5", + "typescript-formatter": "^7.2.2", "vsce": "^1.71.0" }, "activationEvents": [ -- cgit v1.2.3 From 5d88c1db38200896d2e4af7836fec95097adf509 Mon Sep 17 00:00:00 2001 From: Veetaha Date: Sat, 8 Feb 2020 04:22:44 +0200 Subject: vscode: amended config to use binary from globalStoragePath, added ui for downloading --- editors/code/package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index 8e23718cd..c0a62619d 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -27,6 +27,7 @@ "jsonc-parser": "^2.1.0", "node-fetch": "^2.6.0", "throttle-debounce": "^2.1.0", + "ts-not-nil": "^1.0.1", "vscode-languageclient": "^6.1.0" }, "devDependencies": { @@ -173,10 +174,11 @@ }, "rust-analyzer.raLspServerPath": { "type": [ + "null", "string" ], - "default": "ra_lsp_server", - "description": "Path to ra_lsp_server executable" + "default": null, + "description": "Path to ra_lsp_server executable (points to bundled binary by default)" }, "rust-analyzer.excludeGlobs": { "type": "array", -- cgit v1.2.3 From a63659badb75d22ad834b7524e77505790c10dd0 Mon Sep 17 00:00:00 2001 From: Veetaha Date: Sun, 9 Feb 2020 13:59:27 +0200 Subject: vscode: replaced unwrapNotNil() with ! as per @matklad --- editors/code/package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'editors/code/package.json') diff --git a/editors/code/package.json b/editors/code/package.json index c0a62619d..f687eb8d4 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -27,7 +27,6 @@ "jsonc-parser": "^2.1.0", "node-fetch": "^2.6.0", "throttle-debounce": "^2.1.0", - "ts-not-nil": "^1.0.1", "vscode-languageclient": "^6.1.0" }, "devDependencies": { -- cgit v1.2.3