Merge branch 'main' into useSimpleLambdas

Author: CyrusNajmabadi

eng/targets/Settings.props

@@ -15,7 +15,7 @@
     <NoWarn>$(NoWarn);VSIXCompatibility1001</NoWarn>
 
     <!-- TODO: https://github.com/dotnet/roslyn/issues/71667 -->
-    <NoWarn>$(NoWarn);NU1507</NoWarn>
+    <NoWarn>$(NoWarn);NU1507;NU1510</NoWarn>
 
     <CommonExtensionInstallationRoot>CommonExtensions</CommonExtensionInstallationRoot>
     <LanguageServicesExtensionInstallationFolder>Microsoft\VBCSharp\LanguageServices</LanguageServicesExtensionInstallationFolder>

src/EditorFeatures/Core/Classification/Semantic/EmbeddedLanguageClassificationViewTaggerProvider.cs

@@ -14,6 +14,4 @@ namespace Microsoft.CodeAnalysis.Classification;
 /// </summary>
 internal sealed class EmbeddedLanguageClassificationViewTaggerProvider(
     TaggerHost taggerHost, ClassificationTypeMap typeMap)
-    : AbstractSemanticOrEmbeddedClassificationViewTaggerProvider(taggerHost, typeMap, ClassificationType.EmbeddedLanguage)
-{
-}
+    : AbstractSemanticOrEmbeddedClassificationViewTaggerProvider(taggerHost, typeMap, ClassificationType.EmbeddedLanguage);

src/EditorFeatures/Core/Classification/Semantic/SemanticClassificationViewTaggerProvider.cs

@@ -13,6 +13,4 @@ namespace Microsoft.CodeAnalysis.Classification;
 /// exported.  It is consumed by the <see cref="TotalClassificationTaggerProvider"/> instead.
 /// </summary>
 internal sealed class SemanticClassificationViewTaggerProvider(TaggerHost taggerHost, ClassificationTypeMap typeMap)
-    : AbstractSemanticOrEmbeddedClassificationViewTaggerProvider(taggerHost, typeMap, ClassificationType.Semantic)
-{
-}
+    : AbstractSemanticOrEmbeddedClassificationViewTaggerProvider(taggerHost, typeMap, ClassificationType.Semantic);

src/EditorFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.TagComputer.cs

@@ -9,10 +9,8 @@
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Tagging;
 using Microsoft.CodeAnalysis.Editor.Tagging;
-using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Internal.Log;
-using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis.Text.Shared.Extensions;
 using Microsoft.CodeAnalysis.Threading;
