From cc8ca52ba1b1cea9e7a1146185513b558151f6b0 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 19 Dec 2018 09:55:23 -0800 Subject: [PATCH 1/2] :arrow_up: language-javascript, update test w/ new scope mapping --- package-lock.json | 18 +++++++++--------- package.json | 4 ++-- spec/tree-sitter-language-mode-spec.js | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9fbcf6916..a395c230d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3194,10 +3194,10 @@ "integrity": "sha512-kdTsc2efREnuj72WsAfcx28h0RqrVUIGF7BQcS5zy+ZibqbvnaB5DiVunRFYLhefGoaKVkAyTdRkZWMKH/yIWg==" }, "language-javascript": { - "version": "https://www.atom.io/api/packages/language-javascript/versions/0.129.18/tarball", - "integrity": "sha512-ZCcMHpz7tiBzKCeaDzNGfDcthz504qcleo9hsPFcPkGL0uwOBe4AWpX1xNUz+Uhljf9jHzu7aS3d2G0lvGAMKQ==", + "version": "https://www.atom.io/api/packages/language-javascript/versions/0.129.19-0/tarball", + "integrity": "sha512-3dTPXQAH0Be5uOpNl0p28J8OlCWRA7cKATFnXRk5YcdNJrEEsFXKtYw/oIhm0pWn79DWsET25suPlOp1WOZQNg==", "requires": { - "tree-sitter-javascript": "^0.13.8", + "tree-sitter-javascript": "^0.13.10", "tree-sitter-jsdoc": "^0.13.4", "tree-sitter-regex": "^0.13.1" } @@ -5670,9 +5670,9 @@ } }, "tree-sitter-javascript": { - "version": "0.13.8", - "resolved": "https://registry.npmjs.org/tree-sitter-javascript/-/tree-sitter-javascript-0.13.8.tgz", - "integrity": "sha512-p7u6ZXEX1sIjgGNAiuSNnK6PSl5FiUsQzEV2QOAYVH5GN13cUnUsoa/BiaDMWQ3uddoNXwTdxhB8UwNAolizQQ==", + "version": "0.13.10", + "resolved": "https://registry.npmjs.org/tree-sitter-javascript/-/tree-sitter-javascript-0.13.10.tgz", + "integrity": "sha512-ku/841Nu7k/VXwI2ifm7xxv2cUiiYztLlIeYTYZXpjaIHMfFer5XZRgmZldJHVthTQ9uRMEr7UQ0qeqnWKzOlg==", "requires": { "nan": "^2.4.0" } @@ -5686,9 +5686,9 @@ }, "dependencies": { "nan": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz", - "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==" + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", + "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==" } } }, diff --git a/package.json b/package.json index 5f6b7f9ee..19a75520e 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "language-html": "https://www.atom.io/api/packages/language-html/versions/0.51.5/tarball", "language-hyperlink": "https://www.atom.io/api/packages/language-hyperlink/versions/0.17.0/tarball", "language-java": "https://www.atom.io/api/packages/language-java/versions/0.31.1/tarball", - "language-javascript": "https://www.atom.io/api/packages/language-javascript/versions/0.129.18/tarball", + "language-javascript": "https://www.atom.io/api/packages/language-javascript/versions/0.129.19-0/tarball", "language-json": "https://www.atom.io/api/packages/language-json/versions/0.19.2/tarball", "language-less": "https://www.atom.io/api/packages/language-less/versions/0.34.3/tarball", "language-make": "https://www.atom.io/api/packages/language-make/versions/0.23.0/tarball", @@ -241,7 +241,7 @@ "language-html": "0.51.5", "language-hyperlink": "0.17.0", "language-java": "0.31.1", - "language-javascript": "0.129.18", + "language-javascript": "0.129.19-0", "language-json": "0.19.2", "language-less": "0.34.3", "language-make": "0.23.0", diff --git a/spec/tree-sitter-language-mode-spec.js b/spec/tree-sitter-language-mode-spec.js index 83d505011..7b8344d9c 100644 --- a/spec/tree-sitter-language-mode-spec.js +++ b/spec/tree-sitter-language-mode-spec.js @@ -407,7 +407,7 @@ describe('TreeSitterLanguageMode', () => { scopes: { 'identifier': 'variable', 'call_expression > identifier': 'function', - 'new_expression > call_expression > identifier': 'constructor' + 'new_expression > identifier': 'constructor' } }) From accfc4475aa6212be85f6d386895a928afe289ef Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 19 Dec 2018 10:56:23 -0800 Subject: [PATCH 2/2] Update language-javascript from prerelease version --- package-lock.json | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index a395c230d..edd4ce92f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3194,8 +3194,8 @@ "integrity": "sha512-kdTsc2efREnuj72WsAfcx28h0RqrVUIGF7BQcS5zy+ZibqbvnaB5DiVunRFYLhefGoaKVkAyTdRkZWMKH/yIWg==" }, "language-javascript": { - "version": "https://www.atom.io/api/packages/language-javascript/versions/0.129.19-0/tarball", - "integrity": "sha512-3dTPXQAH0Be5uOpNl0p28J8OlCWRA7cKATFnXRk5YcdNJrEEsFXKtYw/oIhm0pWn79DWsET25suPlOp1WOZQNg==", + "version": "https://www.atom.io/api/packages/language-javascript/versions/0.129.19/tarball", + "integrity": "sha512-ClPU0dc41WqagaPd+qy5DQ5ahDCVcfFxC1nwppyQSsSXzrzsiE2+FuYzG33OMaSGDA6/zZ6gBkHXnXXPFzWcNA==", "requires": { "tree-sitter-javascript": "^0.13.10", "tree-sitter-jsdoc": "^0.13.4", diff --git a/package.json b/package.json index 19a75520e..c97b46440 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "language-html": "https://www.atom.io/api/packages/language-html/versions/0.51.5/tarball", "language-hyperlink": "https://www.atom.io/api/packages/language-hyperlink/versions/0.17.0/tarball", "language-java": "https://www.atom.io/api/packages/language-java/versions/0.31.1/tarball", - "language-javascript": "https://www.atom.io/api/packages/language-javascript/versions/0.129.19-0/tarball", + "language-javascript": "https://www.atom.io/api/packages/language-javascript/versions/0.129.19/tarball", "language-json": "https://www.atom.io/api/packages/language-json/versions/0.19.2/tarball", "language-less": "https://www.atom.io/api/packages/language-less/versions/0.34.3/tarball", "language-make": "https://www.atom.io/api/packages/language-make/versions/0.23.0/tarball", @@ -241,7 +241,7 @@ "language-html": "0.51.5", "language-hyperlink": "0.17.0", "language-java": "0.31.1", - "language-javascript": "0.129.19-0", + "language-javascript": "0.129.19", "language-json": "0.19.2", "language-less": "0.34.3", "language-make": "0.23.0",