Merge release/dev16.11-vs-deps to main-vs-deps

azure-pipelines-official.yml

@@ -215,6 +215,7 @@ stages:
         sourcePath: '$(Build.SourcesDirectory)\artifacts\OptProf\$(BuildConfiguration)\Data'
         toLowerCase: false
         usePat: false
+        retentionDays: 90
       displayName: 'OptProf - Publish to Artifact Services - ProfilingInputs'
       condition: succeeded()
 

src/Tools/ExternalAccess/OmniSharp/GoToDefinition/OmniSharpFindDefinitionService.cs

@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.Navigation;
+using Microsoft.CodeAnalysis.GoToDefinition;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.GoToDefinition
+{
+    internal static class OmniSharpFindDefinitionService
+    {
+        internal static async Task<ImmutableArray<OmniSharpNavigableItem>> FindDefinitionsAsync(Document document, int position, CancellationToken cancellationToken)
+        {
+            var service = document.GetRequiredLanguageService<IFindDefinitionService>();
+            var result = await service.FindDefinitionsAsync(document, position, cancellationToken).ConfigureAwait(false);
+            return result.NullToEmpty().SelectAsArray(original => new OmniSharpNavigableItem(original.DisplayTaggedParts, original.Document, original.SourceSpan));
+        }
+    }
+}

src/Tools/ExternalAccess/OmniSharp/InlineHints/OmniSharpInlineHintsService.cs

@@ -0,0 +1,48 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.InlineHints;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.InlineHints
+{
+    internal static class OmniSharpInlineHintsService
+    {
+        public static async Task<ImmutableArray<OmniSharpInlineHint>> GetInlineHintsAsync(Document document, TextSpan textSpan, CancellationToken cancellationToken)
+        {
+            var service = document.GetRequiredLanguageService<IInlineHintsService>();
+            var hints = await service.GetInlineHintsAsync(document, textSpan, cancellationToken).ConfigureAwait(false);
+            return hints.SelectAsArray(static h => new OmniSharpInlineHint(
+                h.Span,
+                h.DisplayParts,
+                (document, cancellationToken) => h.GetDescriptionAsync(document, cancellationToken)));
+        }
+    }
+
+    internal readonly struct OmniSharpInlineHint
+    {
+        private readonly Func<Document, CancellationToken, Task<ImmutableArray<TaggedText>>> _getDescriptionAsync;
+
+        public OmniSharpInlineHint(
+            TextSpan span,
+            ImmutableArray<TaggedText> displayParts,
+            Func<Document, CancellationToken, Task<ImmutableArray<TaggedText>>> getDescriptionAsync)
+        {
+            Span = span;
+            DisplayParts = displayParts;
+            _getDescriptionAsync = getDescriptionAsync;
+        }
+
+        public readonly TextSpan Span { get; }
+        public readonly ImmutableArray<TaggedText> DisplayParts { get; }
+
+        public Task<ImmutableArray<TaggedText>> GetDescrptionAsync(Document document, CancellationToken cancellationToken)
+            => _getDescriptionAsync.Invoke(document, cancellationToken);
+    }
+}

src/Tools/ExternalAccess/OmniSharp/Navigation/OmniSharpNavigableItem.cs

@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.Navigation
+{
+    internal readonly struct OmniSharpNavigableItem
+    {
+        public OmniSharpNavigableItem(ImmutableArray<TaggedText> displayTaggedParts, Document document, TextSpan sourceSpan)
+        {
+            DisplayTaggedParts = displayTaggedParts;
+            Document = document;
+            SourceSpan = sourceSpan;
+        }
+
+        public ImmutableArray<TaggedText> DisplayTaggedParts { get; }
+
+        public Document Document { get; }
+
+        public TextSpan SourceSpan { get; }
+    }
+}