@@ -44,8 +42,8 @@ private sealed record CachedServices(
         private static readonly object s_uniqueKey = new();
 
         private readonly SyntacticClassificationTaggerProvider _taggerProvider;
-        private readonly ITextBuffer2 _subjectBuffer;
-        private readonly WorkspaceRegistration _workspaceRegistration;
+        private readonly ITextBuffer _subjectBuffer;
+        private readonly ITaggerEventSource _taggerEventSource;
 
         private readonly CancellationTokenSource _disposalCancellationSource = new();
 
@@ -61,10 +59,6 @@ private sealed record CachedServices(
         /// </summary>
         private readonly TimeSpan _diffTimeout;
 
-        private Workspace? _workspace;
-        private WorkspaceEventRegistration? _workspaceChangedDisposer;
-        private WorkspaceEventRegistration? _workspaceDocumentActiveContextChangedDisposer;
-
         /// <summary>
         /// Cached values for the last services we computed for a particular <see cref="Workspace"/> and <see
         /// cref="IContentType"/>.  These rarely change, and are expensive enough to show up in very hot scenarios (like
@@ -89,12 +83,11 @@ private sealed record CachedServices(
         /// again and again to find exactly same answer
         /// </summary>
         private readonly ClassifiedLineCache _lineCache;
-
         private int _taggerReferenceCount;
 
         public TagComputer(
             SyntacticClassificationTaggerProvider taggerProvider,
-            ITextBuffer2 subjectBuffer,
+            ITextBuffer subjectBuffer,
             TimeSpan diffTimeout)
         {
             _taggerProvider = taggerProvider;
@@ -109,13 +102,19 @@ public TagComputer(
 
             _lineCache = new ClassifiedLineCache(taggerProvider.ThreadingContext);
 
-            _workspaceRegistration = Workspace.GetWorkspaceRegistration(subjectBuffer.AsTextContainer());
-            _workspaceRegistration.WorkspaceChanged += OnWorkspaceRegistrationChanged;
+            _taggerEventSource = TaggerEventSources.Compose(
+                TaggerEventSources.OnWorkspaceChanged(subjectBuffer, taggerProvider._listener),
+                TaggerEventSources.OnWorkspaceRegistrationChanged(subjectBuffer),
+                TaggerEventSources.OnDocumentActiveContextChanged(subjectBuffer),
+                TaggerEventSources.OnTextChanged(subjectBuffer),
+                TaggerEventSources.OnParseOptionChanged(subjectBuffer));
+
+            _taggerEventSource.Connect();
 
-            if (_workspaceRegistration.Workspace != null)
-                ConnectToWorkspace(_workspaceRegistration.Workspace);
+            _taggerEventSource.Changed += OnEventSourceChanged;
 
-            _subjectBuffer.ChangedOnBackground += this.OnSubjectBufferChanged;
+            // Kick off work to classify the current snapshot of the subject buffer.
+            _workQueue.AddWork(_subjectBuffer.CurrentSnapshot);
         }
 
         public static TagComputer GetOrCreate(
@@ -130,14 +129,13 @@ public static TagComputer GetOrCreate(
             return tagComputer;
         }
 
-        private void DisconnectTagComputer()
-            => _subjectBuffer.Properties.RemoveProperty(s_uniqueKey);
-
         public event EventHandler<SnapshotSpanEventArgs>? TagsChanged;
 
         private (SolutionServices solutionServices, IClassificationService classificationService)? TryGetClassificationService(ITextSnapshot snapshot)
         {
-            var workspace = _workspace;
+            var document = snapshot.GetOpenDocumentInCurrentContextWithChanges();
+            var workspace = document?.Project.Solution.Workspace;
+
             var contentType = snapshot.ContentType;
             var lastCachedServices = _lastCachedServices;
 
@@ -158,45 +156,6 @@ private void DisconnectTagComputer()
             return (lastCachedServices.SolutionServices, lastCachedServices.ClassificationService);
         }
 
-        #region Workspace Hookup
-
-        private void OnWorkspaceRegistrationChanged(object? sender, EventArgs e)
-        {
-            var token = _taggerProvider._listener.BeginAsyncOperation(nameof(OnWorkspaceRegistrationChanged));
-            var task = SwitchToMainThreadAndHookupWorkspaceAsync();
-            task.CompletesAsyncOperation(token);
-        }
-
-        private async Task SwitchToMainThreadAndHookupWorkspaceAsync()
-        {
-            try
-            {
-                await _taggerProvider.ThreadingContext.JoinableTaskFactory.SwitchToMainThreadAsync(_disposalCancellationSource.Token);
-
-                // We both try to connect synchronously, and register for workspace registration events.
-                // It's possible (particularly in tests), to connect in the startup path, but then get a
-                // previously scheduled, but not yet delivered event.  Don't bother connecting to the
-                // same workspace again in that case.
-                var newWorkspace = _workspaceRegistration.Workspace;
-                if (newWorkspace == _workspace)
-                    return;
-
-                DisconnectFromWorkspace();
-
-                if (newWorkspace != null)
-                    ConnectToWorkspace(newWorkspace);
-            }
-            catch (OperationCanceledException)
-            {
-                // can happen if we were disposed of.
-            }
-            catch (Exception e) when (FatalError.ReportAndCatch(e))
-            {
-                // We were in a fire and forget task.  So just report the NFW and do not let
-                // this bleed out to an unhandled exception.
-            }
-        }
-
         internal void IncrementReferenceCount()
         {
             _taggerProvider.ThreadingContext.ThrowIfNotOnUIThread();
@@ -213,103 +172,16 @@ internal void DecrementReferenceCount()
                 // stop any bg work we're doing.
                 _disposalCancellationSource.Cancel();
 
-                _subjectBuffer.ChangedOnBackground -= this.OnSubjectBufferChanged;
+                _taggerEventSource.Changed -= OnEventSourceChanged;
+                _taggerEventSource.Disconnect();
 
-                DisconnectFromWorkspace();
-                _workspaceRegistration.WorkspaceChanged -= OnWorkspaceRegistrationChanged;
-                DisconnectTagComputer();
+                _subjectBuffer.Properties.RemoveProperty(s_uniqueKey);
+                _lastCachedServices = null;
             }
         }
 
-        private void ConnectToWorkspace(Workspace workspace)
-        {
-            _taggerProvider.ThreadingContext.ThrowIfNotOnUIThread();
-
-            _workspace = workspace;
-            _workspaceChangedDisposer = _workspace.RegisterWorkspaceChangedHandler(this.OnWorkspaceChanged);
-            _workspaceDocumentActiveContextChangedDisposer = _workspace.RegisterDocumentActiveContextChangedHandler(this.OnDocumentActiveContextChanged);
-
-            // Now that we've connected to the workspace, kick off work to reclassify this buffer.
-            _workQueue.AddWork(_subjectBuffer.CurrentSnapshot);
-        }
-
-        public void DisconnectFromWorkspace()
-        {
-            _taggerProvider.ThreadingContext.ThrowIfNotOnUIThread();
-            _lastCachedServices = null;
-
-            lock (_gate)
-            {
-                _lastProcessedData = null;
-            }
-
-            if (_workspace != null)
-            {
-                _workspaceChangedDisposer?.Dispose();
-                _workspaceChangedDisposer = null;
-
-                _workspaceDocumentActiveContextChangedDisposer?.Dispose();
-                _workspaceDocumentActiveContextChangedDisposer = null;
-
-                _workspace = null;
-
-                // Now that we've disconnected to the workspace, kick off work to reclassify this buffer.
-                _workQueue.AddWork(_subjectBuffer.CurrentSnapshot);
-            }
-        }
-
-        #endregion
-
-        #region Event Handling
-
-        private void OnSubjectBufferChanged(object? sender, TextContentChangedEventArgs args)
-        {
-            // we know a change to our buffer is always affecting this document.  So we can
-            // just enqueue the work to reclassify things unilaterally.
-            _workQueue.AddWork(args.After);
-        }
-
-        private void OnDocumentActiveContextChanged(DocumentActiveContextChangedEventArgs args)
-        {
-            if (_workspace == null)
-                return;
-
-            var documentId = args.NewActiveContextDocumentId;
-            var bufferDocumentId = _workspace.GetDocumentIdInCurrentContext(_subjectBuffer.AsTextContainer());
-            if (bufferDocumentId != documentId)
-                return;
-
-            _workQueue.AddWork(_subjectBuffer.CurrentSnapshot);
-        }
-
-        private void OnWorkspaceChanged(WorkspaceChangeEventArgs args)
-        {
-            // We may be getting an event for a workspace we already disconnected from.  If so,
-            // ignore them.  We won't be able to find the Document corresponding to our text buffer,
-            // so we can't reasonably classify this anyways.
-            var workspace = _workspace;
-            if (args.NewSolution.Workspace != workspace)
-                return;
-
-            if (args.Kind != WorkspaceChangeKind.ProjectChanged)
-                return;
-
-            var documentId = workspace.GetDocumentIdInCurrentContext(_subjectBuffer.AsTextContainer());
-            if (args.ProjectId != documentId?.ProjectId)
-                return;
-
-            var oldProject = args.OldSolution.GetProject(args.ProjectId);
-            var newProject = args.NewSolution.GetProject(args.ProjectId);
-
-            // In case of parse options change reclassify the doc as it may have affected things
-            // like preprocessor directives.
-            if (Equals(oldProject?.ParseOptions, newProject?.ParseOptions))
-                return;
-
-            _workQueue.AddWork(_subjectBuffer.CurrentSnapshot);
-        }
-
-        #endregion
+        private void OnEventSourceChanged(object? sender, EventArgs e)
+            => _workQueue.AddWork(_subjectBuffer.CurrentSnapshot);
 
         /// <summary>
         /// Parses the document in the background and determines what has changed to report to
@@ -416,7 +288,7 @@ public void AddTags(NormalizedSnapshotSpanCollection spans, SegmentedList<TagSpa
         private void AddTagsWorker(NormalizedSnapshotSpanCollection spans, SegmentedList<TagSpan<IClassificationTag>> tags)
         {
             _taggerProvider.ThreadingContext.ThrowIfNotOnUIThread();
-            if (spans.Count == 0 || _workspace == null)
+            if (spans.Count == 0)
                 return;
 
             var snapshot = spans[0].Snapshot;

src/EditorFeatures/Core/IntelliSense/ModelComputation.cs

@@ -146,8 +146,10 @@ public void ChainTaskAndNotifyControllerWhenFinished(
 
         async Task<TModel> TransformModelAsync(Task<TModel> lastTask)
         {
-            // Ensure we're on the BG before doing any model transformation work.
-            await TaskScheduler.Default;
+            // Ensure we're on the BG before doing any model transformation work. Also, ensure we yield so that we don't
+            // end up with an enormously long chain of tasks unwinding.  That can otherwise cause a stack overflow if
+            // this chain gets too long.
+            await Task.Yield().ConfigureAwait(false);
             var model = await lastTask.ConfigureAwait(false);
             return await transformModelAsync(model, _stopCancellationToken).ConfigureAwait(false);
         }

src/EditorFeatures/Core/LineSeparators/LineSeparatorTaggerProvider.cs

@@ -65,13 +65,10 @@ private void OnFormatMappingChanged(object sender, FormatItemsEventArgs e)
         }
     }
 
-    protected override ITaggerEventSource CreateEventSource(
-        ITextView? textView, ITextBuffer subjectBuffer)
-    {
-        return TaggerEventSources.Compose(
+    protected override ITaggerEventSource CreateEventSource(ITextView? textView, ITextBuffer subjectBuffer)
+        => TaggerEventSources.Compose(
             new EditorFormatMapChangedEventSource(_editorFormatMap),
             TaggerEventSources.OnTextChanged(subjectBuffer));
-    }
 
     protected override async Task ProduceTagsAsync(
         TaggerContext<LineSeparatorTag> context, DocumentSnapshotSpan documentSnapshotSpan, int? caretPosition, CancellationToken cancellationToken)

src/EditorFeatures/Core/Shared/Tagging/EventSources/TaggerEventSources.TextChangedEventSource.cs

@@ -19,10 +19,20 @@ public TextChangedEventSource(ITextBuffer subjectBuffer)
         }
 
         public override void Connect()
-            => _subjectBuffer.Changed += OnTextBufferChanged;
+        {
+            if (_subjectBuffer is ITextBuffer2 buffer2)
+                buffer2.ChangedOnBackground += OnTextBufferChanged;
+            else
+                _subjectBuffer.Changed += OnTextBufferChanged;
+        }
 
         public override void Disconnect()
-            => _subjectBuffer.Changed -= OnTextBufferChanged;
+        {
+            if (_subjectBuffer is ITextBuffer2 buffer2)
+                buffer2.ChangedOnBackground -= OnTextBufferChanged;
+            else
+                _subjectBuffer.Changed -= OnTextBufferChanged;
+        }
 
         private void OnTextBufferChanged(object? sender, TextContentChangedEventArgs e)
         {

src/LanguageServer/Protocol/Protocol/Internal/Converters/ImageElementConverter.cs

@@ -33,10 +33,7 @@ public override ImageElement Read(ref Utf8JsonReader reader, Type typeToConvert,
 
                 if (reader.TokenType == JsonTokenType.PropertyName)
                 {
-                    var valueLength = reader.HasValueSequence ? reader.ValueSequence.Length : reader.ValueSpan.Length;
-
-                    var propertyNameLength = valueLength <= scratchChars.Length ? reader.CopyString(scratchChars) : -1;
-                    var propertyName = propertyNameLength >= 0 ? scratchChars[..propertyNameLength] : reader.GetString().AsSpan();
+                    var propertyName = reader.GetStringSpan(scratchChars);
 
                     reader.Read();
                     switch (propertyName)
@@ -48,10 +45,9 @@ public override ImageElement Read(ref Utf8JsonReader reader, Type typeToConvert,
                             automationName = reader.GetString();
                             break;
                         case ObjectContentConverter.TypeProperty:
-                            var typePropertyLength = valueLength <= scratchChars.Length ? reader.CopyString(scratchChars) : -1;
-                            var typeProperty = typePropertyLength >= 0 ? scratchChars[..typePropertyLength] : reader.GetString().AsSpan();
+                            var typePropertyValue = reader.GetStringSpan(scratchChars);
 
-                            if (!typeProperty.SequenceEqual(nameof(ImageElement).AsSpan()))
+                            if (!typePropertyValue.SequenceEqual(nameof(ImageElement).AsSpan()))
                                 throw new JsonException($"Expected {ObjectContentConverter.TypeProperty} property value {nameof(ImageElement)}");
                             break;
                         default:

src/LanguageServer/Protocol/Protocol/Internal/Converters/ImageIdConverter.cs

@@ -34,10 +34,7 @@ public override ImageId Read(ref Utf8JsonReader reader, Type objectType, JsonSer
 
                 if (reader.TokenType == JsonTokenType.PropertyName)
                 {
-                    var valueLength = reader.HasValueSequence ? reader.ValueSequence.Length : reader.ValueSpan.Length;
-
-                    var propertyNameLength = valueLength <= scratchChars.Length ? reader.CopyString(scratchChars) : -1;
-                    var propertyName = propertyNameLength >= 0 ? scratchChars[..propertyNameLength] : reader.GetString().AsSpan();
+                    var propertyName = reader.GetStringSpan(scratchChars);
 
                     reader.Read();
                     switch (propertyName)
@@ -49,10 +46,9 @@ public override ImageId Read(ref Utf8JsonReader reader, Type objectType, JsonSer
                             id = reader.GetInt32();
                             break;
                         case ObjectContentConverter.TypeProperty:
-                            var typePropertyLength = valueLength <= scratchChars.Length ? reader.CopyString(scratchChars) : -1;
-                            var typeProperty = typePropertyLength >= 0 ? scratchChars[..typePropertyLength] : reader.GetString().AsSpan();
+                            var typePropertyValue = reader.GetStringSpan(scratchChars);
 
-                            if (!typeProperty.SequenceEqual(nameof(ImageId).AsSpan()))
+                            if (!typePropertyValue.SequenceEqual(nameof(ImageId).AsSpan()))
                                 throw new JsonException($"Expected {ObjectContentConverter.TypeProperty} property value {nameof(ImageId)}");
                             break;
                         default: