Merge pull request #1740 from arthurlm/extended-test-match

Update regex use to match test for external librairies

Author: Xanewok

rls/src/actions/run.rs

@@ -23,7 +23,7 @@ pub fn collect_run_actions(ctx: &InitActionContext, file: &Path) -> Vec<RunActio
     }
 
     lazy_static! {
-        /// __(a):__ `\#\[test\]` matches `#[test]`
+        /// __(a):__ `\#\[([\w]+::)*test\]` matches `#[test]`, `#[async_executor::test]` or `#[async_lib::module::test]`.
         ///
         /// __(b):__ `^[^\/]*?fn\s+(?P<name>\w+)` matches any line which contains `fn name` before any comment is started and captures the word after fn.
         /// The laziness of the quantifier is there to make the regex quicker (about 5 times less steps)
@@ -42,7 +42,7 @@ pub fn collect_run_actions(ctx: &InitActionContext, file: &Path) -> Vec<RunActio
         /// fn right_function() {}
         /// ```
         static ref TEST_FN_RE: Regex =
-            Regex::new(r"(?m)#\[test\](\n|.)*?^[^/]*?fn\s+(?P<name>\w+)").unwrap();
+            Regex::new(r"(?m)#\[([\w]+::)*test\](\n|.)*?^[^/]*?fn\s+(?P<name>\w+)").unwrap();
     }
 
     let line_index = LineIndex::new(&text);

tests/client.rs

@@ -989,24 +989,42 @@ fn client_lens_run() {
         },
     );
 
-    let expected = CodeLens {
-        command: Some(Command {
-            command: "rls.run".to_string(),
-            title: "Run test".to_string(),
-            arguments: Some(vec![json!({
-                "args": [ "test", "--", "--nocapture", "test_foo" ],
-                "binary": "cargo",
-                "env": { "RUST_BACKTRACE": "short" }
-            })]),
-        }),
-        data: None,
-        range: Range {
-            start: Position { line: 4, character: 3 },
-            end: Position { line: 4, character: 11 },
+    let expected = vec![
+        CodeLens {
+            command: Some(Command {
+                command: "rls.run".to_string(),
+                title: "Run test".to_string(),
+                arguments: Some(vec![json!({
+                    "args": [ "test", "--", "--nocapture", "test_foo" ],
+                    "binary": "cargo",
+                    "env": { "RUST_BACKTRACE": "short" }
+                })]),
+            }),
+            data: None,
+            range: Range {
+                start: Position { line: 4, character: 3 },
+                end: Position { line: 4, character: 11 },
+            },
         },
-    };
+        CodeLens {
+            command: Some(Command {
+                command: "rls.run".to_string(),
+                title: "Run test".to_string(),
+                arguments: Some(vec![json!({
+                    "args": [ "test", "--", "--nocapture", "test_bar"],
+                    "binary": "cargo",
+                    "env": { "RUST_BACKTRACE": "short" }
+                })]),
+            }),
+            data: None,
+            range: Range {
+                start: Position { line: 9, character: 3 },
+                end: Position { line: 9, character: 11 },
+            },
+        },
+    ];
 
-    assert_eq!(lens, Some(vec![expected]));
+    assert_eq!(lens, Some(expected));
 }
 
 #[test]

tests/fixtures/lens_run/src/main.rs

@@ -5,3 +5,13 @@ pub fn main() {
 fn test_foo() {
 
 }
+
+#[tokio::test]
+fn test_bar() {
+
+}
+
+#[dummy_ext]
+fn test_baz() {
+
+}