diff options
-rw-r--r-- | Cargo.lock | 29 | ||||
-rw-r--r-- | docs/dev/syntax.md | 4 | ||||
-rw-r--r-- | editors/code/package-lock.json | 22 | ||||
-rw-r--r-- | editors/code/package.json | 4 | ||||
-rw-r--r-- | editors/code/src/client.ts | 2 | ||||
-rw-r--r-- | xtask/tests/tidy.rs | 1 |
6 files changed, 37 insertions, 25 deletions
diff --git a/Cargo.lock b/Cargo.lock index b236d69cc..6345ce993 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -242,9 +242,9 @@ dependencies = [ | |||
242 | 242 | ||
243 | [[package]] | 243 | [[package]] |
244 | name = "cmake" | 244 | name = "cmake" |
245 | version = "0.1.44" | 245 | version = "0.1.45" |
246 | source = "registry+https://github.com/rust-lang/crates.io-index" | 246 | source = "registry+https://github.com/rust-lang/crates.io-index" |
247 | checksum = "0e56268c17a6248366d66d4a47a3381369d068cce8409bb1716ed77ea32163bb" | 247 | checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855" |
248 | dependencies = [ | 248 | dependencies = [ |
249 | "cc", | 249 | "cc", |
250 | ] | 250 | ] |
@@ -1066,9 +1066,9 @@ checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" | |||
1066 | 1066 | ||
1067 | [[package]] | 1067 | [[package]] |
1068 | name = "once_cell" | 1068 | name = "once_cell" |
1069 | version = "1.5.1" | 1069 | version = "1.5.2" |
1070 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1070 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1071 | checksum = "f53cef67919d7d247eb9a2f128ca9e522789967ef1eb4ccd8c71a95a8aedf596" | 1071 | checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" |
1072 | 1072 | ||
1073 | [[package]] | 1073 | [[package]] |
1074 | name = "oorandom" | 1074 | name = "oorandom" |
@@ -1740,9 +1740,18 @@ dependencies = [ | |||
1740 | 1740 | ||
1741 | [[package]] | 1741 | [[package]] |
1742 | name = "tinyvec" | 1742 | name = "tinyvec" |
1743 | version = "0.3.4" | 1743 | version = "1.0.1" |
1744 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1745 | checksum = "b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575" | ||
1746 | dependencies = [ | ||
1747 | "tinyvec_macros", | ||
1748 | ] | ||
1749 | |||
1750 | [[package]] | ||
1751 | name = "tinyvec_macros" | ||
1752 | version = "0.1.0" | ||
1744 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1753 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1745 | checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" | 1754 | checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" |
1746 | 1755 | ||
1747 | [[package]] | 1756 | [[package]] |
1748 | name = "toolchain" | 1757 | name = "toolchain" |
@@ -1880,18 +1889,18 @@ dependencies = [ | |||
1880 | 1889 | ||
1881 | [[package]] | 1890 | [[package]] |
1882 | name = "unicode-normalization" | 1891 | name = "unicode-normalization" |
1883 | version = "0.1.13" | 1892 | version = "0.1.14" |
1884 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1893 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1885 | checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" | 1894 | checksum = "b7f98e67a4d84f730d343392f9bfff7d21e3fca562b9cb7a43b768350beeddc6" |
1886 | dependencies = [ | 1895 | dependencies = [ |
1887 | "tinyvec", | 1896 | "tinyvec", |
1888 | ] | 1897 | ] |
1889 | 1898 | ||
1890 | [[package]] | 1899 | [[package]] |
1891 | name = "unicode-segmentation" | 1900 | name = "unicode-segmentation" |
1892 | version = "1.6.0" | 1901 | version = "1.7.0" |
1893 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1902 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1894 | checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" | 1903 | checksum = "db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae" |
1895 | 1904 | ||
1896 | [[package]] | 1905 | [[package]] |
1897 | name = "unicode-xid" | 1906 | name = "unicode-xid" |
diff --git a/docs/dev/syntax.md b/docs/dev/syntax.md index 2eb08b7ca..1edafab68 100644 --- a/docs/dev/syntax.md +++ b/docs/dev/syntax.md | |||
@@ -195,7 +195,7 @@ Modeling this with immutable trees is possible, but annoying. | |||
195 | A function green tree is not super-convenient to use. | 195 | A function green tree is not super-convenient to use. |
196 | The biggest problem is accessing parents (there are no parent pointers!). | 196 | The biggest problem is accessing parents (there are no parent pointers!). |
197 | But there are also "identify" issues. | 197 | But there are also "identify" issues. |
198 | Let's say you want to write a code which builds a list of expressions in a file: `fn collect_exrepssions(file: GreenNode) -> HashSet<GreenNode>`. | 198 | Let's say you want to write a code which builds a list of expressions in a file: `fn collect_expressions(file: GreenNode) -> HashSet<GreenNode>`. |
199 | For the input like | 199 | For the input like |
200 | 200 | ||
201 | ```rust | 201 | ```rust |
@@ -236,7 +236,7 @@ impl SyntaxNode { | |||
236 | self.parent.clone() | 236 | self.parent.clone() |
237 | } | 237 | } |
238 | fn children(&self) -> impl Iterator<Item = SyntaxNode> { | 238 | fn children(&self) -> impl Iterator<Item = SyntaxNode> { |
239 | let mut offset = self.offset | 239 | let mut offset = self.offset; |
240 | self.green.children().map(|green_child| { | 240 | self.green.children().map(|green_child| { |
241 | let child_offset = offset; | 241 | let child_offset = offset; |
242 | offset += green_child.text_len; | 242 | offset += green_child.text_len; |
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json index 83ef00058..a60d3668b 100644 --- a/editors/code/package-lock.json +++ b/editors/code/package-lock.json | |||
@@ -2414,27 +2414,27 @@ | |||
2414 | "integrity": "sha512-1nG+6cuTtpzmXe7yYfO9GCkYlyV6Ai+jDnwidHiT2T7zhc+bJM+VTtc0T/CdTlDyTNTqIcCj0V1nD4TcVjJ7Ug==" | 2414 | "integrity": "sha512-1nG+6cuTtpzmXe7yYfO9GCkYlyV6Ai+jDnwidHiT2T7zhc+bJM+VTtc0T/CdTlDyTNTqIcCj0V1nD4TcVjJ7Ug==" |
2415 | }, | 2415 | }, |
2416 | "vscode-languageclient": { | 2416 | "vscode-languageclient": { |
2417 | "version": "7.0.0-next.12", | 2417 | "version": "7.0.0-next.14", |
2418 | "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.12.tgz", | 2418 | "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.14.tgz", |
2419 | "integrity": "sha512-OrzvOvhS5o26C0KctTJC7hkwh3avCwkVhllzy42AqwpIUZ3p2aVqkSG2uVxaeodq8ThBb3TLgtg50vxyWs6FEg==", | 2419 | "integrity": "sha512-QUccfXK2F6AXXRFR8QJCaIz7N2BhJK6ok8E1aO8LHq2IBU33+5hTSJBXs7nEqrqZ/cY2VlDDbMWtMvCxz+/y1w==", |
2420 | "requires": { | 2420 | "requires": { |
2421 | "semver": "^6.3.0", | 2421 | "semver": "^6.3.0", |
2422 | "vscode-languageserver-protocol": "3.16.0-next.10" | 2422 | "vscode-languageserver-protocol": "3.16.0-next.11" |
2423 | } | 2423 | } |
2424 | }, | 2424 | }, |
2425 | "vscode-languageserver-protocol": { | 2425 | "vscode-languageserver-protocol": { |
2426 | "version": "3.16.0-next.10", | 2426 | "version": "3.16.0-next.11", |
2427 | "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.10.tgz", | 2427 | "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.11.tgz", |
2428 | "integrity": "sha512-YRTctHUZvts0Z1xXKNYU0ha0o+Tlgtwr+6O8OmDquM086N8exiSKBMwMC+Ra1QtIE+1mfW43Wxsme2FnMkAS9A==", | 2428 | "integrity": "sha512-31FmupmSmfznuMuGp7qN6h3d/hKUbexbvcwTvrUE/igqRlzFU542s8MtGICx1ERbVuDOLGp96W2Z92qbUbmBPA==", |
2429 | "requires": { | 2429 | "requires": { |
2430 | "vscode-jsonrpc": "6.0.0-next.7", | 2430 | "vscode-jsonrpc": "6.0.0-next.7", |
2431 | "vscode-languageserver-types": "3.16.0-next.4" | 2431 | "vscode-languageserver-types": "3.16.0-next.5" |
2432 | } | 2432 | } |
2433 | }, | 2433 | }, |
2434 | "vscode-languageserver-types": { | 2434 | "vscode-languageserver-types": { |
2435 | "version": "3.16.0-next.4", | 2435 | "version": "3.16.0-next.5", |
2436 | "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.4.tgz", | 2436 | "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.5.tgz", |
2437 | "integrity": "sha512-NlKJyGcET/ZBCCLBYIPaGo2c37R03bPYeWXozUtnjyye7+9dhlbMSODyoG2INcQf8zFmB4qhm2UOJjgYEgPCNA==" | 2437 | "integrity": "sha512-lf8Y1XXMtF1r2oDDAmJe+drizNXkybSRXAQQk5dPy2rYJsY9SPXYNO074L3THu9zNYepzV5fRJZUPo/V/TLBRQ==" |
2438 | }, | 2438 | }, |
2439 | "vscode-test": { | 2439 | "vscode-test": { |
2440 | "version": "1.4.0", | 2440 | "version": "1.4.0", |
diff --git a/editors/code/package.json b/editors/code/package.json index 220d44abc..a2d6b1148 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -21,7 +21,7 @@ | |||
21 | "Programming Languages" | 21 | "Programming Languages" |
22 | ], | 22 | ], |
23 | "engines": { | 23 | "engines": { |
24 | "vscode": "^1.47.1" | 24 | "vscode": "^1.51.0" |
25 | }, | 25 | }, |
26 | "enableProposedApi": true, | 26 | "enableProposedApi": true, |
27 | "scripts": { | 27 | "scripts": { |
@@ -36,7 +36,7 @@ | |||
36 | }, | 36 | }, |
37 | "dependencies": { | 37 | "dependencies": { |
38 | "node-fetch": "^2.6.1", | 38 | "node-fetch": "^2.6.1", |
39 | "vscode-languageclient": "7.0.0-next.12" | 39 | "vscode-languageclient": "7.0.0-next.14" |
40 | }, | 40 | }, |
41 | "devDependencies": { | 41 | "devDependencies": { |
42 | "@rollup/plugin-commonjs": "^13.0.2", | 42 | "@rollup/plugin-commonjs": "^13.0.2", |
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts index c9d032ead..63ab82dde 100644 --- a/editors/code/src/client.ts +++ b/editors/code/src/client.ts | |||
@@ -174,6 +174,8 @@ class ExperimentalFeatures implements lc.StaticFeature { | |||
174 | } | 174 | } |
175 | initialize(_capabilities: lc.ServerCapabilities<any>, _documentSelector: lc.DocumentSelector | undefined): void { | 175 | initialize(_capabilities: lc.ServerCapabilities<any>, _documentSelector: lc.DocumentSelector | undefined): void { |
176 | } | 176 | } |
177 | dispose(): void { | ||
178 | } | ||
177 | } | 179 | } |
178 | 180 | ||
179 | function isCodeActionWithoutEditsAndCommands(value: any): boolean { | 181 | function isCodeActionWithoutEditsAndCommands(value: any): boolean { |
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs index 99652e76b..4c58aed59 100644 --- a/xtask/tests/tidy.rs +++ b/xtask/tests/tidy.rs | |||
@@ -168,6 +168,7 @@ ISC | |||
168 | MIT | 168 | MIT |
169 | MIT / Apache-2.0 | 169 | MIT / Apache-2.0 |
170 | MIT OR Apache-2.0 | 170 | MIT OR Apache-2.0 |
171 | MIT OR Apache-2.0 OR Zlib | ||
171 | MIT OR Zlib OR Apache-2.0 | 172 | MIT OR Zlib OR Apache-2.0 |
172 | MIT/Apache-2.0 | 173 | MIT/Apache-2.0 |
173 | Unlicense OR MIT | 174 | Unlicense OR MIT |