diff options
author | Kevin DeLorey <[email protected]> | 2020-02-09 16:25:47 +0000 |
---|---|---|
committer | Kevin DeLorey <[email protected]> | 2020-02-09 16:37:43 +0000 |
commit | a957c473fdb79880c39b73dc9e0c923093cf16ac (patch) | |
tree | f998b548f530ce604651e0e6af314ed2ec74b3b5 /editors/code/package.json | |
parent | 22caf982b99c54058e2e9200aeea0e61cada284a (diff) | |
parent | 1b9b13b4b4a75b5531c3f046ce6bf72d681f2732 (diff) |
Merge branch 'master' into kdelorey/complete-trait-impl
Diffstat (limited to 'editors/code/package.json')
-rw-r--r-- | editors/code/package.json | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/editors/code/package.json b/editors/code/package.json index cd9c99b35..f687eb8d4 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -8,7 +8,8 @@ | |||
8 | "version": "0.1.0", | 8 | "version": "0.1.0", |
9 | "publisher": "matklad", | 9 | "publisher": "matklad", |
10 | "repository": { | 10 | "repository": { |
11 | "url": "https://github.com/matklad/rust-analyzer/" | 11 | "url": "https://github.com/rust-analyzer/rust-analyzer.git", |
12 | "type": "git" | ||
12 | }, | 13 | }, |
13 | "categories": [ | 14 | "categories": [ |
14 | "Other" | 15 | "Other" |
@@ -17,27 +18,28 @@ | |||
17 | "vscode": "^1.41.0" | 18 | "vscode": "^1.41.0" |
18 | }, | 19 | }, |
19 | "scripts": { | 20 | "scripts": { |
20 | "vscode:prepublish": "rollup -c", | 21 | "vscode:prepublish": "tsc && rollup -c", |
21 | "package": "vsce package", | 22 | "package": "vsce package", |
22 | "watch": "tsc -watch -p ./", | 23 | "watch": "tsc --watch", |
23 | "fmt": "tsfmt -r && tslint -c tslint.json 'src/**/*.ts' --fix" | 24 | "fmt": "tsfmt -r && tslint -p tsconfig.json -c tslint.json 'src/**/*.ts' --fix" |
24 | }, | 25 | }, |
25 | "dependencies": { | 26 | "dependencies": { |
26 | "jsonc-parser": "^2.1.0", | 27 | "jsonc-parser": "^2.1.0", |
27 | "seedrandom": "^3.0.5", | 28 | "node-fetch": "^2.6.0", |
28 | "vscode-languageclient": "^6.0.1" | 29 | "throttle-debounce": "^2.1.0", |
30 | "vscode-languageclient": "^6.1.0" | ||
29 | }, | 31 | }, |
30 | "devDependencies": { | 32 | "devDependencies": { |
31 | "@rollup/plugin-commonjs": "^11.0.0", | 33 | "@rollup/plugin-commonjs": "^11.0.2", |
32 | "@rollup/plugin-node-resolve": "^6.0.0", | 34 | "@rollup/plugin-node-resolve": "^7.1.1", |
33 | "@rollup/plugin-typescript": "^2.0.1", | 35 | "@types/node": "^12.12.25", |
34 | "@types/node": "^12.12.21", | 36 | "@types/node-fetch": "^2.5.4", |
35 | "@types/seedrandom": "^2.4.28", | 37 | "@types/throttle-debounce": "^2.1.0", |
36 | "@types/vscode": "^1.41.0", | 38 | "@types/vscode": "^1.41.0", |
37 | "rollup": "^1.27.14", | 39 | "rollup": "^1.31.0", |
38 | "tslib": "^1.10.0", | 40 | "tslib": "^1.10.0", |
39 | "tslint": "^5.20.1", | 41 | "tslint": "^5.20.1", |
40 | "typescript": "^3.7.3", | 42 | "typescript": "^3.7.5", |
41 | "typescript-formatter": "^7.2.2", | 43 | "typescript-formatter": "^7.2.2", |
42 | "vsce": "^1.71.0" | 44 | "vsce": "^1.71.0" |
43 | }, | 45 | }, |
@@ -116,6 +118,11 @@ | |||
116 | "command": "rust-analyzer.reload", | 118 | "command": "rust-analyzer.reload", |
117 | "title": "Restart server", | 119 | "title": "Restart server", |
118 | "category": "Rust Analyzer" | 120 | "category": "Rust Analyzer" |
121 | }, | ||
122 | { | ||
123 | "command": "rust-analyzer.onEnter", | ||
124 | "title": "Enhanced enter key", | ||
125 | "category": "Rust Analyzer" | ||
119 | } | 126 | } |
120 | ], | 127 | ], |
121 | "keybindings": [ | 128 | "keybindings": [ |
@@ -138,6 +145,11 @@ | |||
138 | "command": "rust-analyzer.run", | 145 | "command": "rust-analyzer.run", |
139 | "key": "ctrl+r", | 146 | "key": "ctrl+r", |
140 | "when": "editorTextFocus && editorLangId == rust" | 147 | "when": "editorTextFocus && editorLangId == rust" |
148 | }, | ||
149 | { | ||
150 | "command": "rust-analyzer.onEnter", | ||
151 | "key": "enter", | ||
152 | "when": "editorTextFocus && !suggestWidgetVisible && editorLangId == rust" | ||
141 | } | 153 | } |
142 | ], | 154 | ], |
143 | "configuration": { | 155 | "configuration": { |
@@ -159,17 +171,13 @@ | |||
159 | "default": {}, | 171 | "default": {}, |
160 | "description": "Fine grained feature flags to disable annoying features" | 172 | "description": "Fine grained feature flags to disable annoying features" |
161 | }, | 173 | }, |
162 | "rust-analyzer.enableEnhancedTyping": { | ||
163 | "type": "boolean", | ||
164 | "default": true, | ||
165 | "description": "Enables enhanced typing. NOTE: If using a VIM extension, you should set this to false" | ||
166 | }, | ||
167 | "rust-analyzer.raLspServerPath": { | 174 | "rust-analyzer.raLspServerPath": { |
168 | "type": [ | 175 | "type": [ |
176 | "null", | ||
169 | "string" | 177 | "string" |
170 | ], | 178 | ], |
171 | "default": "ra_lsp_server", | 179 | "default": null, |
172 | "description": "Path to ra_lsp_server executable" | 180 | "description": "Path to ra_lsp_server executable (points to bundled binary by default)" |
173 | }, | 181 | }, |
174 | "rust-analyzer.excludeGlobs": { | 182 | "rust-analyzer.excludeGlobs": { |
175 | "type": "array", | 183 | "type": "array", |