Add NVim workspace support and fix highlighting issues

Introduces NVim workspace integration, including new plugin command and related view model logic. Fixes highlighting issues caused by trimming result spaces, resolves replace functionality in flat mode, and addresses result recycling for whole word matches. Updates version to 1.0.25 and documents changes in the changelog.

Author: Natestah

src/Blitz.Avalonia.Controls/MatchHighlighter.cs

@@ -9,7 +9,7 @@
 
 namespace Blitz.Avalonia.Controls;
 
-public class MatchHighlighter(CharState?[] states, List<BlitzMatch> matches, string lineText, bool isForReplacement)
+public class MatchHighlighter(CharState?[] states, List<BlitzMatch> matches, string lineText, bool isForReplacement, int offsetForSpaceRemoval = 0)
 {
     public InlineCollection GetInlines()
     {
@@ -22,21 +22,22 @@ public InlineCollection GetInlines()
 
         foreach (var match in matches)
         {
+            int offsetMathIndex = match.MatchIndex - offsetForSpaceRemoval;
 
-            int target = match.MatchIndex + match.MatchLength;
+            int target = offsetMathIndex + match.MatchLength;
 
 
             if (match.Replacement is { Length: 0 })
             {
-                states[match.MatchIndex] ??= new CharState();
-                states[match.MatchIndex]!.InsertedText = lineText.Substring(match.MatchIndex, match.MatchLength);
+                states[offsetMathIndex] ??= new CharState();
+                states[offsetMathIndex]!.InsertedText = lineText.Substring(offsetMathIndex, match.MatchLength);
             }
             // matches are from whole line, which can be truncated for displaytext.
 
-            for (int i = match.MatchIndex; i < target && i < states.Length; i++)
+            for (int i = offsetMathIndex; i < target && i < states.Length; i++)
             {
                 states[i] ??= new CharState();
-                if (i == match.MatchIndex && match.Replacement is { Length: > 0 } )
+                if (i == offsetMathIndex && match.Replacement is { Length: > 0 } )
                 {
                     states[i]!.ReplacedFrom = match.Replacement;
                     int offset = match.MatchLength - match.Replacement.Length;

src/Blitz.Avalonia.Controls/PluginCommands.cs

@@ -25,6 +25,7 @@ public class PluginCommands
     public const string SetThemeLight = "SET_THEME_LIGHT";  
     public const string VisualStudioCodeWorkspaceUpdate = "WORKSPACE_UPDATE";  
     public const string SublimeTextWorkspaceUpdate = "SUBLIME_TEXT_WORKSPACE";  
+    public const string NVimUpdateWorkspace = "NVIM_SET_WORKSPACE";  
     public const string UpdateVisualStudioProject = "VS_PROJECT";  
     public const string UpdateVisualStudioActiveFiles = "VS_ACTIVE_FILES";
     public static string SimpleFolderSearch = "SIMPLE_FOLDER_SEARCH";

src/Blitz.Avalonia.Controls/ViewModels/ContentResultViewModel.cs

@@ -31,25 +31,25 @@ public InlineCollection ContentWithHighlights
             //this can over-burden things. (huge performance hitch and horizontal scrolling).  simply truncate here
             const int maxLineDisplayChars = 1024; //Make this optional? -> https://github.com/Natestah/BlitzSearch/issues/84
 
-            
             if (!string.IsNullOrEmpty(fileContentResultResult.ReplacedContents))
             {
                 renderedContents = fileContentResultResult.ReplacedContents;
             }
 
+            int offsetForSpaceRemoval = renderedContents.Length;
             renderedContents = renderedContents.TrimStart();
+            offsetForSpaceRemoval -= renderedContents.Length;
 
             bool largeLine = renderedContents.Length > maxLineDisplayChars;
 
-            
             string displayContents = largeLine ? renderedContents.Substring(0, maxLineDisplayChars): renderedContents;
 
             // given the lines contents and the filename.. come up with some highlights.
             InlineCollection inlineCollection = MainWindowViewModel.ResultsHighlighting.GetInlinesFromTextMateSharp(displayContents, fileNameResult.FileName);
 
             var states = MainWindowViewModel.ResultsHighlighting.GetCharStatesFromInlines(inlineCollection, displayContents);
 
-            var matchHighlighter = new MatchHighlighter(states,fileContentResultResult.BlitzMatches, displayContents, replacing);
+            var matchHighlighter = new MatchHighlighter(states,fileContentResultResult.BlitzMatches, displayContents, replacing, offsetForSpaceRemoval);
 
             return matchHighlighter.GetInlines();
         }

src/Blitz.Avalonia.Controls/ViewModels/MainWindowViewModel.cs

@@ -371,6 +371,9 @@ public void UpdateScopeSelectionForEditor()
             case CodeExecuteNames.Windsurf:
                 RecallVisualStudioCodeWorkspacesVisited();
                 break;
+            case CodeExecuteNames.NVim:
+                RecallNVimWorkspacesVisited();
+                break;
             case CodeExecuteNames.SublimeText:
                 //Sublime Text always updates a single summary of it's Windows and workspaces.
                 ExternalPluginInteractions.Commander.ExecuteNamedAction(PluginCommands.SublimeTextWorkspaceUpdate);
@@ -1869,18 +1872,12 @@ public void UpdateActiveFiles(ActiveFilesList? list)
 
     }
 
-    public void RecallVisualStudioCodeWorkspacesVisited()
+    private void RecallWorkSPaceVisited(string fromPluginExport)
     {
-        if (SelectedEditorViewModel is not { IsVsCode: true } and not { IsCursor: true } and not
-            { IsWindsurf: true })
-        {
-            return;
-        }
-
         WorkspaceScopeViewModels.Clear();
         int max = 20;
         int count = 0;
-        foreach (var solutionId in ExternalPluginInteractions.Commander.GetSolutionIDsForCommands(PluginCommands.VisualStudioCodeWorkspaceUpdate))
+        foreach (var solutionId in ExternalPluginInteractions.Commander.GetSolutionIDsForCommands(fromPluginExport))
         {
             var workspaceScopeViewModel = new WorkspaceScopeViewModel(this, solutionId);
             WorkspaceScopeViewModels.Add(workspaceScopeViewModel);
@@ -1905,6 +1902,25 @@ public void RecallVisualStudioCodeWorkspacesVisited()
         }
     }
 
+    public void RecallNVimWorkspacesVisited()
+    {
+        if (SelectedEditorViewModel is not { IsNeoVim: true })
+        {
+            return;
+        }
+        RecallWorkSPaceVisited(PluginCommands.NVimUpdateWorkspace);
+    }
+    public void RecallVisualStudioCodeWorkspacesVisited()
+    {
+        if (SelectedEditorViewModel is not { IsVsCode: true } and not { IsCursor: true } and not
+            { IsWindsurf: true })
+        {
+            return;
+        }
+
+        RecallWorkSPaceVisited(PluginCommands.VisualStudioCodeWorkspaceUpdate);
+    }
+
     private string GetNameFromSublimeTextWorkspace(FolderWorkspace workspace)
     {
         if (!string.IsNullOrEmpty(workspace.ProjectName))
@@ -1956,6 +1972,23 @@ private string GetNameFromSublimeTextWorkspace(FolderWorkspace workspace)
         builder.Append(')');
         return builder.ToString();
     }
+    
+    public void ApplyNVimWorkSpace(FolderWorkspace workspace)
+    {
+        SolutionViewModel = null;
+        WorkspaceScopeViewModels.Clear();
+        
+        if (string.IsNullOrEmpty(workspace.Name))
+        {
+            workspace.Name = GetNameFromSublimeTextWorkspace(workspace);
+        }
+        var solutionId = SolutionID.CreateFromSolutionPath(workspace.Name);
+        var workspaceScopeViewModel = new WorkspaceScopeViewModel(this, solutionId,true)
+        {
+            WorkspaceExport = workspace
+        };
+        WorkspaceScopeViewModels.Insert(0, workspaceScopeViewModel);
+    }
 
     public void ApplySublimeTextListOfWorkspaces(List<FolderWorkspace> workspaces)
     {

src/Blitz.Avalonia.Controls/Views/BlitzMainPanel.axaml.cs

@@ -265,10 +265,17 @@ private async void AcceptChangesClick(object? sender, RoutedEventArgs e)
         mainWindowViewModel.StopRespondingToCurrentQuery();
 
         List<FileNameResult> items = [];
-        foreach (var change in mainWindowViewModel.ResultBoxItems.OfType<FileNameResultViewModel>())
+        HashSet<string> files = new HashSet<string>();
+        foreach (var change in mainWindowViewModel.ResultBoxItems.OfType<ContentResultViewModel>())
         {
-            items.Add(change.FileNameResult);
+            if (files.Add(change.FileNameResult.FileName))
+            {
+                items.Add(change.FileNameResult);
+            }
         }
+        
+        
+        
         mainWindowViewModel.ResultBoxItems.Clear();
         var summary = new StringBuilder();
         int total = items.Count;

src/Blitz.Avalonia.Controls/Views/ExternalPluginInteractions.cs

@@ -42,6 +42,7 @@ private void RegisterCommands()
         _commander.RegisterAction(PluginCommands.UpdateVisualStudioProject, UpdateVisualStudioSelectedProject);
         _commander.RegisterAction(PluginCommands.UpdateVisualStudioActiveFiles, UpdateVisualStudioActiveFilesList);
         _commander.RegisterAction(PluginCommands.SublimeTextWorkspaceUpdate, UpdateSublimeTextWorkspace);
+        _commander.RegisterAction(PluginCommands.NVimUpdateWorkspace, UpdateNVimWorkspace);
         _commander.RegisterAction(PluginCommands.SimpleFolderSearch, SetSimpleFolderSearch);
         _commander.ExecuteWithin(DateTime.UtcNow, TimeSpan.FromSeconds(2));
     }
@@ -423,6 +424,28 @@ private void UpdateVisualStudioSelectedProject(string text)
     }
 
 
+    private void UpdateNVimWorkspace(string text)
+    {
+        if (string.IsNullOrEmpty(text))
+        {
+            return;
+        }
+
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (_viewModel is not { SelectedEditorViewModel.IsSublimeText: true })
+            {
+                return;
+            }
+            var workspace = JsonSerializer.Deserialize(text, JsonContext.Default.FolderWorkspace);
+            if (workspace is null)
+            {
+                return;
+            }
+            _viewModel.ApplyNVimWorkSpace(workspace);
+        });
+    }
+
 
     private void UpdateSublimeTextWorkspace(string text)
     {

src/Blitz.Search/Searching.cs

@@ -415,6 +415,10 @@ private static bool IsOldQueryRecyclable(IBlitzMatchingQuery oldSubQuery, IBlitz
             {
                 return false;
             }
+            else if (oldWordInQuery.SearchWord != newWordQuery.SearchWord)
+            {
+                return false;
+            }
             if (oldWordInQuery.CaseSensitive != newWordQuery.CaseSensitive)
             {
                 return false;

src/Blitz/Blitz.csproj

@@ -14,8 +14,8 @@
         <PackageIcon>Assets\BlitzIcon.ico</PackageIcon>
         <RepositoryUrl>https://github.com/Natestah/BlitzSearch</RepositoryUrl>
         <ApplicationIcon>Assets\BlitzIcon.ico</ApplicationIcon>
-        <AssemblyVersion>1.0.24</AssemblyVersion>
-        <FileVersion>1.0.24</FileVersion>
+        <AssemblyVersion>1.0.25</AssemblyVersion>
+        <FileVersion>1.0.25</FileVersion>
         <AssemblyOriginatorKeyFile>BlitzSign.snk</AssemblyOriginatorKeyFile>
         <PublicSign>false</PublicSign>
     </PropertyGroup>

src/Blitz/Documentation/Change_Log.md

@@ -1,7 +1,10 @@
 # Change Log
 
 #### Come join me on.. [Discord](https://discord.com/invite/UYPwQY9ngm) and give feedback!
-
+### Version 1.0.25
+* Fix Highlighting issue introduced with trimming result spaces
+* Fixed Replace being broken with new flat mode
+* Fixed a result recycling issue with whole word matches.
 ### Version 1.0.24
 * Don't dim Line Numbers
 * Trim leading Spaces from results to pull in those far tabbed code results.