Merge pull request #54 from molsonkiko/improve_hide_show_behavior

Refresh search results on unhide, show open files on first load.

Author: young-developer

NppNavigateTo/Forms/FrmNavigateTo.cs

@@ -103,6 +103,7 @@ public FrmNavigateTo(IScintillaGateway editor, INotepadPPGateway notepad)
             ReloadFileList();
             this.notepad.ReloadMenuItems();
             FormStyle.ApplyStyle(this, true, notepad.IsDarkModeEnabled());
+            FilterDataGrid("");
         }
 
         /// <summary>
@@ -617,11 +618,12 @@ private bool NavigateGridDown(bool isShiftPressed)
         private void SearchComboBoxTextChanged(object sender, EventArgs e)
         {
             int textLength = searchComboBox.Text.Length;
+            bool emptyText = string.IsNullOrWhiteSpace(searchComboBox.Text);
             int minLength = FrmSettings.Settings.GetIntSetting(Settings.minTypeCharLimit);
 
-            if (textLength == 0)
+            if (emptyText)
                 ReloadFileList();
-            if (textLength > minLength)
+            if (textLength > minLength || emptyText)
             {
                 FilterDataGrid(searchComboBox.Text);
             }
@@ -886,6 +888,12 @@ private void FrmNavigateAll_KeyPress(object sender, KeyPressEventArgs e)
             }
         }
 
+        public void GrabFocus()
+        {
+            searchComboBox.Select();
+            FilterDataGrid(searchComboBox.Text);
+        }
+
         private void dataGridFileList_KeyPress(object sender, KeyPressEventArgs e)
         {
             searchComboBox.Focus();

NppNavigateTo/Glob.cs

@@ -197,7 +197,7 @@ public Regex Glob2Regex(string inp)
                 ii++;
             }
             endOfLoop:
-            if (uses_metacharacters) // anything without "*" or "?" or "[]" or 
+            if (uses_metacharacters) // anything without any chars in "*?[]{}" will just be treated as a normal string
                 sb.Append('$'); // globs are anchored at the end; that is "*foo" does not match "foo/bar.txt" but "*foo.tx?" does
             string pat = sb.ToString();
             try

NppNavigateTo/NppNavigateTo.cs

@@ -204,13 +204,15 @@ static void NavigateToDlg()
                         frmNavigateTo.Handle);
                     Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_SETMENUITEMCHECK,
                         PluginBase._funcItems.Items[idFormNavigateAll]._cmdID, 1);
+                    frmNavigateTo.GrabFocus();
                 }
                 else
                 {
                     Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_DMMHIDE, 0,
                         frmNavigateTo.Handle);
                     Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_SETMENUITEMCHECK,
                         PluginBase._funcItems.Items[idFormNavigateAll]._cmdID, 0);
+                    editor.GrabFocus();
                 }
             }
         }

NppNavigateTo/Tests/GlobTester.cs

@@ -167,6 +167,17 @@ public static void Test()
                     ("foo.jsonl", false),
                     ("c:\\bar.txto", false),
                 }),
+                ("*.p* !< __ | \\j", new[]
+                {
+                    ("bep.po", true),
+                    ("joo.po", true),
+                    ("boo\\joo.po", false),
+                    ("bbq.go", false),
+                    ("__bzz.po", false),
+                    ("boo\\j__.po", false),
+                    ("boo__\\eorpwn\\reiren.po", false),
+                    ("Z:\\jnq\\eorpwn\\reiren.po", false),
+                }),
             };
             var glob = new Glob();
             foreach ((string query, var examples) in testcases)

test_results.txt

@@ -3,4 +3,4 @@ Test results for NavigateTo v2.6
 Testing Glob syntax
 =========================
 
-Ran 94 tests and failed 0
+Ran 102 tests and failed 0