Merge branch 'master' of https://github.com/VsixCommunity/Community.VisualStudio.Toolkit

Author: madskristensen

src/toolkit/Community.VisualStudio.Toolkit.Shared/MEF/SameWordHighlighterBase.cs

@@ -19,12 +19,32 @@ public class SameWordHighlighterBase : IViewTaggerProvider
 
         [Import] internal ITextStructureNavigatorSelectorService? _textStructureNavigatorSelector = null;
 
+        /// <summary>
+        /// The Options that are used to find the matching words. The default implementation returns 
+        /// FindOptions.WholeWord | FindOptions.MatchCase
+        /// </summary>
+        public virtual FindOptions FindOptions => FindOptions.WholeWord | FindOptions.MatchCase;
+        /// <summary>
+        /// Filter the results. 
+        /// </summary>
+        /// <param name="results">Collection of the results</param>
+        /// <returns>Filtered list of results. The default implementation returns all the results</returns>
+        public virtual IEnumerable<SnapshotSpan>? FilterResults(IEnumerable<SnapshotSpan>? results) => results;
+        /// <summary>
+        /// Should the Highlight code be triggered for this word
+        /// </summary>
+        /// <param name="text">The word to highlight</param>
+        /// <returns>true to continue the highlight or false to prevent the highlight.
+        /// The default implementation always returns true.</returns>
+        public virtual bool ShouldHighlight(string? text) => true;
+
         /// <inheritdoc/>
         public ITagger<T> CreateTagger<T>(ITextView textView, ITextBuffer buffer) where T : ITag
         {
             ITextStructureNavigator? navigator = _textStructureNavigatorSelector?.GetTextStructureNavigator(textView.TextBuffer);
 
-            return (ITagger<T>)buffer.Properties.GetOrCreateSingletonProperty(() => new SameWordHighlighterTagger(textView, buffer, _textSearchService, navigator));
+            return (ITagger<T>)buffer.Properties.GetOrCreateSingletonProperty(() => 
+                new SameWordHighlighterTagger(textView, buffer, _textSearchService, navigator, this));
         }
     }
 
@@ -39,18 +59,21 @@ internal class SameWordHighlighterTagger : ITagger<HighlightWordTag>, IDisposabl
         private readonly ITextBuffer _buffer;
         private readonly ITextSearchService? _textSearchService;
         private readonly ITextStructureNavigator? _textStructureNavigator;
+        private readonly SameWordHighlighterBase _tagger;
         private NormalizedSnapshotSpanCollection _wordSpans;
         private SnapshotSpan? _currentWord;
         private SnapshotPoint _requestedPoint;
         private bool _isDisposed;
         private readonly object _syncLock = new();
 
-        public SameWordHighlighterTagger(ITextView view, ITextBuffer sourceBuffer, ITextSearchService? textSearchService, ITextStructureNavigator? textStructureNavigator)
+        public SameWordHighlighterTagger(ITextView view, ITextBuffer sourceBuffer, ITextSearchService? textSearchService, 
+            ITextStructureNavigator? textStructureNavigator, SameWordHighlighterBase tagger)
         {
             _view = view;
             _buffer = sourceBuffer;
             _textSearchService = textSearchService;
             _textStructureNavigator = textStructureNavigator;
+            _tagger = tagger;
             _wordSpans = new NormalizedSnapshotSpanCollection();
             _currentWord = null;
             _view.Caret.PositionChanged += CaretPositionChanged;
@@ -96,18 +119,22 @@ private void UpdateWordAdornments(TextExtent word)
             SnapshotPoint currentRequest = _requestedPoint;
             List<SnapshotSpan>? wordSpans = new();
 
-            FindData findData = new(word.Span.GetText(), word.Span.Snapshot)
+            string? text = word.Span.GetText();
+            if (_tagger.ShouldHighlight(text))
             {
-                FindOptions = FindOptions.WholeWord | FindOptions.MatchCase
-            };
+                FindData findData = new(text, word.Span.Snapshot)
+                {
+                    FindOptions = _tagger.FindOptions
+                };
 
-            wordSpans.AddRange(_textSearchService!.FindAll(findData));
+                System.Collections.ObjectModel.Collection<SnapshotSpan>? found = _textSearchService!.FindAll(findData);
+                wordSpans.AddRange(_tagger.FilterResults(found));
 
-            if (wordSpans.Count == 1)
-            {
-                wordSpans.Clear();
+                if (wordSpans.Count == 1)
+                {
+                    wordSpans.Clear();
+                }
             }
-
             //If another change hasn't happened, do a real update
             if (currentRequest == _requestedPoint)
             {

src/toolkit/Community.VisualStudio.Toolkit.Shared/Solution/SolutionFolder.cs

@@ -58,11 +58,11 @@ public async Task<bool> TryRemoveAsync()
 
             if (solution != null)
             {
-                GetItemInfo(out IVsHierarchy hierarchy, out _, out _);
-
-                if (hierarchy is IVsSolution ivsSolution)
+                GetItemInfo(out IVsHierarchy folderHierarchy, out _, out _);
+                solution.GetItemInfo(out IVsHierarchy solutionHierarchy, out _, out _);
+                if (solutionHierarchy is IVsSolution ivsSolution)
                 {
-                    int hr = ivsSolution.CloseSolutionElement(0, hierarchy, 0);
+                    int hr = ivsSolution.CloseSolutionElement(0, folderHierarchy, 0);
                     return hr == VSConstants.S_OK;
                 }
             }