feat: add support for Kotlin

TabbyML · Nov 18, 2023 · 82ca14a · 82ca14a
1 parent ce338c7
commit 82ca14a
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 0 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/tabby-common/Cargo.toml b/crates/tabby-common/Cargo.toml
@@ -13,6 +13,7 @@ reqwest = { workspace = true, features = [ "json" ] }
 uuid = { version = "1.4.1", features = ["v4"] }
 tantivy.workspace = true
 anyhow.workspace = true
+tree-sitter-kotlin = "0.3.1"
 
 [features]
 testutils = []
diff --git a/crates/tabby-common/assets/languages.toml b/crates/tabby-common/assets/languages.toml
@@ -41,6 +41,30 @@ top_level_keywords = [
     "return",
 ]
 
+[[config]]
+languages = ["kotlin"]
+line_comment = "//"
+top_level_keywords = [
+    "abstract",
+    "public",
+    "private",
+    "companion",
+    "class",
+    "data",
+    "const",
+    "actual",
+    "expect",
+    "sealed",
+    "suspend",
+    "fun",
+    "import",
+    "interface",
+    "package",
+    "var",
+    "val",
+    "enum",
+]
+
 [[config]]
 languages = ["javascript", "typescript", "javascriptreact", "typescriptreact"]
 line_comment = "//"

diff --git a/crates/tabby-scheduler/Cargo.toml b/crates/tabby-scheduler/Cargo.toml
@@ -17,6 +17,7 @@ serde-jsonlines = { workspace = true }
 file-rotate = "0.7.5"
 tree-sitter-python = "0.20.2"
 tree-sitter-java = "0.20.2"
+tree-sitter-kotlin = "0.3.1"
 tree-sitter-rust = "0.20.3"
 tree-sitter-typescript = "0.20.3"
 tree-sitter-go = "0.20.0"

diff --git a/crates/tabby-scheduler/src/dataset.rs b/crates/tabby-scheduler/src/dataset.rs
@@ -191,6 +191,7 @@ lazy_static! {
             ("haskell", vec!["hs"]),
             ("html", vec!["html"]),
             ("java", vec!["java"]),
+            ("kotlin", vec!["kt", "kts"]),
             ("julia", vec!["jl"]),
             ("lua", vec!["lua"]),
             ("makefile", vec!["Makefile"]),
@@ -257,6 +258,17 @@ lazy_static! {
                     .unwrap(),
                 ),
             ),
+            (
+                "kotlin",
+                TagsConfigurationSync(
+                    TagsConfiguration::new(
+                        tree_sitter_kotlin::language(),
+                        tree_sitter_kotlin::TAGGING_QUERY,
+                        "",
+                    )
+                    .unwrap(),
+                ),
+            ),
             (
                 "javascript-typescript",
                 TagsConfigurationSync(

diff --git a/website/docs/programming-languages.md b/website/docs/programming-languages.md
@@ -28,6 +28,7 @@ For an actual example of an issue or pull request adding the above support, plea
 * [Golang](https://go.dev/): Since v0.4.0
 * [Ruby](https://www.ruby-lang.org/): Since v0.4.0
 * [Java](https://www.java.com/): Since v0.6.0
+* [Kotlin](https://www.kotlinlang.org/): Since v0.6.0
 
 ## Languages Missing Certain Support
 
@@ -42,3 +43,4 @@ For an actual example of an issue or pull request adding the above support, plea
 |   PHP    |                    🚫                    |                       🚫                        |
 |   Perl   |                    🚫                    |                       🚫                        |
 |  Scala   |                    🚫                    |                       🚫                        |
+|  Kotlin  |                    🚫                    |                       🚫                        |