injections

eyelash · Sep 17, 2023 · d6a65e2 · d6a65e2
1 parent ef67f18
commit d6a65e2
Show file tree

Hide file tree

Showing 23 changed files with 445 additions and 150 deletions.
diff --git a/atom/src/bracket-matcher-view.cc b/atom/src/bracket-matcher-view.cc
@@ -3,6 +3,7 @@
 #include "text-editor.h"
 #include "selection.h"
 #include "tree-sitter-language-mode.h"
+#include <tree-sitter.h>
 #include <display-marker.h>
 #include <cstring>
 
@@ -99,27 +100,6 @@ optional<Point> BracketMatcherView::findMatchingStartBracket(Point endBracketPos
   }
 }
 
-static Point PointToJS(TSPoint point) {
-  return Point(point.row, point.column / 2);
-}
-static Point startPosition(TSNode node) {
-  return PointToJS(ts_node_start_point(node));
-}
-static Point endPosition(TSNode node) {
-  return PointToJS(ts_node_end_point(node));
-}
-static std::vector<TSNode> children(TSNode node) {
-  static TSTreeCursor scratch_cursor = {nullptr, nullptr, {0, 0}};
-  std::vector<TSNode> result;
-  ts_tree_cursor_reset(&scratch_cursor, node);
-  if (ts_tree_cursor_goto_first_child(&scratch_cursor)) {
-    do {
-      TSNode child = ts_tree_cursor_current_node(&scratch_cursor);
-      result.push_back(child);
-    } while (ts_tree_cursor_goto_next_sibling(&scratch_cursor));
-  }
-  return result;
-}
 static TSNode ts_node_first_child(TSNode node) {
   return ts_node_child(node, 0);
 }
@@ -142,7 +122,7 @@ optional<Point> BracketMatcherView::findMatchingEndBracketWithSyntaxTree(Point b
         auto matchNode = std::find_if(children.begin(), children.end(), [&](TSNode child) {
           return bracketEndPosition.isLessThanOrEqual(startPosition(child)) && ts_node_type(child)[0] == endBracket;
         });
-        if (matchNode != children.end()) result = startPosition(*matchNode);
+        if (matchNode != children.end()) result = Point(startPosition(*matchNode));
         return true;
       }
       return false;
@@ -162,7 +142,7 @@ optional<Point> BracketMatcherView::findMatchingStartBracketWithSyntaxTree(Point
         auto matchNode = std::find_if(children.begin(), children.end(), [&](TSNode child) {
           return bracketPosition.isGreaterThanOrEqual(endPosition(child)) && ts_node_type(child)[0] == startBracket;
         });
-        if (matchNode != children.end()) result = startPosition(*matchNode);
+        if (matchNode != children.end()) result = Point(startPosition(*matchNode));
         return true;
       }
       return false;

diff --git a/atom/src/grammar-registry.cc b/atom/src/grammar-registry.cc
@@ -50,7 +50,7 @@ void GrammarRegistry::autoAssignLanguageMode(TextBuffer *buffer) {
 }
 
 LanguageMode *GrammarRegistry::languageModeForGrammarAndBuffer(Grammar *grammar, TextBuffer *buffer) {
-  return grammar->getLanguageMode(buffer);
+  return grammar->getLanguageMode(buffer, this);
 }
 
 /*selectGrammar(filePath, fileContents) {

diff --git a/atom/src/grammar.h b/atom/src/grammar.h
@@ -6,6 +6,7 @@
 
 struct LanguageMode;
 struct TextBuffer;
+struct GrammarRegistry;
 
 struct Grammar {
   const char *name;
@@ -23,7 +24,7 @@ struct Grammar {
   template <typename... T> void setFileTypes(T&&... t) {
     addFileTypes(std::forward<T>(t)...);
   }
-  virtual LanguageMode *getLanguageMode(TextBuffer *) = 0;
+  virtual LanguageMode *getLanguageMode(TextBuffer *, GrammarRegistry *) = 0;
 };
 
 #endif // GRAMMAR_H_
diff --git a/atom/src/null-grammar.cc b/atom/src/null-grammar.cc
@@ -5,6 +5,6 @@ NullGrammar::NullGrammar() : Grammar("Null Grammar", "text.plain.null-grammar")
 
 NullGrammar::~NullGrammar() {}
 
-LanguageMode *NullGrammar::getLanguageMode(TextBuffer *) {
+LanguageMode *NullGrammar::getLanguageMode(TextBuffer *, GrammarRegistry *) {
   return new TextMateLanguageMode(this);
 }
diff --git a/atom/src/null-grammar.h b/atom/src/null-grammar.h
@@ -7,7 +7,7 @@ struct NullGrammar final : Grammar {
   NullGrammar();
   ~NullGrammar();
 
-  LanguageMode *getLanguageMode(TextBuffer *) override;
+  LanguageMode *getLanguageMode(TextBuffer *, GrammarRegistry *) override;
 };
 
 #endif // NULL_GRAMMAR_H_
diff --git a/atom/src/tree-sitter-grammar.cc b/atom/src/tree-sitter-grammar.cc
@@ -105,6 +105,6 @@ std::string TreeSitterGrammar::classNameForScopeId(int32_t id) {
   return this->classNamesById[id];
 }
 
-LanguageMode *TreeSitterGrammar::getLanguageMode(TextBuffer *buffer) {
-  return new TreeSitterLanguageMode(buffer, this);
+LanguageMode *TreeSitterGrammar::getLanguageMode(TextBuffer *buffer, GrammarRegistry *grammars) {
+  return new TreeSitterLanguageMode(buffer, this, grammars);
 }
diff --git a/atom/src/tree-sitter-grammar.h b/atom/src/tree-sitter-grammar.h
@@ -114,7 +114,7 @@ struct TreeSitterGrammar final : Grammar {
   }
   optional<int32_t> idForScope(const optional<std::string> &);
   std::string classNameForScopeId(int32_t);
-  LanguageMode *getLanguageMode(TextBuffer *) override;
+  LanguageMode *getLanguageMode(TextBuffer *, GrammarRegistry *) override;
 };
 
 #endif // TREE_SITTER_GRAMMAR_H_