Further improve PHP define regex

Author: sirbrillig

src/query_regex.rs

@@ -7,7 +7,7 @@ pub fn get_regex_for_query(query: &str, file_type: &FileType) -> Regex {
             r"(?:\b(?:function|var|let|const|class|interface|type)\s+{query}\b|\b{query}\([^)]*\)\s*(?::[^\{{]+)?\{{|\b{query}:|@typedef\s*(?:\{{[^\}}]+\}})?\s*{query}\b)"
         ),
         FileType::PHP => &format!(
-            r#"\b(?:function|class|trait|interface|enum|const) {query}\b|define\s*\(\s*['"]{query}\b"#
+            r#"\b(?:function|class|trait|interface|enum|const) {query}\b|\bdefine\s*\(\s*['"]{query}['"]"#
         ),
         FileType::RS => &format!(r"\b(?:fn|trait|enum|struct|mod) {query}\b"),
     };

tests/fixtures/by-language/php-fixture.php

@@ -31,6 +31,8 @@ public function doSomethingAbsolute(): \Home\Foo {
 define( 'GLOBALDEFINESINGLE', 42 );
 define( "GLOBALDEFINEDOUBLE", 43 );
 define( "GLOBALDEFINEDOUBLE_TWO", 41 ); // This is here to make sure that the other searches do not find it
+define('GLOBALDEFINESINGLE_NOSPACE',40);
+define ('GLOBALDEFINESINGLE_LEADSPACE',49);
 
 class ClassWithConstant {
 	public const MYCONSTANT = 5;

tests/integration_test.rs

@@ -290,7 +290,17 @@ fn search_returns_matching_js_function_line_with_filetype_alias(#[case] file_typ
 #[case::php_global_constant(String::from("GLOBALCONSTANT"), String::from("php"), 30)]
 #[case::php_global_define_single(String::from("GLOBALDEFINESINGLE"), String::from("php"), 31)]
 #[case::php_global_define_double(String::from("GLOBALDEFINEDOUBLE"), String::from("php"), 32)]
-#[case::php_global_class_constant(String::from("MYCONSTANT"), String::from("php"), 36)]
+#[case::php_global_define_nospace(
+    String::from("GLOBALDEFINESINGLE_NOSPACE"),
+    String::from("php"),
+    34
+)]
+#[case::php_global_define_leadspace(
+    String::from("GLOBALDEFINESINGLE_LEADSPACE"),
+    String::from("php"),
+    35
+)]
+#[case::php_global_class_constant(String::from("MYCONSTANT"), String::from("php"), 38)]
 #[case(String::from("query_db"), String::from("rs"), 1)]
 #[case(String::from("public_func"), String::from("rs"), 6)]
 #[case(String::from("Wrapper"), String::from("rs"), 4)]
@@ -307,9 +317,13 @@ fn search_returns_expected_line_number_for_file_type(
         common::get_default_fixture_for_file_type_string(file_type_string.as_str()).unwrap();
     let args = common::make_args(query, Some(file_path), Some(file_type_string));
     let actual = common::do_search(args);
-    assert_eq!(1, actual.len());
+    assert_eq!(1, actual.len(), "Did not find exactly one match");
     let first_actual = actual.get(0).expect("Search failed for test");
-    assert_eq!(line_number, first_actual.line_number.unwrap());
+    assert_eq!(
+        line_number,
+        first_actual.line_number.unwrap(),
+        "Match found but it has the wrong line number"
+    );
 }
 
 #[rstest]