From 063f0c52531872c57c3111aa079e1368de37cfe0 Mon Sep 17 00:00:00 2001 From: Kolja Lampe Date: Wed, 31 Jul 2019 00:28:29 +0200 Subject: [PATCH] Use new tree-sitter-web version --- package-lock.json | 12 ++++++------ package.json | 4 ++-- src/util/treeUtils.ts | 10 +--------- tree-sitter-elm.wasm | Bin 846939 -> 846939 bytes 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 779cd3a9..c45f27be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3691,9 +3691,9 @@ "integrity": "sha512-4D3DI3F4uRy09WNtDGD93H9q034OHImxiIcSq664Hq1Y1AScehlP3qqZyTkX/RWxeu0MRMHGkrxYqm2qlDF/aw==" }, "web-tree-sitter": { - "version": "0.15.7", - "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.15.7.tgz", - "integrity": "sha512-wRYrNCLpoj5e1E+8uJJvigJwbCp5o3At1ZMHN3QvctzqyVHofpEiYNJ3D4C/YmxQ6qkGI7m06b8vDeKYzIuXtA==" + "version": "0.15.9", + "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.15.9.tgz", + "integrity": "sha512-1lf4lnmi8oxuEzI6gpUok2FQlHXOmV1iipltkQvmR785JWnUbjhw1sZnwSCkisQP+/g/aezpMGcW3mjz0uVhMw==" }, "which": { "version": "1.3.1", @@ -3741,9 +3741,9 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "ws": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.1.0.tgz", - "integrity": "sha512-Swie2C4fs7CkwlHu1glMePLYJJsWjzhl1vm3ZaLplD0h7OMkZyZ6kLTB/OagiU923bZrPFXuDTeEqaEN4NWG4g==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.1.1.tgz", + "integrity": "sha512-o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A==", "requires": { "async-limiter": "^1.0.0" } diff --git a/package.json b/package.json index 7a0e8bf1..e30653cb 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,8 @@ "rxjs": "^6.5.2", "vscode-languageserver": "^5.2.1", "vscode-uri": "^2.0.3", - "web-tree-sitter": "^0.15.7", - "ws": "^7.1.0" + "web-tree-sitter": "^0.15.9", + "ws": "^7.1.1" }, "devDependencies": { "@types/glob": "^7.1.1", diff --git a/src/util/treeUtils.ts b/src/util/treeUtils.ts index a1bcde91..35eb9b83 100644 --- a/src/util/treeUtils.ts +++ b/src/util/treeUtils.ts @@ -1067,14 +1067,6 @@ export class TreeUtils { node: SyntaxNode, type: string, ): SyntaxNode[] { - const result: SyntaxNode[] = []; - node.children.forEach((a: SyntaxNode) => { - if (a.type === type) { - result.push(a); - } - - result.push(...TreeUtils.descendantsOfType(a, type)); - }); - return result; + return node.descendantsOfType(type); } } diff --git a/tree-sitter-elm.wasm b/tree-sitter-elm.wasm index 3d9993d720543277d707b2873ba1e98f9a307774..4fe3f7069a12cb32c71ff245b9f7d9bfa6624262 100644 GIT binary patch delta 3627 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