Update F# parser to use crate

Wilfred · Feb 23, 2025 · 89e2a45 · 89e2a45
1 parent 5420cd1
commit 89e2a45
Show file tree

Hide file tree

Showing 76 changed files with 20 additions and 386,446 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ### Parsing
 
-Updated to the latest tree-sitter parser for Pascal and Swift.
+Updated to the latest tree-sitter parser for F#, Pascal and Swift.
 
 ## 0.63 (released 11th February 2025)
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -103,6 +103,7 @@ tree-sitter-elixir = "0.3.4"
 tree-sitter-nix = "0.0.2"
 tree-sitter-pascal = "0.10.0"
 tree-sitter-swift = "0.7.0"
+tree-sitter-fsharp = "0.1.0"
 
 [dev-dependencies]
 # assert_cmd 2.0.10 requires predicates 3.

diff --git a/build.rs b/build.rs
@@ -117,11 +117,6 @@ fn main() {
             src_dir: "vendored_parsers/tree-sitter-erlang-src",
             extra_files: vec![],
         },
-        TreeSitterParser {
-            name: "tree-sitter-f-sharp",
-            src_dir: "vendored_parsers/tree-sitter-f-sharp-src",
-            extra_files: vec!["scanner.c"],
-        },
         TreeSitterParser {
             name: "tree-sitter-gleam",
             src_dir: "vendored_parsers/tree-sitter-gleam-src",

diff --git a/sample_files/compare.expected b/sample_files/compare.expected
@@ -77,7 +77,7 @@ sample_files/erlang_1.erl sample_files/erlang_2.erl
 dccdb8f65d2f099ab1a8cb66011376a2  -
 
 sample_files/f_sharp_1.fs sample_files/f_sharp_2.fs
-a9251656c7808ec0e3411fbbd189f5aa  -
+25253b18ef64469c67cf9a7131c8c125  -
 
 sample_files/hack_1.php sample_files/hack_2.php
 c2bb0aa7d7b07d6ced79f6a5363e878b  -

diff --git a/src/parse/tree_sitter_parser.rs b/src/parse/tree_sitter_parser.rs
@@ -70,7 +70,6 @@ extern "C" {
     fn tree_sitter_elm() -> ts::Language;
     fn tree_sitter_elvish() -> ts::Language;
     fn tree_sitter_erlang() -> ts::Language;
-    fn tree_sitter_fsharp() -> ts::Language;
     fn tree_sitter_gleam() -> ts::Language;
     fn tree_sitter_hare() -> ts::Language;
     fn tree_sitter_hack() -> ts::Language;
@@ -374,16 +373,16 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         FSharp => {
-            let language = unsafe { tree_sitter_fsharp() };
+            let language_fn = tree_sitter_fsharp::LANGUAGE_FSHARP;
+            let language = tree_sitter::Language::new(language_fn);
+
             TreeSitterConfig {
                 language: language.clone(),
                 atom_nodes: ["string", "triple_quoted_string"].into_iter().collect(),
                 delimiter_tokens: vec![("(", ")"), ("[", "]"), ("{", "}")],
-                highlight_query: ts::Query::new(
-                    &language,
-                    include_str!("../../vendored_parsers/highlights/f-sharp.scm"),
-                )
-                .unwrap(),
+                highlight_query: ts::Query::new(&language, tree_sitter_fsharp::HIGHLIGHTS_QUERY)
+                    .unwrap(),
+
                 sub_languages: vec![],
             }
         }

diff --git a/vendored_parsers/highlights/f-sharp.scm b/vendored_parsers/highlights/f-sharp.scm
diff --git a/vendored_parsers/tree-sitter-f-sharp-src b/vendored_parsers/tree-sitter-f-sharp-src
diff --git a/vendored_parsers/tree-sitter-f-sharp/.editorconfig b/vendored_parsers/tree-sitter-f-sharp/.editorconfig
diff --git a/vendored_parsers/tree-sitter-f-sharp/.eslintrc.js b/vendored_parsers/tree-sitter-f-sharp/.eslintrc.js
diff --git a/vendored_parsers/tree-sitter-f-sharp/.gitattributes b/vendored_parsers/tree-sitter-f-sharp/.gitattributes
diff --git a/vendored_parsers/tree-sitter-f-sharp/.github/dependabot.yml b/vendored_parsers/tree-sitter-f-sharp/.github/dependabot.yml
diff --git a/vendored_parsers/tree-sitter-f-sharp/.github/workflows/ci.yml b/vendored_parsers/tree-sitter-f-sharp/.github/workflows/ci.yml
diff --git a/vendored_parsers/tree-sitter-f-sharp/.github/workflows/main.yml b/vendored_parsers/tree-sitter-f-sharp/.github/workflows/main.yml
diff --git a/vendored_parsers/tree-sitter-f-sharp/.gitignore b/vendored_parsers/tree-sitter-f-sharp/.gitignore
diff --git a/vendored_parsers/tree-sitter-f-sharp/.npmignore b/vendored_parsers/tree-sitter-f-sharp/.npmignore
diff --git a/vendored_parsers/tree-sitter-f-sharp/Cargo.toml b/vendored_parsers/tree-sitter-f-sharp/Cargo.toml
diff --git a/vendored_parsers/tree-sitter-f-sharp/LICENSE b/vendored_parsers/tree-sitter-f-sharp/LICENSE