feat(rust): Scope function definitions

alexpovel · Aug 15, 2024 · c2dd0c3 · c2dd0c3
1 parent fc0a9db
commit c2dd0c3
Show file tree

Hide file tree

Showing 4 changed files with 515 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1474,8 +1474,9 @@ Language scopes:
           - strings:      Strings (regular, raw, byte; includes interpolation parts in
             format strings!)
           - attribute:    Attributes like `#[attr]`
-          - mod:          Anything in `mod` blocks
-          - mod-tests:    Anything in `mod tests` blocks
+          - fn:           Function definitions
+          - mod:          `mod` blocks
+          - mod-tests:    `mod tests` blocks
 
       --rust-query <TREE-SITTER-QUERY>
           Scope Rust code using a custom tree-sitter query.

diff --git a/src/scoping/langs/rust.rs b/src/scoping/langs/rust.rs
@@ -24,9 +24,11 @@ pub enum PreparedRustQuery {
     Strings,
     /// Attributes like `#[attr]`.
     Attribute,
-    /// Anything in `mod` blocks.
+    /// Function definitions.
+    Fn,
+    /// `mod` blocks.
     Mod,
-    /// Anything in `mod tests` blocks.
+    /// `mod tests` blocks.
     ModTests,
 }
 
@@ -72,6 +74,7 @@ impl From<PreparedRustQuery> for TSQuery {
                 }
                 PreparedRustQuery::Strings => "(string_content) @string",
                 PreparedRustQuery::Attribute => "(attribute) @attribute",
+                PreparedRustQuery::Fn => "(function_item) @function_item",
                 PreparedRustQuery::Mod => "(mod_item) @mod_item",
                 PreparedRustQuery::ModTests => {
                     r#"(mod_item

diff --git a/tests/langs/mod.rs b/tests/langs/mod.rs
@@ -202,6 +202,11 @@ impl InScopeLinePart {
     include_str!("rust/base.rs"),
     Rust::new(CodeQuery::Prepared(PreparedRustQuery::Attribute)),
 )]
+#[case(
+    "base.rs_fn",
+    include_str!("rust/base.rs"),
+    Rust::new(CodeQuery::Prepared(PreparedRustQuery::Fn)),
+)]
 #[case(
     "base.rs_mod",
     include_str!("rust/base.rs"),