Update samples for VS 17.13

New_Extensibility_Model/Samples/CodeLensSample/CodeLensSample.csproj

@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.12.40390" />
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.12.40390" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.13.39466" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.13.39466" />
   </ItemGroup>
 
   <ItemGroup>

New_Extensibility_Model/Samples/CommandParentingSample/CommandParentingSample.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.12.40390" />
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.12.40390" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.13.39466" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.13.39466" />
   </ItemGroup>
 </Project>

New_Extensibility_Model/Samples/CommentRemover/CommentRemover.csproj

@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.12.40390" />
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.12.40390" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.13.39466" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.13.39466" />
     <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.6.36389" ExcludeAssets="runtime" />
   </ItemGroup>
 

New_Extensibility_Model/Samples/DialogSample/DialogSample.csproj

@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.12.40390" />
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.12.40390" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.13.39466" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.13.39466" />
   </ItemGroup>
 
   <ItemGroup>

New_Extensibility_Model/Samples/DocumentSelectorSample/DocumentSelectorSample.csproj

@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.12.40390" />
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.12.40390" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.13.39466" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.13.39466" />
   </ItemGroup>
 
   <ItemGroup>

New_Extensibility_Model/Samples/ExtensionPublisher/ExtensionPublisher.csproj

@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.12.40390" />
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.12.40390" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.13.39466" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.13.39466" />
   </ItemGroup>
 
   <ItemGroup>

New_Extensibility_Model/Samples/FeatureGallery/FeatureGallery.csproj

@@ -6,8 +6,8 @@
     <NeutralLanguage>en-US</NeutralLanguage>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.12.40390" />
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.12.40390" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.13.39466" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.13.39466" />
     <PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol" Version="17.2.8" />
   </ItemGroup>
 

New_Extensibility_Model/Samples/FeatureGallery/MainToolWindow.cs

@@ -40,6 +40,7 @@ public MainToolWindow()
             new LanguageServerTest(this.Extensibility),
             new SettingsTest(this.Extensibility),
             new ImageTest(this.Extensibility),
+            new TaggerTest(this.Extensibility),
         };
     }
 

New_Extensibility_Model/Samples/FeatureGallery/Taggers/MarkdownCodeLens.cs

@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if INPROC
+namespace InProcFeatureGallery;
+#else
+namespace FeatureGallery;
+#endif
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using Microsoft.VisualStudio.Extensibility;
+using Microsoft.VisualStudio.Extensibility.Editor;
+
+#pragma warning disable VSEXTPREVIEW_CODELENS // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+internal class MarkdownCodeLens : InvokableCodeLens
+{
+    private readonly CodeElement codeElement;
+
+    public MarkdownCodeLens(CodeElement codeElement)
+    {
+        this.codeElement = codeElement;
+    }
+
+    public override void Dispose()
+    {
+    }
+
+    public override Task ExecuteAsync(CodeElementContext codeElementContext, IClientContext clientContext, CancellationToken cancelToken)
+    {
+        TaskCompletionSource<bool> taskCompletionSource = new();
+        var thread = new Thread(() =>
+        {
+            try
+            {
+                Clipboard.SetText(this.codeElement.UniqueIdentifier ?? "Unknown identifier");
+                taskCompletionSource.SetResult(false);
+            }
+            catch (Exception e)
+            {
+                taskCompletionSource.SetException(e);
+            }
+        });
+
+        thread.SetApartmentState(ApartmentState.STA);
+        thread.Start();
+
+        return taskCompletionSource.Task;
+    }
+
+    public override Task<CodeLensLabel> GetLabelAsync(CodeElementContext codeElementContext, CancellationToken token)
+    {
+        return Task.FromResult(new CodeLensLabel()
+        {
+            Text = this.codeElement.UniqueIdentifier ?? "Unknown identifier",
+            Tooltip = "Unique identifier of this section, click to copy the identifier to the clipboard",
+        });
+    }
+}
+
+#pragma warning restore VSEXTPREVIEW_CODELENS // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.

New_Extensibility_Model/Samples/FeatureGallery/Taggers/MarkdownCodeLensProvider.cs

