Rename all tree-sitter-2 values to modern-tree-sitter

Any file paths with `tree-sitter-2` in them can be renamed later.
ForestryAILab · Apr 7, 2023 · 3655610 · 3655610
1 parent b4fcfee
commit 3655610
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 24 deletions.
diff --git a/packages/language-c/grammars/modern-tree-sitter-c.cson b/packages/language-c/grammars/modern-tree-sitter-c.cson
@@ -1,6 +1,6 @@
 name: 'C'
 scopeName: 'source.c'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-c'
 
 injectionRegex: '^(c|C)$'

diff --git a/packages/language-c/grammars/modern-tree-sitter-cpp.cson b/packages/language-c/grammars/modern-tree-sitter-cpp.cson
@@ -1,6 +1,6 @@
 name: 'C++'
 scopeName: 'source.cpp'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-cpp'
 
 injectionRegex: '^(cpp|CPP|cc|CC)$'

diff --git a/packages/language-clojure/grammars/tree-sitter-clojure.cson b/packages/language-clojure/grammars/tree-sitter-clojure.cson
@@ -1,6 +1,6 @@
 'name': 'Clojure'
 'scopeName': 'source.clojure'
-'type': 'tree-sitter-2'
+'type': 'modern-tree-sitter'
 'fileTypes': [
   'boot'
   'clj'

diff --git a/packages/language-css/grammars/modern-tree-sitter-css.cson b/packages/language-css/grammars/modern-tree-sitter-css.cson
@@ -1,6 +1,6 @@
 name: 'CSS'
 scopeName: 'source.css'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-css'
 
 fileTypes: [

diff --git a/packages/language-go/grammars/modern-tree-sitter-go.cson b/packages/language-go/grammars/modern-tree-sitter-go.cson
@@ -1,6 +1,6 @@
 name: 'Go'
 scopeName: 'source.go'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-go'
 
 fileTypes: [

diff --git a/packages/language-html/grammars/modern-tree-sitter-ejs.cson b/packages/language-html/grammars/modern-tree-sitter-ejs.cson
@@ -1,6 +1,6 @@
 name: 'EJS'
 scopeName: 'text.html.ejs'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-embedded-template'
 
 fileTypes: [

diff --git a/packages/language-html/grammars/modern-tree-sitter-erb.cson b/packages/language-html/grammars/modern-tree-sitter-erb.cson
@@ -1,6 +1,6 @@
 name: 'ERB'
 scopeName: 'text.html.erb'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-embedded-template'
 
 fileTypes: [

diff --git a/packages/language-html/grammars/modern-tree-sitter-html.cson b/packages/language-html/grammars/modern-tree-sitter-html.cson
@@ -1,6 +1,6 @@
 name: 'HTML'
 scopeName: 'text.html.basic'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-html'
 
 injectionRegex: '(HTML|html|Html)$'

diff --git a/packages/language-hyperlink/grammars/modern-tree-sitter-hyperlink.cson b/packages/language-hyperlink/grammars/modern-tree-sitter-hyperlink.cson
@@ -1,6 +1,6 @@
 # name: 'Hyperlink'
 scopeName: 'text.hyperlink'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-hyperlink'
 
 injectionRegex: 'hyperlink'

diff --git a/packages/language-java/grammars/modern-tree-sitter-java.cson b/packages/language-java/grammars/modern-tree-sitter-java.cson
@@ -1,6 +1,6 @@
 name: 'Java'
 scopeName: 'source.java'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-java'
 
 fileTypes: [

diff --git a/packages/language-javascript/grammars/tree-sitter-2-javascript.cson b/packages/language-javascript/grammars/tree-sitter-2-javascript.cson
@@ -1,6 +1,6 @@
 name: 'JavaScript'
 scopeName: 'source.js'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-javascript'
 
 injectionRegex: '^(js|javascript)$'

diff --git a/packages/language-javascript/grammars/tree-sitter-2-jsdoc.cson b/packages/language-javascript/grammars/tree-sitter-2-jsdoc.cson
@@ -1,6 +1,6 @@
 name: 'JSDoc'
 scopeName: 'source.jsdoc'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-jsdoc'
 
 injectionRegex: '^jsdoc$'

diff --git a/packages/language-javascript/grammars/tree-sitter-2-regex.cson b/packages/language-javascript/grammars/tree-sitter-2-regex.cson
@@ -1,6 +1,6 @@
 name: 'JavaScript RegExp'
 scopeName: 'source.regexp.js'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-regex'
 
 injectionRegex: '^(js-regex)$'

diff --git a/packages/language-json/grammars/modern-tree-sitter-json.cson b/packages/language-json/grammars/modern-tree-sitter-json.cson
@@ -1,6 +1,6 @@
 name: 'JSON'
 scopeName: 'source.json'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-json'
 
 injectionRegex: "^(json|JSON)$"

diff --git a/packages/language-python/grammars/modern-tree-sitter-python.cson b/packages/language-python/grammars/modern-tree-sitter-python.cson
@@ -1,6 +1,6 @@
 name: 'Python'
 scopeName: 'source.python'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-python'
 
 injectionRegex: '^(py|PY|python|PYTHON)$'

diff --git a/packages/language-ruby/grammars/tree-sitter-2-regex.cson b/packages/language-ruby/grammars/tree-sitter-2-regex.cson
@@ -1,5 +1,5 @@
 scopeName: 'source.regexp'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-regex'
 
 # TODO: Decide whether to have one regex grammar that's shared among grammars

diff --git a/packages/language-ruby/grammars/tree-sitter-2-ruby.cson b/packages/language-ruby/grammars/tree-sitter-2-ruby.cson
@@ -1,6 +1,6 @@
 name: 'Ruby'
 scopeName: 'source.ruby'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-ruby'
 
 injectionRegex: 'rb|ruby|RB|RUBY'

diff --git a/packages/language-rust-bundled/grammars/modern-tree-sitter-rust.cson b/packages/language-rust-bundled/grammars/modern-tree-sitter-rust.cson
@@ -1,6 +1,6 @@
 name: 'Rust'
 scopeName: 'source.rust'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-rust'
 
 injectionRegex: '^(rust|RUST)$'

diff --git a/packages/language-shellscript/grammars/modern-tree-sitter-bash.cson b/packages/language-shellscript/grammars/modern-tree-sitter-bash.cson
@@ -1,6 +1,6 @@
 name: 'Shell Script'
 scopeName: 'source.shell'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-bash'
 
 fileTypes: [

diff --git a/packages/language-todo/grammars/modern-tree-sitter-todo.cson b/packages/language-todo/grammars/modern-tree-sitter-todo.cson
@@ -1,6 +1,6 @@
 # name: 'TODO'
 scopeName: 'text.todo'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-todo'
 
 injectionRegex: '^(todo|TODO)$'

diff --git a/packages/language-typescript/grammars/modern-tree-sitter-tsx.cson b/packages/language-typescript/grammars/modern-tree-sitter-tsx.cson
@@ -1,6 +1,6 @@
 name: 'TypeScript (React)'
 scopeName: 'source.tsx'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-typescript/tsx'
 
 fileTypes: ['tsx']

diff --git a/packages/language-typescript/grammars/modern-tree-sitter-typescript.cson b/packages/language-typescript/grammars/modern-tree-sitter-typescript.cson
@@ -1,6 +1,6 @@
 name: 'TypeScript'
 scopeName: 'source.ts'
-type: 'tree-sitter-2'
+type: 'modern-tree-sitter'
 parser: 'tree-sitter-typescript/typescript'
 
 fileTypes: ['ts']

diff --git a/src/grammar-registry.js b/src/grammar-registry.js
@@ -693,10 +693,10 @@ module.exports = class GrammarRegistry {
       grammarPath,
       CSON.readFileSync(grammarPath) || {}
     );
-}
+  }
 
   createGrammar(grammarPath, params) {
-    if (params.type === 'tree-sitter-2') {
+    if (params.type === 'modern-tree-sitter') {
       return new WASMTreeSitterGrammar(this, grammarPath, params)
     } else if (params.type === 'tree-sitter') {
       return new TreeSitterGrammar(this, grammarPath, params);