Merge #6577 #6579 #6581

bors[bot] · jakobhellermann · kjeremy · web-flow · commit 99975d08f0f1 · 2020-11-17T18:01:18.000Z
6577: fix typos in syntax.md r=matklad a=jakobhellermann



6579: cargo update and add new license r=matklad a=kjeremy



6581: Use vscode-languageclient 7.0.0-next.14 r=matklad a=kjeremy



Co-authored-by: Jakob Hellermann &lt;jakob.hellermann@protonmail.com&gt;
Co-authored-by: kjeremy &lt;kjeremy@gmail.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docs/dev/syntax.md b/docs/dev/syntax.md
@@ -195,7 +195,7 @@ Modeling this with immutable trees is possible, but annoying.
 A function green tree is not super-convenient to use.
 The biggest problem is accessing parents (there are no parent pointers!).
 But there are also "identify" issues.
-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>`.
+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>`.
 For the input like
 
 ```rust
@@ -236,7 +236,7 @@ impl SyntaxNode {
         self.parent.clone()
     }
     fn children(&self) -> impl Iterator<Item = SyntaxNode> {
-        let mut offset = self.offset
+        let mut offset = self.offset;
         self.green.children().map(|green_child| {
             let child_offset = offset;
             offset += green_child.text_len;
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
diff --git a/editors/code/package.json b/editors/code/package.json
@@ -21,7 +21,7 @@
         "Programming Languages"
     ],
     "engines": {
-        "vscode": "^1.47.1"
+        "vscode": "^1.51.0"
     },
     "enableProposedApi": true,
     "scripts": {
@@ -36,7 +36,7 @@
     },
     "dependencies": {
         "node-fetch": "^2.6.1",
-        "vscode-languageclient": "7.0.0-next.12"
+        "vscode-languageclient": "7.0.0-next.14"
     },
     "devDependencies": {
         "@rollup/plugin-commonjs": "^13.0.2",
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
@@ -174,6 +174,8 @@ class ExperimentalFeatures implements lc.StaticFeature {
     }
     initialize(_capabilities: lc.ServerCapabilities<any>, _documentSelector: lc.DocumentSelector | undefined): void {
     }
+    dispose(): void {
+    }
 }
 
 function isCodeActionWithoutEditsAndCommands(value: any): boolean {
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
@@ -168,6 +168,7 @@ ISC
 MIT
 MIT / Apache-2.0
 MIT OR Apache-2.0
+MIT OR Apache-2.0 OR Zlib
 MIT OR Zlib OR Apache-2.0
 MIT/Apache-2.0
 Unlicense OR MIT

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,8 @@ class ExperimentalFeatures implements lc.StaticFeature {`
`174`	`174`	`}`
`175`	`175`	`initialize(_capabilities: lc.ServerCapabilities<any>, _documentSelector: lc.DocumentSelector \| undefined): void {`
`176`	`176`	`}`
	`177`	`+ dispose(): void {`
	`178`	`+ }`
`177`	`179`	`}`
`178`	`180`
`179`	`181`	`function isCodeActionWithoutEditsAndCommands(value: any): boolean {`