From ea8165a1ca9646a93db0483cc4416ccccbe112c2 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 21 Feb 2018 10:16:42 -0800 Subject: [PATCH] Make TreeSitterLanguageMode.scopeDescriptorForPosition accept arrays Fixes #16808 --- spec/tree-sitter-language-mode-spec.js | 2 +- src/tree-sitter-language-mode.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/tree-sitter-language-mode-spec.js b/spec/tree-sitter-language-mode-spec.js index ae3daf83c..a788fac47 100644 --- a/spec/tree-sitter-language-mode-spec.js +++ b/spec/tree-sitter-language-mode-spec.js @@ -542,7 +542,7 @@ describe('TreeSitterLanguageMode', () => { buffer.setText('foo({bar: baz});') editor.screenLineForScreenRow(0) - expect(editor.scopeDescriptorForBufferPosition({row: 0, column: 6}).getScopesArray()).toEqual([ + expect(editor.scopeDescriptorForBufferPosition([0, 6]).getScopesArray()).toEqual([ 'javascript', 'program', 'expression_statement', diff --git a/src/tree-sitter-language-mode.js b/src/tree-sitter-language-mode.js index 5c6a91930..0d2fab8cf 100644 --- a/src/tree-sitter-language-mode.js +++ b/src/tree-sitter-language-mode.js @@ -303,6 +303,7 @@ class TreeSitterLanguageMode { } scopeDescriptorForPosition (point) { + point = Point.fromObject(point) const result = [] let node = this.document.rootNode.descendantForPosition(point)