@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if INPROC
+namespace InProcFeatureGallery;
+#else
+namespace FeatureGallery;
+#endif
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.Extensibility;
+using Microsoft.VisualStudio.Extensibility.Editor;
+
+#pragma warning disable VSEXTPREVIEW_CODELENS // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+/// <summary>
+/// A sample CodeLens provider that shows the number of words in a method or type and provides custom UI when clicked.
+/// </summary>
+[VisualStudioContribution]
+internal class MarkdownCodeLensProvider : ExtensionPart, ICodeLensProvider
+{
+    public TextViewExtensionConfiguration TextViewExtensionConfiguration => new()
+    {
+        AppliesTo = [DocumentFilter.FromDocumentType(TaggerTest.MyMarkdownDocumentType)],
+    };
+
+#pragma warning disable CEE0027 // String not localized
+    public CodeLensProviderConfiguration CodeLensProviderConfiguration =>
+        new("Remote UI CodeLens Sample Provider")
+        {
+            Priority = 600,
+        };
+#pragma warning restore CEE0027 // String not localized
+
+    public Task<CodeLens?> TryCreateCodeLensAsync(CodeElement codeElement, CodeElementContext codeElementContext, CancellationToken token)
+    {
+        if (codeElement.Kind == MarkdownCodeLensTagger.SectionCodeElementKind)
+        {
+            return Task.FromResult<CodeLens?>(new MarkdownCodeLens(codeElement));
+        }
+
+        return Task.FromResult<CodeLens?>(null);
+    }
+}

New_Extensibility_Model/Samples/FeatureGallery/Taggers/MarkdownCodeLensTagger.cs

