Updating languages and readme (#49)

* Updating Scala to Tree Sitter repo * update readme * Updating HTML to official tree-sitter * update readme * Updating TypeScript to official repo * Updating SQL * Update SQL * Updating Python * Fixing conflicts
CodeEditApp · Jul 12, 2023 · 630f362 · 630f362
1 parent c2ef861
commit 630f362
Show file tree

Hide file tree

Showing 8 changed files with 464 additions and 204 deletions.
diff --git a/CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.pbxproj b/CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.pbxproj
diff --git a/...deLanguages-Container.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...deLanguages-Container.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -111,10 +111,10 @@
     {
       "identity" : "tree-sitter-html",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/mattmassicotte/tree-sitter-html.git",
+      "location" : "https://github.com/tree-sitter/tree-sitter-html.git",
       "state" : {
-        "branch" : "feature/spm",
-        "revision" : "68b8bed0c1ebecbaf1919d0a7ae4b27592e6cc45"
+        "branch" : "master",
+        "revision" : "ab91d87963c47ffd08a7967b9aa73eb53293d120"
       }
     },
     {
@@ -210,10 +210,10 @@
     {
       "identity" : "tree-sitter-python",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/lukepistrol/tree-sitter-python.git",
+      "location" : "https://github.com/tree-sitter/tree-sitter-python.git",
       "state" : {
-        "branch" : "feature/spm",
-        "revision" : "59316301dd0ebaf3771cdd5735cbe92378852680"
+        "branch" : "master",
+        "revision" : "db1d218a4f8fb87145aabeb22ca3c35925c411fc"
       }
     },
     {
@@ -246,19 +246,19 @@
     {
       "identity" : "tree-sitter-scala",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/bishabosha/tree-sitter-scala.git",
+      "location" : "https://github.com/tree-sitter/tree-sitter-scala.git",
       "state" : {
-        "branch" : "feature/spm",
-        "revision" : "d6e510497d9a16fa8e45f71908c21271566f63df"
+        "branch" : "master",
+        "revision" : "cda0de8a038b0e4ad79a97f7aa281250fcf88560"
       }
     },
     {
       "identity" : "tree-sitter-sql",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/lukepistrol/tree-sitter-sql",
+      "location" : "https://github.com/DerekStride/tree-sitter-sql.git",
       "state" : {
-        "branch" : "feature/spm",
-        "revision" : "fb79fdfb7413906a6ca2e0833c57d1cb38cc00f2"
+        "branch" : "gh-pages",
+        "revision" : "e08036ee4928b32fbebe55ac9336f81b7389e107"
       }
     },
     {
@@ -282,10 +282,10 @@
     {
       "identity" : "tree-sitter-typescript",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/thecoolwinter/tree-sitter-typescript",
+      "location" : "https://github.com/tree-sitter/tree-sitter-typescript.git",
       "state" : {
         "branch" : "master",
-        "revision" : "018464ed3f93fe757418316b3cc1c72198fa5b8c"
+        "revision" : "3429d8c77d7a83e80032667f0642e6cb19d0c772"
       }
     },
     {

diff --git a/CodeLanguagesContainer.xcframework.zip b/CodeLanguagesContainer.xcframework.zip
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ In order to add support for additional languages we have a complete guide on how
 | Grammar        | Implemented | Syntax Highlighting |
 | -------------- | :---------: | :-----------------: |
 | [Agda](https://github.com/tree-sitter/tree-sitter-agda) |  | _not available_ |
-| [Bash](https://github.com/lukepistrol/tree-sitter-bash) | ✅ | ✅ |
+| [Bash](https://github.com/tree-sitter/tree-sitter-bash) | ✅ | ✅ |
 | [C](https://github.com/tree-sitter/tree-sitter-c) | ✅ | ✅ |
 | [C++](https://github.com/tree-sitter/tree-sitter-cpp) | ✅ | ✅ |
 | [C#](https://github.com/tree-sitter/tree-sitter-c-sharp) | ✅ | ✅ |
@@ -59,11 +59,11 @@ In order to add support for additional languages we have a complete guide on how
 | [ERB, EJS](https://github.com/tree-sitter/tree-sitter-embedded-template) |  |  |
 | [Go](https://github.com/tree-sitter/tree-sitter-go) | ✅ | ✅ |
 | [Haskell](https://github.com/tree-sitter/tree-sitter-haskell) | ✅ | ✅ |
-| [HTML](https://github.com/mattmassicotte/tree-sitter-html) | ✅ | ✅ |
+| [HTML](https://github.com/tree-sitter/tree-sitter-html) | ✅ | ✅ |
 | [Java](https://github.com/tree-sitter/tree-sitter-java) | ✅ | ✅ |
 | [JavaScript/JSX](https://github.com/tree-sitter/tree-sitter-javascript) | ✅ | ✅ |
 | [JSDoc](https://github.com/cengelbart39/tree-sitter-jsdoc/tree/feature/spm) | ✅ | ✅ |
-| [JSON](https://github.com/mattmassicotte/tree-sitter-json) | ✅ | ✅ |
+| [JSON](https://github.com/tree-sitter/tree-sitter-json) | ✅ | ✅ |
 | [Julia](https://github.com/tree-sitter/tree-sitter-julia) |  | _not available_ |
 | [Kotlin](https://github.com/lukepistrol/tree-sitter-kotlin/tree/feature/spm-queries) | ✅ | ✅ |
 | [Lua](https://github.com/lukepistrol/tree-sitter-lua/tree/feature/spm) | ✅ | ✅ |
@@ -73,12 +73,12 @@ In order to add support for additional languages we have a complete guide on how
 | Plain Text | ✅ | _not available_ |
 | [Perl](https://github.com/ganezdragon/tree-sitter-perl) |  | _not available_ |
 | [PHP](https://github.com/tree-sitter/tree-sitter-php) | ✅ | ✅ |
-| [Python](https://github.com/lukepistrol/tree-sitter-python) | ✅ | ✅ |
+| [Python](https://github.com/tree-sitter/tree-sitter-python) | ✅ | ✅ |
 | [Regex](https://github.com/tree-sitter/tree-sitter-regex) | ✅ | ✅ |
 | [Ruby](https://github.com/mattmassicotte/tree-sitter-ruby) | ✅ | ✅ |
 | [Rust](https://github.com/tree-sitter/tree-sitter-rust) | ✅ | ✅ |
 | [Scala](https://github.com/tree-sitter/tree-sitter-scala) | ✅ | ✅ |
-| [Sql](https://github.com/lukepistrol/tree-sitter-sql/tree/feature/spm) | ✅ | ✅ |
+| [Sql](https://github.com/DerekStride/tree-sitter-sql) | ✅ | ✅ |
 | [Swift](https://github.com/alex-pinkus/tree-sitter-swift/tree/with-generated-files) | ✅ | ✅ |
 | [TOML](https://github.com/cengelbart39/tree-sitter-toml/tree/feature/spm) | ✅ | ✅ |
 | [TypeScript/TSX](https://github.com/tree-sitter/tree-sitter-typescript) | ✅ | ✅ |

diff --git a/Sources/CodeEditLanguages/Resources/tree-sitter-html/highlights.scm b/Sources/CodeEditLanguages/Resources/tree-sitter-html/highlights.scm
@@ -9,4 +9,5 @@
   "<"
   ">"
   "</"
+  "/>"
 ] @punctuation.bracket
diff --git a/Sources/CodeEditLanguages/Resources/tree-sitter-scala/highlights.scm b/Sources/CodeEditLanguages/Resources/tree-sitter-scala/highlights.scm
@@ -236,6 +236,7 @@
 "return" @keyword.return
 
 (comment) @comment @spell
+(block_comment) @comment @spell
 
 ;; `case` is a conditional keyword in case_block
 
@@ -252,3 +253,7 @@
   (identifier) @function.builtin
   (#lua-match? @function.builtin "^super$")
 )
+
+;; Scala CLI using directives
+(using_directive_key) @parameter
+(using_directive_value) @string
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,5 @@ @@
       "<"
       ">"
       "</"
+      "/>"
     ] @punctuation.bracket