Merge pull request #87 from atom-ide-community/upstream_master

Author: aminya

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "1.51.0-dev",
+  "version": "1.52.0-dev",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/main-process/main.js",
   "repository": {
@@ -97,7 +97,7 @@
     "language-mustache": "https://www.atom.io/api/packages/language-mustache/versions/0.14.5/tarball",
     "language-objective-c": "https://www.atom.io/api/packages/language-objective-c/versions/0.16.0/tarball",
     "language-perl": "https://www.atom.io/api/packages/language-perl/versions/0.38.1/tarball",
-    "language-php": "https://www.atom.io/api/packages/language-php/versions/0.44.5/tarball",
+    "language-php": "https://www.atom.io/api/packages/language-php/versions/0.44.6/tarball",
     "language-property-list": "https://www.atom.io/api/packages/language-property-list/versions/0.9.1/tarball",
     "language-python": "https://www.atom.io/api/packages/language-python/versions/0.53.4/tarball",
     "language-ruby": "https://www.atom.io/api/packages/language-ruby/versions/0.72.23/tarball",
@@ -249,7 +249,7 @@
     "language-mustache": "0.14.5",
     "language-objective-c": "0.16.0",
     "language-perl": "0.38.1",
-    "language-php": "0.44.5",
+    "language-php": "0.44.6",
     "language-property-list": "0.9.1",
     "language-python": "0.53.4",
     "language-ruby": "0.72.23",

package.json

@@ -45,19 +45,24 @@ const CONFIG = require('./config')
 const backupNodeModules = require('./lib/backup-node-modules')
 const runApmInstall = require('./lib/run-apm-install')
 
+function assertExecutablePaths(executablePaths) {
+	assert(executablePaths.length !== 0, `No atom build found. Please run "script/build" and try again.`)
+	assert(executablePaths.length === 1, `More than one application to run tests against was found. ${executablePaths.join(',')}`)
+}
+
 const resourcePath = CONFIG.repositoryRootPath
 let executablePath
 if (process.platform === 'darwin') {
   const executablePaths = glob.sync(path.join(CONFIG.buildOutputPath, '*.app'))
-  assert(executablePaths.length === 1, `A single application to run tests against was not found. ${executablePaths.join(',')}`)
+  assertExecutablePaths(executablePaths)
   executablePath = path.join(executablePaths[0], 'Contents', 'MacOS', path.basename(executablePaths[0], '.app'))
 } else if (process.platform === 'linux') {
   const executablePaths = glob.sync(path.join(CONFIG.buildOutputPath, 'atom-*', 'atom'))
-  assert(executablePaths.length === 1, `A single application to run tests against was not found. ${executablePaths.join(',')}`)
+  assertExecutablePaths(executablePaths)
   executablePath = executablePaths[0]
 } else if (process.platform === 'win32') {
   const executablePaths = glob.sync(path.join(CONFIG.buildOutputPath, '**', 'atom*.exe'))
-  assert(executablePaths.length === 1, `A single application to run tests against was not found. ${executablePaths.join(',')}`)
+  assertExecutablePaths(executablePaths)
   executablePath = executablePaths[0]
 } else {
   throw new Error('##[error] Running tests on this platform is not supported.')

script/test

@@ -73,6 +73,58 @@ describe('TreeSitterLanguageMode', () => {
       ]);
     });
 
+    it('provides the grammar with the text of leaf nodes only', async () => {
+      const grammar = new TreeSitterGrammar(atom.grammars, jsGrammarPath, {
+        parser: 'tree-sitter-javascript',
+        scopes: {
+          program: 'source',
+          'call_expression > identifier': 'function',
+          property_identifier: 'property',
+          'call_expression > member_expression > property_identifier': 'method'
+        }
+      });
+      const original = grammar.idForScope.bind(grammar);
+      let tokens = [];
+      grammar.idForScope = function(scope, text) {
+        if (text && tokens[tokens.length - 1] !== text) {
+          tokens.push(text);
+        }
+        return original(scope, text);
+      };
+
+      buffer.setText('aa.bbb = cc(d.eee());');
+
+      const languageMode = new TreeSitterLanguageMode({ buffer, grammar });
+      buffer.setLanguageMode(languageMode);
+
+      expectTokensToEqual(editor, [
+        [
+          { text: 'aa.', scopes: ['source'] },
+          { text: 'bbb', scopes: ['source', 'property'] },
+          { text: ' = ', scopes: ['source'] },
+          { text: 'cc', scopes: ['source', 'function'] },
+          { text: '(d.', scopes: ['source'] },
+          { text: 'eee', scopes: ['source', 'method'] },
+          { text: '());', scopes: ['source'] }
+        ]
+      ]);
+
+      expect(tokens).toEqual([
+        'aa',
+        '.',
+        'bbb',
+        '=',
+        'cc',
+        '(',
+        'd',
+        '.',
+        'eee',
+        '(',
+        ')',
+        ';'
+      ]);
+    });
+
     it('can start or end multiple scopes at the same position', async () => {
       const grammar = new TreeSitterGrammar(atom.grammars, jsGrammarPath, {
         parser: 'tree-sitter-javascript',

spec/tree-sitter-language-mode-spec.js

@@ -71,6 +71,9 @@ module.exports = class TreeSitterGrammar {
   }
 
   idForScope(scopeName) {
+    if (!scopeName) {
+      return undefined;
+    }
     let id = this.idsByScope[scopeName];
     if (!id) {
       id = this.nextScopeId += 2;

src/tree-sitter-grammar.js

@@ -1292,7 +1292,13 @@ class LayerHighlightIterator {
       this.treeCursor.nodeIsNamed
     );
     const scopeName = applyLeafRules(value, this.treeCursor);
-    if (scopeName) {
+    const node = this.treeCursor.currentNode;
+    if (!node.childCount) {
+      return this.languageLayer.languageMode.grammar.idForScope(
+        scopeName,
+        node.text
+      );
+    } else if (scopeName) {
       return this.languageLayer.languageMode.grammar.idForScope(scopeName);
     }
   }