fix bug with directory search, improve dir search

1. Fix bug (introduced by previous commit)
   where searching the top directory only led to
   an uncaught error.
2. Do not trigger a directory search when opening
    a file in the same directory as the previously open file.
3. Require that the button to allow subdirectory search
    can only be checked if and only if
    the button to allow top directory search is also checked.
4. Always trigger a directory refresh when directory search
    when settings are changed.

Author: molsonkiko

NppNavigateTo/Forms/FrmNavigateTo.cs

@@ -51,17 +51,19 @@ partial class FrmNavigateTo : Form
 
         public List<string> SelectedFiles { get; set; }
 
-        public string[] filesInCurrentDirectory { get; set; }
-
-        public bool shouldReloadFilesInDirectory { get; set; }
+        public string currentDirectory { get; set; }
 
-        public long lastDirectoryReloadTimeTicks { get; set; }
+        public string[] filesInCurrentDirectory { get; set; }
 
         public bool isShuttingDown { get; set; }
 
         public bool IsFuzzyResult { get; set; }
 
-        private Dictionary<string, DirectorySearchLevel> subDirSearchAllowances { get; set; }
+        public bool shouldReloadFiles { get; set; }
+
+        private Dictionary<string, long> lastReloadTimes { get; set; }
+
+        private Dictionary<string, DirectorySearchLevel> searchLevelOverrides { get; set; }
 
         /// <summary>
         /// if there are a lot of files in the current directory, displaying rows for them
@@ -74,11 +76,12 @@ public FrmNavigateTo(IScintillaGateway editor, INotepadPPGateway notepad)
             this.editor = editor;
             this.notepad = notepad;
             this.SelectedFiles = new List<string>();
+            currentDirectory = null;
             filesInCurrentDirectory = null;
-            shouldReloadFilesInDirectory = true;
-            lastDirectoryReloadTimeTicks = 0;
+            shouldReloadFiles = true;
             IsFuzzyResult = false;
-            subDirSearchAllowances = new Dictionary<string, DirectorySearchLevel>();
+            lastReloadTimes = new Dictionary<string, long>();
+            searchLevelOverrides = new Dictionary<string, DirectorySearchLevel>();
             InitializeComponent();
             ReloadFileList();
             this.notepad.ReloadMenuItems();
