github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix TreeSitterLanguageMode.isRowCommented

Browse Source
This commit is contained in:
Max Brunsfeld
2018-08-21 13:02:27 -07:00
parent d982446b9b
commit d1283fa69f
2 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,15 @@ class TreeSitterLanguageMode {
return this.grammar.commentStrings
}
isRowCommented () {
isRowCommented (row) {
const firstNonWhitespaceRange = this.buffer.findInRangeSync(
/\S/,
new Range(new Point(row, 0), new Point(row, Infinity))
)
if (firstNonWhitespaceRange) {
const firstNode = this.getSyntaxNodeContainingRange(firstNonWhitespaceRange)
if (firstNode) return firstNode.type.includes('comment')
}
return false
}
@@ -265,7 +273,9 @@ class TreeSitterLanguageMode {
}
_forEachTreeWithRange (range, callback) {
callback(this.rootLanguageLayer.tree, this.rootLanguageLayer.grammar)
if (this.rootLanguageLayer.tree) {
callback(this.rootLanguageLayer.tree, this.rootLanguageLayer.grammar)
}
const injectionMarkers = this.injectionsMarkerLayer.findMarkers({
intersectsRange: range