fix bug: leading * did not cause treatment as glob

molsonkiko · Jul 8, 2023 · 9293f7b · 9293f7b
1 parent 63ee60e
commit 9293f7b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/NppNavigateTo/Glob.cs b/NppNavigateTo/Glob.cs
@@ -105,6 +105,7 @@ public Regex Glob2Regex(string inp)
                         sb.Append("\\\\");
                     break;
                 case '*':
+                    uses_metacharacters = true;
                     if (is_char_class)
                     {
                         sb.Append("\\*"); // "[*]" matches literal * character
@@ -114,7 +115,6 @@ public Regex Glob2Regex(string inp)
                         break; // since globs are only anchored at the end,
                                // leading * in globs should not influence the matching behavior.
                                // For example, the globs "*foo.txt" and "foo.txt" should match the same things.
-                    uses_metacharacters = true;
                     next_c = Peek(inp);
                     if (next_c == '*')
                     {

diff --git a/NppNavigateTo/Tests/GlobTester.cs b/NppNavigateTo/Tests/GlobTester.cs
@@ -160,6 +160,13 @@ public static void Test()
                     ("aд.txt", false),
                     ("д.md", false),
                 }),
+                ("**.txt | *.json", new[]
+                {
+                    ("Z:\\foo.json", true),
+                    ("c:\\goon\\guk.txt", true),
+                    ("foo.jsonl", false),
+                    ("c:\\bar.txto", false),
+                }),
             };
             var glob = new Glob();
             foreach ((string query, var examples) in testcases)

diff --git a/test_results.txt b/test_results.txt
@@ -3,4 +3,4 @@ Test results for NavigateTo v2.6
 Testing Glob syntax
 =========================
 
-Ran 90 tests and failed 0
+Ran 94 tests and failed 0