Fix to token tagger

Author: madskristensen

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

@@ -30,8 +30,13 @@ public StructureTagger(ITagAggregator<TokenTag>? tags) : base(tags)
 
         public override IEnumerable<ITagSpan<IStructureTag>> GetTags(NormalizedSnapshotSpanCollection spans, bool isFullParse)
         {
-            foreach (IMappingTagSpan<TokenTag> tag in Tags!.GetTags(spans).Where(t => t.Tag.SupportOutlining))
+            foreach (IMappingTagSpan<TokenTag> tag in Tags!.GetTags(spans))
             {
+                if (!tag.Tag.SupportOutlining || tag.Tag.GetOutliningText == null)
+                {
+                    continue;
+                }
+
                 NormalizedSnapshotSpanCollection tagSpans = tag.Span.GetSpans(tag.Span.AnchorBuffer.CurrentSnapshot);
 
                 foreach (SnapshotSpan tagSpan in tagSpans)

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

@@ -46,7 +46,7 @@ public TokenQuickInfo(ITagAggregator<TokenTag>? tags)
                 SnapshotSpan span = new(triggerPoint.Value.Snapshot, triggerPoint.Value.Position, 0);
                 IMappingTagSpan<TokenTag> tag = _tags.GetTags(span).FirstOrDefault(t => t.Tag.GetTooltipAsync != null);
 
-                if (tag != null && tag.Tag.GetTooltipAsync != null)
+                if (tag != null && tag.Tag.HasTooltip && tag.Tag.GetTooltipAsync != null)
                 {
                     object? tooltip = await tag.Tag.GetTooltipAsync(triggerPoint.Value);
 

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

@@ -15,27 +15,21 @@ public class TokenTag : ITag
         /// <summary>
         /// Creates a new instance.
         /// </summary>
-        public TokenTag(object tokenType, bool supportOutlining, Func<SnapshotPoint, Task<object>>? getTooltipAsync, params ErrorListItem[] errors)
+        public TokenTag(object tokenType, bool supportOutlining, bool hasTooltip, params ErrorListItem[] errors)
         {
             TokenType = tokenType;
             SupportOutlining = supportOutlining;
-            GetTooltipAsync = getTooltipAsync;
+            HasTooltip = hasTooltip;
             Errors = errors;
         }
 
         /// <summary>
         /// Creates a new instance.
         /// </summary>
         public TokenTag(object tokenType)
-            : this(tokenType, false, null)
+            : this(tokenType, false, false)
         { }
 
-        /// <summary>
-        /// Creates a new instance.
-        /// </summary>
-        public TokenTag(object tokenType, bool supportOutlining)
-            : this(tokenType, supportOutlining, null)
-        { }
 
         /// <summary>
         /// This can be any object you use to differentiate the type of token tags. It's used for classification.
@@ -45,12 +39,12 @@ public TokenTag(object tokenType, bool supportOutlining)
         /// <summary>
         /// Any tags supporting outlining will automatically get IStructure tags added.
         /// </summary>
-        public virtual bool SupportOutlining { get; set; }
+        public virtual bool SupportOutlining { get; }
 
         /// <summary>
         /// Specify if the tag has any tooltip to show. When true, the GetTooltipAsync method will be called.
         /// </summary>
-        public virtual bool HasTooltip { get; set; }
+        public virtual bool HasTooltip { get; }
 
         /// <summary>
         /// A list of errors associated with the tag.