simplify the tree-sitter usage

eyelash · Sep 19, 2023 · 18ac53c · 18ac53c
1 parent bb00b9e
commit 18ac53c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 21 deletions.
diff --git a/atom/src/syntax-scope-map.h b/atom/src/syntax-scope-map.h
@@ -7,12 +7,13 @@
 #include <unordered_map>
 #include <memory>
 
+struct TextBuffer;
 struct TreeCursor;
 
 struct SyntaxScopeMap {
   struct Result {
     virtual ~Result();
-    virtual optional<std::string> applyLeafRules(const TreeCursor &) = 0;
+    virtual optional<std::string> applyLeafRules(TextBuffer *, const TreeCursor &) = 0;
   };
   struct Table {
     std::unordered_map<double, std::unique_ptr<Table>> indices;

diff --git a/atom/src/tree-sitter-grammar.cc b/atom/src/tree-sitter-grammar.cc
@@ -3,6 +3,7 @@
 #include "tree-sitter-language-mode.h"
 #include <regex.h>
 #include <tree-cursor.h>
+#include <text-buffer.h>
 
 TreeSitterGrammar::TreeSitterGrammar(const char *name, const char *scopeName, const TSLanguage *languageModule) : Grammar(name, scopeName) {
   this->scopeMap = new SyntaxScopeMap();
@@ -34,7 +35,7 @@ std::shared_ptr<SyntaxScopeMap::Result> TreeSitterGrammar::preprocessScopes(cons
   struct StringResult final : SyntaxScopeMap::Result {
     std::string rules;
     StringResult(const char *value) : rules(value) {}
-    optional<std::string> applyLeafRules(const TreeCursor &) override {
+    optional<std::string> applyLeafRules(TextBuffer *, const TreeCursor &) override {
       return rules;
     }
   };
@@ -46,9 +47,10 @@ std::shared_ptr<SyntaxScopeMap::Result> TreeSitterGrammar::preprocessScopesExact
     std::u16string exact;
     std::shared_ptr<SyntaxScopeMap::Result> scopes;
     ExactResult(const char16_t *exact, std::shared_ptr<SyntaxScopeMap::Result> &&scopes) : exact(exact), scopes(std::move(scopes)) {}
-    optional<std::string> applyLeafRules(const TreeCursor &cursor) override {
-      return cursor.nodeText() == exact
-        ? scopes->applyLeafRules(cursor)
+    optional<std::string> applyLeafRules(TextBuffer *buffer, const TreeCursor &cursor) override {
+      const std::u16string nodeText = buffer->buffer->text_in_range({cursor.startPosition(), cursor.endPosition()});
+      return nodeText == exact
+        ? scopes->applyLeafRules(buffer, cursor)
         : optional<std::string>();
     }
   };
@@ -60,9 +62,10 @@ std::shared_ptr<SyntaxScopeMap::Result> TreeSitterGrammar::preprocessScopesMatch
     Regex match;
     std::shared_ptr<SyntaxScopeMap::Result> scopes;
     MatchResult(const char16_t *match, std::shared_ptr<SyntaxScopeMap::Result> &&scopes) : match(match), scopes(std::move(scopes)) {}
-    optional<std::string> applyLeafRules(const TreeCursor &cursor) override {
-      return match.match(cursor.nodeText())
-        ? scopes->applyLeafRules(cursor)
+    optional<std::string> applyLeafRules(TextBuffer *buffer, const TreeCursor &cursor) override {
+      const std::u16string nodeText = buffer->buffer->text_in_range({cursor.startPosition(), cursor.endPosition()});
+      return match.match(nodeText)
+        ? scopes->applyLeafRules(buffer, cursor)
         : optional<std::string>();
     }
   };
@@ -73,9 +76,9 @@ std::shared_ptr<SyntaxScopeMap::Result> TreeSitterGrammar::preprocessScopes(std:
   struct ArrayResult final : SyntaxScopeMap::Result {
     std::vector<std::shared_ptr<SyntaxScopeMap::Result>> rules;
     ArrayResult(std::vector<std::shared_ptr<SyntaxScopeMap::Result>> &&value) : rules(std::move(value)) {}
-    optional<std::string> applyLeafRules(const TreeCursor &cursor) override {
+    optional<std::string> applyLeafRules(TextBuffer *buffer, const TreeCursor &cursor) override {
       for (size_t i = 0, length = rules.size(); i != length; ++i) {
-        const auto result = rules[i]->applyLeafRules(cursor);
+        const auto result = rules[i]->applyLeafRules(buffer, cursor);
         if (result) return result;
       }
       return optional<std::string>();

diff --git a/atom/src/tree-sitter-language-mode.cc b/atom/src/tree-sitter-language-mode.cc
@@ -951,7 +951,9 @@ optional<int32_t> TreeSitterLanguageMode::LayerHighlightIterator::currentScopeId
     this->containingNodeChildIndices,
     this->treeCursor.nodeIsNamed()
   );
-  const auto scopeName = value ? value->applyLeafRules(this->treeCursor) : optional<std::string>();
+  TextBuffer *buffer = this->languageLayer->languageMode->buffer;
+
+  const auto scopeName = value ? value->applyLeafRules(buffer, this->treeCursor) : optional<std::string>();
   const TSNode node = this->treeCursor.currentNode();
   if (!ts_node_child_count(node)) {
     return this->languageLayer->languageMode->grammar->idForScope(scopeName);

diff --git a/tree-sitter/src/tree-cursor.cc b/tree-sitter/src/tree-cursor.cc
@@ -66,7 +66,3 @@ const char *TreeCursor::nodeType() const {
 bool TreeCursor::nodeIsNamed() const {
   return ts_node_is_named(this->currentNode());
 }
-
-std::u16string TreeCursor::nodeText() const {
-  return this->tree->getText(*this);
-}
diff --git a/tree-sitter/src/tree-cursor.h b/tree-sitter/src/tree-cursor.h
@@ -26,7 +26,6 @@ class TreeCursor {
   NativePoint endPosition() const;
   const char *nodeType() const;
   bool nodeIsNamed() const;
-  std::u16string nodeText() const;
 };
 
 #endif // TREE_CURSOR_H_
diff --git a/tree-sitter/src/tree.cc b/tree-sitter/src/tree.cc
@@ -52,7 +52,3 @@ std::vector<TSRange> Tree::getChangedRanges(const Tree &newTree) {
 TreeCursor Tree::walk() {
   return TreeCursor(this->rootNode(), this);
 }
-
-std::u16string Tree::getText(const TreeCursor &cursor) {
-  return this->input->text_in_range({cursor.startPosition(), cursor.endPosition()});
-}
diff --git a/tree-sitter/src/tree.h b/tree-sitter/src/tree.h
@@ -21,7 +21,6 @@ class Tree {
   TSNode rootNode() const;
   std::vector<TSRange> getChangedRanges(const Tree &);
   TreeCursor walk();
-  std::u16string getText(const TreeCursor &);
 
   friend class Parser;
 };