mirror of
https://github.com/atom/atom.git
synced 2026-04-28 03:01:47 -04:00
Merge pull request #22080 from lierdakil/fix-tree-sitter-highlight-iterator-2
Fix tree-sitter-language-mode null highlight iterators
This commit is contained in:
@@ -145,7 +145,7 @@ class TreeSitterLanguageMode {
|
||||
*/
|
||||
|
||||
buildHighlightIterator() {
|
||||
if (!this.rootLanguageLayer) return new NullHighlightIterator();
|
||||
if (!this.rootLanguageLayer) return new NullLanguageModeHighlightIterator();
|
||||
return new HighlightIterator(this);
|
||||
}
|
||||
|
||||
@@ -651,7 +651,7 @@ class LanguageLayer {
|
||||
if (this.tree) {
|
||||
return new LayerHighlightIterator(this, this.tree.walk());
|
||||
} else {
|
||||
return new NullHighlightIterator();
|
||||
return new NullLayerHighlightIterator();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1337,7 +1337,26 @@ class NodeCursorAdaptor {
|
||||
}
|
||||
}
|
||||
|
||||
class NullHighlightIterator {
|
||||
class NullLanguageModeHighlightIterator {
|
||||
seek() {
|
||||
return [];
|
||||
}
|
||||
compare() {
|
||||
return 1;
|
||||
}
|
||||
moveToSuccessor() {}
|
||||
getPosition() {
|
||||
return Point.INFINITY;
|
||||
}
|
||||
getOpenScopeIds() {
|
||||
return [];
|
||||
}
|
||||
getCloseScopeIds() {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
class NullLayerHighlightIterator {
|
||||
seek() {
|
||||
return null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user