@@ -0,0 +1,198 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if INPROC
+namespace InProcFeatureGallery;
+#else
+namespace FeatureGallery;
+#endif
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.Extensibility.Editor;
+using Microsoft.VisualStudio.Threading;
+
+#pragma warning disable VSEXTPREVIEW_CODELENS // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+#pragma warning disable VSEXTPREVIEW_TAGGERS // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+internal class MarkdownCodeLensTagger : TextViewTagger<CodeLensTag>
+{
+    public static readonly CodeElementKind SectionCodeElementKind = "Section";
+
+    private readonly MarkdownTaggerProvider provider;
+    private readonly Uri documentUri;
+    private readonly AsyncSemaphore semaphore = new(1);
+
+    private ITextDocumentSnapshot? currentDocumentSnapshot;
+    private bool needsUpdate;
+    private bool updateRunning;
+
+    public MarkdownCodeLensTagger(MarkdownTaggerProvider provider, Uri documentUri)
+    {
+        this.provider = provider;
+        this.documentUri = documentUri;
+    }
+
+    public override void Dispose()
+    {
+        this.provider.RemoveCodeLensTagger(this.documentUri, this);
+        this.semaphore.Dispose();
+        base.Dispose();
+    }
+
+    public async Task TextViewChangedAsync(ITextViewSnapshot textView, IReadOnlyList<TextEdit> edits, CancellationToken cancellationToken)
+    {
+        if (edits.Count == 0)
+        {
+            return;
+        }
+
+        var documentBefore = edits[0].Range.Document;
+        var documentAfter = textView.Document;
+
+        using var semaphoreReleaser = await this.semaphore.EnterAsync();
+
+        // Only queue a tags calculation if we haven't already queued it for a newer version of the document.
+        if (this.currentDocumentSnapshot is null || this.currentDocumentSnapshot.RpcContract.Version < documentAfter.RpcContract.Version)
+        {
+            // If we already have a request to update the tags, let's just update the current document snapshot so that tags are calculated
+            // with the latest version of the document.
+            if (this.needsUpdate)
+            {
+                this.currentDocumentSnapshot = documentAfter;
+                return;
+            }
+
+            // Only recalculate tags if a line starting with # was touched (added, removed, or modified).
+            if (Lines(
+                        documentBefore,
+                        edits.Select(e => e.Range))
+                    .Any(l => l.StartsWith("#")) ||
+                Lines(
+                        documentAfter,
+                        edits.Select(e => e.Range.TranslateTo(documentAfter, TextRangeTrackingMode.EdgeInclusive)))
+                    .Any(l => l.StartsWith("#")))
+            {
+                    this.currentDocumentSnapshot = documentAfter;
+                    _ = this.RunCreateTagsAsync();
+            }
+        }
+    }
+
+    protected override async Task RequestTagsAsync(NormalizedTextRangeCollection requestedRanges, bool recalculateAll, CancellationToken cancellationToken)
+    {
+        if (requestedRanges.Count == 0 || requestedRanges.TextDocumentSnapshot is null)
+        {
+            return;
+        }
+
+        using var semaphoreReleaser = await this.semaphore.EnterAsync();
+
+        // Only queue a tags calculation if we haven't already queued it for a newer version of the document. If we are asked to recalculate all, we always recalculate, but
+        // we use the latest between the current snapshot and the requested snapshot.
+        if (recalculateAll)
+        {
+            this.currentDocumentSnapshot =
+                this.currentDocumentSnapshot is not null && this.currentDocumentSnapshot.RpcContract.Version >= requestedRanges.TextDocumentSnapshot.RpcContract.Version ?
+                    this.currentDocumentSnapshot :
+                    requestedRanges.TextDocumentSnapshot;
+            _ = this.RunCreateTagsAsync();
+        }
+        else if (this.currentDocumentSnapshot is null || this.currentDocumentSnapshot.RpcContract.Version < requestedRanges.TextDocumentSnapshot.RpcContract.Version)
+        {
+            this.currentDocumentSnapshot = requestedRanges.TextDocumentSnapshot;
+            _ = this.RunCreateTagsAsync();
+        }
+    }
+
+    private static IEnumerable<TextRange> Lines(ITextDocumentSnapshot document, IEnumerable<TextRange> ranges)
+        => ranges
+            .SelectMany(r =>
+            {
+                var startLine = r.Document.GetLineNumberFromPosition(r.Start);
+                var endLine = r.Document.GetLineNumberFromPosition(r.End);
+                return Enumerable.Range(startLine, endLine - startLine + 1);
+            })
+            .Distinct()
+            .Select(l => document.Lines[l].Text);
+
+    private async Task RunCreateTagsAsync()
+    {
+        // we are still under the semaphore here
+        this.needsUpdate = true;
+
+        // If we are already running the RunCreateTagsAsync loop, we don't need to start another one.
+        if (this.updateRunning)
+        {
+            return;
+        }
+
+        this.updateRunning = true;
+        while (true)
+        {
+            ITextDocumentSnapshot document;
+            {
+                // On the first iteration, since the caller owns the semaphore, this will always yield.
+                using var semaphoreReleaser = await this.semaphore.EnterAsync();
+                if (!this.needsUpdate || this.currentDocumentSnapshot is null)
+                {
+                    this.updateRunning = false;
+                    return;
+                }
+
+                this.needsUpdate = false;
+                document = this.currentDocumentSnapshot;
+            }
+
+            // We don't hold the semaphore while running CreateTagsAsync, that allows new requests to run tag calculation to happen.
+            await this.CreateTagsAsync(document);
+        }
+    }
+
+    private async Task CreateTagsAsync(ITextDocumentSnapshot document)
+    {
+        Dictionary<string, int> sections = new();
+
+        List<TaggedTrackingTextRange<CodeLensTag>> tags = new();
+        foreach (var line in document!.Lines)
+        {
+            int level = line.Text.TakeWhile(c => c == '#').Count();
+            if (level > 0 && level <= 6)
+            {
+                var description = line.Text.CopyToString().TrimStart('#').Trim();
+
+                var identifier = new string(description
+                    .Where(c => char.IsLetterOrDigit(c) || c == ' ')
+                    .Select(c => c == ' ' ? '-' : char.ToLowerInvariant(c))
+                    .ToArray());
+
+                if (sections.TryGetValue(identifier, out var count))
+                {
+                    sections[identifier] = count + 1;
+                    identifier = $"{identifier}-{count}";
+                }
+                else
+                {
+                    sections.Add(identifier, 1);
+                }
+
+                tags.Add(new(new(document, line.Text.Start, line.Text.Length, TextRangeTrackingMode.EdgeInclusive), new(SectionCodeElementKind)
+                {
+                    UniqueIdentifier = identifier,
+                    Description = $"Level {level} section: {description}",
+                    DisplayBeforeCreatingCodeLenses = true,
+                    Properties = new()
+                    {
+                        ["Level"] = level.ToString(),
+                        ["Title"] = description,
+                    },
+                }));
+            }
+        }
+
+        await this.UpdateTagsAsync([new(document, 0, document.Length)], tags, CancellationToken.None);
+    }
+}