github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 23:08:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow a node matching function in bufferRangeForScopeAtPosition

Browse Source
This commit is contained in:
Ashi Krishnan
2018-07-20 20:56:53 -04:00
parent be0565f3f4
commit 7cbd209811
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/selectors.js
View File

@@ -22,6 +22,7 @@ const always = scope => true
// true iff the scope matches the selector.
function matcherForSelector (selector) {
const parts = parse(selector)
if (typeof parts === 'function') return parts
return selector
? scope => isSubset(parts, parse(scope))
: always

11
src/tree-sitter-language-mode.js
View File

@@ -349,18 +349,18 @@ class TreeSitterLanguageMode {
Section - Syntax Tree APIs
*/
getRangeForSyntaxNodeContainingRange (range, selector) {
getRangeForSyntaxNodeContainingRange (range, where = _ => true) {
const startIndex = this.buffer.characterIndexForPosition(range.start)
const endIndex = this.buffer.characterIndexForPosition(range.end)
const searchEndIndex = Math.max(0, endIndex - 1)
const matches = matcherForSelector(selector)
let smallestNode
this._forEachTreeWithRange(range, tree => {
if (typeof selector === 'function') debugger
let node = tree.rootNode.descendantForIndex(startIndex, searchEndIndex)
while (node) {
if (nodeContainsIndices(node, startIndex, endIndex) && matches(node.type)) {
if (nodeContainsIndices(node, startIndex, endIndex) && where(node)) {
if (nodeIsSmaller(node, smallestNode)) smallestNode = node
break
}
@@ -372,6 +372,11 @@ class TreeSitterLanguageMode {
}
bufferRangeForScopeAtPosition (selector, position) {
if (typeof selector === 'string') {
const match = matcherForSelector(selector)
selector = ({type}) => match(type)
}
if (selector === null) selector = undefined
return this.getRangeForSyntaxNodeContainingRange(new Range(position, position), selector)
}