@@ -94,10 +97,10 @@ private static bool MatchesAllWordsInFilter(string s, string[] words)
 
         string[] SearchCurrentDirectory(DirectorySearchLevel searchLevel, long nextTimeToRefresh, string currentDirectory)
         {
-            if (searchLevel == DirectorySearchLevel.None)
+            if (searchLevel < DirectorySearchLevel.TopDirOnly)
                 return new string[0];
-            if (shouldReloadFilesInDirectory ||
-                filesInCurrentDirectory == null ||
+            string[] currentFiles = null;
+            if (filesInCurrentDirectory == null ||
                 DateTime.UtcNow.Ticks >= nextTimeToRefresh)
             {
                 // only load the files in current directory as needed
@@ -109,7 +112,7 @@ string[] SearchCurrentDirectory(DirectorySearchLevel searchLevel, long nextTimeT
                     ? "directory tree"
                     : "top directory";
                 DirectorySearchLevel newSearchLevel = searchLevel;
-                string[] currentFiles = Directory.EnumerateFiles(currentDirectory, "*.*", searchOption)
+                currentFiles = Directory.EnumerateFiles(currentDirectory, "*.*", searchOption)
                     .CheckWhen(
                         x => ++fileCount >= minDirTreeSizeToWarn,
                         () =>
@@ -139,11 +142,13 @@ string[] SearchCurrentDirectory(DirectorySearchLevel searchLevel, long nextTimeT
                                 else
                                     newSearchLevel = DirectorySearchLevel.TopDirOnlyAndDontAsk;
                             }
+                            searchLevelOverrides[currentDirectory] = newSearchLevel;
                             return stopIteration;
                         }
                     )
                     .ToArray();
-                subDirSearchAllowances[currentDirectory] = newSearchLevel;
+                shouldReloadFiles = false;
+                lastReloadTimes[currentDirectory] = DateTime.UtcNow.Ticks;
                 if (newSearchLevel < searchLevel)
                 {
                     // the user didn't want to search as many files as their previous option implied
@@ -155,6 +160,7 @@ string[] SearchCurrentDirectory(DirectorySearchLevel searchLevel, long nextTimeT
                 }
                 return currentFiles;
             }
+            // no refresh, just use old files
             return filesInCurrentDirectory ?? new string[0];
         }
 
@@ -164,17 +170,27 @@ void FilterCurrentDirectory(Func<string, bool> filterFunc)
             if (string.IsNullOrWhiteSpace(currentDirectory))
                 return;
             bool userWantsSearchSubdirs = FrmSettings.Settings.GetBoolSetting(Settings.searchInSubDirs);
-            long nextTimeToRefresh = lastDirectoryReloadTimeTicks +
-                10_000_000 * FrmSettings.Settings.GetIntSetting(Settings.secondsBetweenDirectoryScans); // 10 million ticks/sec
-            DirectorySearchLevel searchLevel = subDirSearchAllowances.TryGetValue(currentDirectory, out var oldAllowSearch)
-                ? oldAllowSearch
-                : userWantsSearchSubdirs
-                    ? DirectorySearchLevel.RecurseSubdirs
-                    : DirectorySearchLevel.None;
+            DirectorySearchLevel searchLevel = userWantsSearchSubdirs
+                ? DirectorySearchLevel.RecurseSubdirs
+                : DirectorySearchLevel.TopDirOnly;
+            long nextTimeToRefresh = 0;
+            if (!shouldReloadFiles &&
+                lastReloadTimes.TryGetValue(currentDirectory, out long nextRefresh))
+                nextTimeToRefresh = nextRefresh;
+            DirectorySearchLevel searchLevelOverride = searchLevel;
+            if (searchLevelOverrides.TryGetValue(currentDirectory, out var searchOverride))
+                searchLevelOverride = searchOverride;
+            if (searchLevelOverride != searchLevel)
+            {
+                // if the user had previously chosen to do less searching in this directory
+                // than the global settings, follow that local override
+                if (searchLevel == DirectorySearchLevel.RecurseSubdirs
+                    || (searchLevelOverride <= DirectorySearchLevel.TopDirOnlyAndDontAsk))
+                {
+                    searchLevel = searchLevelOverride;
+                }
+            }
             filesInCurrentDirectory = SearchCurrentDirectory(searchLevel, nextTimeToRefresh, currentDirectory);
-            searchLevel = subDirSearchAllowances[currentDirectory];
-            shouldReloadFilesInDirectory = false;
-            lastDirectoryReloadTimeTicks = DateTime.UtcNow.Ticks;
             foreach (var filePath in filesInCurrentDirectory
                         .AsParallel().Where(filterFunc)
                         .ToList())
@@ -221,7 +237,7 @@ public void FilterDataGrid(string filter)
             }
             else
             {
-                var words = filter.Split(' ').Where(x => !string.IsNullOrWhiteSpace(x)).ToArray();
+                var words = filter.Split(' ').Where(x => !string.IsNullOrWhiteSpace(x)).ToHashSet().ToArray();
                 Func<string, bool> filterFunc;
                 if (words.Length == 0)
                     filterFunc = x => true;
@@ -285,7 +301,7 @@ public void FilterDataGrid(string filter)
         private void searchInTabs(string filter)
         {
             //Normal index of search
-            var words = filter.Split(' ').Where(x => !string.IsNullOrWhiteSpace(x)).ToArray();
+            var words = filter.Split(' ').Where(x => !string.IsNullOrWhiteSpace(x)).ToHashSet().ToArray();
             Func<string, bool> filterFunc = x => MatchesAllWordsInFilter(x, words);
             if (FrmSettings.Settings.GetBoolSetting(Settings.preferFilenameResults))
             {

NppNavigateTo/Forms/FrmSettings.cs

@@ -99,12 +99,22 @@ private void numericUpDown1_ValueChanged(object sender, EventArgs e)
 
         private void checkBox1_CheckedChanged(object sender, EventArgs e)
         {
+            if (Main.frmNavigateTo != null)
+                Main.frmNavigateTo.shouldReloadFiles = true;
+            bool isChecked = checkBoxSearchInFolder.Checked;
+            if (!isChecked)
+                checkBoxSearchInSubDirs.Checked = false;
             Settings.SetBoolSetting(Settings.searchInCurrentFolder, checkBoxSearchInFolder.Checked);
         }
 
         private void checkBox1_CheckedChanged_1(object sender, EventArgs e)
         {
-            Settings.SetBoolSetting(Settings.searchInSubDirs, checkBoxSearchInSubDirs.Checked);
+            if (Main.frmNavigateTo != null)
+                Main.frmNavigateTo.shouldReloadFiles = true;
+            bool isChecked = checkBoxSearchInSubDirs.Checked;
+            if (isChecked)
+                checkBoxSearchInFolder.Checked = true;
+            Settings.SetBoolSetting(Settings.searchInSubDirs, isChecked);
         }
 
         private void buttonHighlightColor_Click(object sender, EventArgs e)

NppNavigateTo/NppNavigateTo.cs

@@ -65,13 +65,16 @@ public static void OnNotification(ScNotification notification)
                     // this makes the editor track the current instance.
                     NavigateTo.Plugin.Namespace.Main.editor = new ScintillaGateway(PluginBase.GetCurrentScintilla());
                     var frmNavigateTo = NavigateTo.Plugin.Namespace.Main.frmNavigateTo;
-                    if (frmNavigateTo == null || NavigateTo.Plugin.Namespace.Main.isShuttingDown)
-                        // a bunch of NPPN_BUFFERACTIVATED events fire when Notepad++ is shutting down
-                        // which will lead to this being called repeatedly
-                        return;
-                    frmNavigateTo.shouldReloadFilesInDirectory = notification.Header.Code == (uint)NppMsg.NPPN_BUFFERACTIVATED;
-                    if (!frmNavigateTo.Visible)
+                    if (frmNavigateTo == null || !frmNavigateTo.Visible
+                        || NavigateTo.Plugin.Namespace.Main.isShuttingDown)
+                        // DO NOT reload file list if:
+                        // 1. Notepad++ is shutting down
+                        // 2. NavigateTo form doesn't exist or is not visible
                         return;
+                    // reload the file list whenever you open a file in a different directory
+                    if (frmNavigateTo.currentDirectory == null ||
+                        frmNavigateTo.currentDirectory != NavigateTo.Plugin.Namespace.Main.notepad.GetCurrentFileDirectory())
+                        frmNavigateTo.shouldReloadFiles = true;
                     frmNavigateTo.ReloadFileList();
                     frmNavigateTo.FilterDataGrid("");
                     break;