Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
6CA62EA929F9D36700785B11 /* TreeSitterTS in Frameworks */ = {isa = PBXBuildFile; productRef = 6CA62EA829F9D36700785B11 /* TreeSitterTS */; };
6CA62EAB29F9D36700785B11 /* TreeSitterTSX in Frameworks */ = {isa = PBXBuildFile; productRef = 6CA62EAA29F9D36700785B11 /* TreeSitterTSX */; };
6CEC70FE29C3A85000B61C7A /* TreeSitterRegex in Frameworks */ = {isa = PBXBuildFile; productRef = 6CEC70FD29C3A85000B61C7A /* TreeSitterRegex */; };
7DB18E9729FDC51C00F8EC00 /* TreeSitterScala in Frameworks */ = {isa = PBXBuildFile; productRef = 7DB18E9629FDC51C00F8EC00 /* TreeSitterScala */; };
9D6DA3B8298F1A4600E69066 /* TreeSitterOCaml in Frameworks */ = {isa = PBXBuildFile; productRef = 9D6DA3B7298F1A4600E69066 /* TreeSitterOCaml */; };
/* End PBXBuildFile section */

Expand All @@ -61,6 +62,7 @@
28B3F02D290C35D9000CD04D /* TreeSitterC in Frameworks */,
28B3F04B290C368B000CD04D /* TreeSitterJS in Frameworks */,
28B3F03C290C363E000CD04D /* TreeSitterGo in Frameworks */,
7DB18E9729FDC51C00F8EC00 /* TreeSitterScala in Frameworks */,
28B3F05D290C3709000CD04D /* TreeSitterSwift in Frameworks */,
28B9F7AA290DDAC900245748 /* TreeSitterBash in Frameworks */,
28B3F030290C35F9000CD04D /* TreeSitterCPP in Frameworks */,
Expand Down Expand Up @@ -187,6 +189,7 @@
28AAB6AD29CA57D40087654B /* TreeSitterDart */,
6CA62EA829F9D36700785B11 /* TreeSitterTS */,
6CA62EAA29F9D36700785B11 /* TreeSitterTSX */,
7DB18E9629FDC51C00F8EC00 /* TreeSitterScala */,
);
productName = "CodeLanguages-Container";
productReference = 28B3F00C290C207D000CD04D /* CodeLanguages_Container.framework */;
Expand Down Expand Up @@ -246,6 +249,7 @@
6CEC70FC29C3A85000B61C7A /* XCRemoteSwiftPackageReference "tree-sitter-regex" */,
28AAB6AC29CA57D40087654B /* XCRemoteSwiftPackageReference "tree-sitter-dart" */,
6CA62EA729F9D36700785B11 /* XCRemoteSwiftPackageReference "tree-sitter-typescript" */,
7DB18E9529FDC51C00F8EC00 /* XCRemoteSwiftPackageReference "tree-sitter-scala" */,
);
productRefGroup = 28B3F00D290C207D000CD04D /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -719,6 +723,14 @@
kind = branch;
};
};
7DB18E9529FDC51C00F8EC00 /* XCRemoteSwiftPackageReference "tree-sitter-scala" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/bishabosha/tree-sitter-scala.git";
requirement = {
branch = feature/spm;
kind = branch;
};
};
9D6DA3B6298F1A4500E69066 /* XCRemoteSwiftPackageReference "tree-sitter-ocaml" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/cengelbart39/tree-sitter-ocaml.git";
Expand Down Expand Up @@ -875,6 +887,11 @@
package = 6CEC70FC29C3A85000B61C7A /* XCRemoteSwiftPackageReference "tree-sitter-regex" */;
productName = TreeSitterRegex;
};
7DB18E9629FDC51C00F8EC00 /* TreeSitterScala */ = {
isa = XCSwiftPackageProductDependency;
package = 7DB18E9529FDC51C00F8EC00 /* XCRemoteSwiftPackageReference "tree-sitter-scala" */;
productName = TreeSitterScala;
};
9D6DA3B7298F1A4600E69066 /* TreeSitterOCaml */ = {
isa = XCSwiftPackageProductDependency;
package = 9D6DA3B6298F1A4500E69066 /* XCRemoteSwiftPackageReference "tree-sitter-ocaml" */;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ extern TSLanguage *tree_sitter_python();
extern TSLanguage *tree_sitter_regex();
extern TSLanguage *tree_sitter_ruby();
extern TSLanguage *tree_sitter_rust();
extern TSLanguage *tree_sitter_scala();
extern TSLanguage *tree_sitter_sql();
extern TSLanguage *tree_sitter_swift();
extern TSLanguage *tree_sitter_tsx();
Expand Down
Binary file modified CodeLanguagesContainer.xcframework.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ In order to add support for additional languages we have a complete guide on how
| [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) | | |
| [Scala](https://github.com/tree-sitter/tree-sitter-scala) | | |
| [Sql](https://github.com/lukepistrol/tree-sitter-sql/tree/feature/spm) | ✅ | ✅ |
| [Swift](https://github.com/alex-pinkus/tree-sitter-swift/tree/with-generated-files) | ✅ | ✅ |
| [TOML](https://github.com/ikatyang/tree-sitter-toml) | | |
Expand Down
8 changes: 8 additions & 0 deletions Sources/CodeEditLanguages/CodeLanguage+Definitions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public extension CodeLanguage {
.regex,
.ruby,
.rust,
.scala,
.sql,
.swift,
.tsx,
Expand Down Expand Up @@ -236,6 +237,13 @@ public extension CodeLanguage {
highlights: ["injections"]
)

/// A language structure for `Scala`
static let scala: CodeLanguage = .init(
id: .scala,
tsName: "scala",
extensions: ["scala", "sc"]
)

/// A language structure for `SQL`
static let sql: CodeLanguage = .init(
id: .sql,
Expand Down
2 changes: 2 additions & 0 deletions Sources/CodeEditLanguages/CodeLanguage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ public struct CodeLanguage {
return tree_sitter_ruby()
case .rust:
return tree_sitter_rust()
case .scala:
return tree_sitter_scala()
case .sql:
return tree_sitter_sql()
case .swift:
Expand Down
2 changes: 2 additions & 0 deletions Sources/CodeEditLanguages/Documentation.docc/CodeLanguage.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ let language = CodeLanguage.detectLanguageFrom(url: fileURL)
- Python
- Ruby
- Rust
- Scala
- SQL
- Swift
- YAML
Expand Down Expand Up @@ -92,6 +93,7 @@ let language = CodeLanguage.detectLanguageFrom(url: fileURL)
- ``python``
- ``ruby``
- ``rust``
- ``scala``
- ``sql``
- ``swift``
- ``yaml``
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ let query = TreeSitterModel.shared.swiftQuery
- ``pythonQuery``
- ``rubyQuery``
- ``rustQuery``
- ``scalaQuery``
- ``sqlQuery``
- ``swiftQuery``
- ``yamlQuery``
Expand Down
Loading