Skip to content

Commit fbe0d14

Browse files
Updated NuGet packages and renamed token tagger
1 parent e124ffe commit fbe0d14

File tree

10 files changed

+18
-13
lines changed

10 files changed

+18
-13
lines changed

src/toolkit/Community.VisualStudio.Toolkit.14.0/Community.VisualStudio.Toolkit.14.0.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Madskristensen.VisualStudio.SDK" Version="14.0.83" IncludeAssets="All" PrivateAssets="None" />
11-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
11+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1212
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime" Version="12.1.30329" />
1313
</ItemGroup>
1414

src/toolkit/Community.VisualStudio.Toolkit.15.0/Community.VisualStudio.Toolkit.15.0.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="15.0.*" IncludeAssets="All" PrivateAssets="None" />
11-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
11+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1212
</ItemGroup>
1313

1414
</Project>

src/toolkit/Community.VisualStudio.Toolkit.16.0/Community.VisualStudio.Toolkit.16.0.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.*" IncludeAssets="All" PrivateAssets="None" />
11-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
11+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1212
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime" Version="12.1.30329" />
1313
</ItemGroup>
1414

src/toolkit/Community.VisualStudio.Toolkit.17.0/Community.VisualStudio.Toolkit.17.0.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.31902.203" IncludeAssets="All" PrivateAssets="None" />
12-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
12+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

src/toolkit/Community.VisualStudio.Toolkit.Shared/MEF/TokenTaggerBase.cs renamed to src/toolkit/Community.VisualStudio.Toolkit.Shared/MEF/InternalTaggerBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ namespace Community.VisualStudio.Toolkit
1010
/// A base class for creating token taggers for your custom language implementation.
1111
/// </summary>
1212
/// <typeparam name="TTag"></typeparam>
13-
public abstract class TokenTaggerBase<TTag> : ITagger<TTag>, IDisposable where TTag : ITag
13+
internal abstract class InternalTaggerBase<TTag> : ITagger<TTag>, IDisposable where TTag : ITag
1414
{
1515
private bool _isDisposed;
1616

1717
/// <summary>
1818
/// Creates a new instance of the base class.
1919
/// </summary>
2020
/// <param name="tags"></param>
21-
public TokenTaggerBase(ITagAggregator<TokenTag>? tags)
21+
public InternalTaggerBase(ITagAggregator<TokenTag>? tags)
2222
{
2323
Tags = tags ?? throw new ArgumentNullException(nameof(tags));
2424
Tags.TagsChanged += TokenTagsChanged;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public abstract class TokenClassificationTaggerBase : ITaggerProvider
1515
[Import] internal IBufferTagAggregatorFactoryService? _bufferTagAggregator = null;
1616

1717
/// <summary>
18-
/// A map of a token value and which classification name it cooresponds with.
18+
/// A map of a token value and which classification name it corresponds with.
1919
/// </summary>
2020
public abstract Dictionary<object, string> ClassificationMap { get; }
2121

@@ -27,7 +27,7 @@ public ITagger<T> CreateTagger<T>(ITextBuffer buffer) where T : ITag
2727
}
2828
}
2929

30-
internal class TokenClassifier : TokenTaggerBase<IClassificationTag>
30+
internal class TokenClassifier : InternalTaggerBase<IClassificationTag>
3131
{
3232
private static readonly Dictionary<object, ClassificationTag> _classificationMap = new();
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public ITagger<T> CreateTagger<T>(ITextBuffer buffer) where T : ITag
2323
}
2424
}
2525

26-
internal class ErrorTagger : TokenTaggerBase<IErrorTag>
26+
internal class ErrorTagger : InternalTaggerBase<IErrorTag>
2727
{
2828
private readonly TableDataSource _dataSource;
2929

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public ITagger<T> CreateTagger<T>(ITextBuffer buffer) where T : ITag
2323
}
2424
}
2525

26-
internal class StructureTagger : TokenTaggerBase<IStructureTag>
26+
internal class StructureTagger : InternalTaggerBase<IStructureTag>
2727
{
2828
public StructureTagger(ITagAggregator<TokenTag>? tags) : base(tags)
2929
{ }

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,18 @@ public TokenTag(object tokenType, bool supportOutlining)
4747
/// </summary>
4848
public virtual bool SupportOutlining { get; set; }
4949

50+
/// <summary>
51+
/// Specify if the tag has any tooltip to show. When true, the GetTooltipAsync method will be called.
52+
/// </summary>
53+
public virtual bool HasTooltip { get; set; }
54+
5055
/// <summary>
5156
/// A list of errors associated with the tag.
5257
/// </summary>
5358
public virtual IList<ErrorListItem> Errors { get; set; }
5459

5560
/// <summary>
56-
/// Returns true if there are no erros in the list.
61+
/// Returns true if there are no errors in the list.
5762
/// </summary>
5863
public virtual bool IsValid => Errors?.Any() == false;
5964

@@ -63,7 +68,7 @@ public TokenTag(object tokenType, bool supportOutlining)
6368
public virtual Func<SnapshotPoint, Task<object>>? GetTooltipAsync { get; set; }
6469

6570
/// <summary>
66-
/// A function to override the default behvaior of producing collapse outlining text.
71+
/// A function to override the default behavior of producing collapse outlining text.
6772
/// </summary>
6873
public virtual Func<string, string> GetOutliningText { get; set; } = (text) => text.Split('\n').FirstOrDefault().Trim();
6974
}

src/toolkit/Community.VisualStudio.Toolkit.Shared/VSSDK.Helpers.Shared.projitems

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<Compile Include="$(MSBuildThisFileDirectory)MEF\TokenOutliningTaggerBase.cs" />
6060
<Compile Include="$(MSBuildThisFileDirectory)MEF\TokenQuickInfoBase.cs" />
6161
<Compile Include="$(MSBuildThisFileDirectory)MEF\TokenTag.cs" />
62-
<Compile Include="$(MSBuildThisFileDirectory)MEF\TokenTaggerBase.cs" />
62+
<Compile Include="$(MSBuildThisFileDirectory)MEF\InternalTaggerBase.cs" />
6363
<Compile Include="$(MSBuildThisFileDirectory)MEF\WpfTextViewCreationListener.cs" />
6464
<Compile Include="$(MSBuildThisFileDirectory)Notifications\InfoBar.cs" />
6565
<Compile Include="$(MSBuildThisFileDirectory)Notifications\MessageBox.cs" />

0 commit comments

Comments
 (0)