Merge pull request #54052 from dotnet/merges/main-to-main-vs-deps

Merge main to main-vs-deps

docs/Language Feature Status.md

@@ -18,7 +18,7 @@ efforts behind them.
 | [Parameterless struct constructors](https://github.com/dotnet/csharplang/issues/99) | [struct-ctors](https://github.com/dotnet/roslyn/tree/features/struct-ctors) | [In Progress](https://github.com/dotnet/roslyn/issues/51698) | [cston](https://github.com/cston) | [jcouv](https://github.com/jcouv), [333fred](https://github.com/333fred) | [jcouv](https://github.com/jouv) |
 | [Lambda improvements](https://github.com/dotnet/csharplang/blob/main/proposals/lambda-improvements.md) | [lambdas](https://github.com/dotnet/roslyn/tree/features/lambdas) | [In Progress](https://github.com/dotnet/roslyn/issues/52192) | [cston](https://github.com/cston) | [333fred](https://github.com/333fred), [jcouv](https://github.com/jcouv) | [jaredpar](https://github.com/jaredpar) |
 | [nameof(parameter)](https://github.com/dotnet/csharplang/issues/373) | main | [In Progress](https://github.com/dotnet/roslyn/issues/40524) | [jcouv](https://github.com/jcouv) | TBD | [jcouv](https://github.com/jcouv) |
-| [Improved Definite Assignment](https://github.com/dotnet/csharplang/issues/4465) | [improved-definite-assignment](https://github.com/dotnet/roslyn/tree/features/improved-definite-assignment) | [In Progress](https://github.com/dotnet/roslyn/issues/51463) | [RikkiGibson](https://github.com/RikkiGibson) | [jcouv](https://github.com/jcouv) | [jaredpar](https://github.com/jaredpar) |
+| [Improved Definite Assignment](https://github.com/dotnet/csharplang/issues/4465) | [improved-definite-assignment](https://github.com/dotnet/roslyn/tree/features/improved-definite-assignment) | [Merged into 17.0](https://github.com/dotnet/roslyn/issues/51463) | [RikkiGibson](https://github.com/RikkiGibson) | [jcouv](https://github.com/jcouv) | [jaredpar](https://github.com/jaredpar) |
 | [Relax ordering of `ref` and `partial` modifiers](https://github.com/dotnet/csharplang/issues/946) | [ref-partial](https://github.com/dotnet/roslyn/tree/features/ref-partial) | In Progress | [alrz](https://github.com/alrz) | [gafter](https://github.com/gafter) | [jcouv](https://github.com/jcouv) |
 | [Parameter null-checking](https://github.com/dotnet/csharplang/issues/2145) | [param-nullchecking](https://github.com/dotnet/roslyn/tree/features/param-nullchecking) | [In Progress](https://github.com/dotnet/roslyn/issues/36024) | [fayrose](https://github.com/fayrose) | [agocke](https://github.com/agocke) | [jaredpar](https://github.com/jaredpar) |
 | [Caller expression attribute](https://github.com/dotnet/csharplang/issues/287) | [caller-argument-expression](https://github.com/dotnet/roslyn/tree/features/caller-argument-expression) | [In Progress](https://github.com/dotnet/roslyn/issues/52745) | [Youssef1313](https://github.com/Youssef1313) | [333fred](https://github.com/333fred),[AlekseyTs](https://github.com/AlekseyTs) | [jcouv](https://github.com/jcouv) |

src/EditorFeatures/Test/EditAndContinue/Helpers/MockDiagnosticAnalyzerService.cs

@@ -40,7 +40,7 @@ public Task<ImmutableArray<DiagnosticData>> GetDiagnosticsAsync(Solution solutio
  public Task<ImmutableArray<DiagnosticData>> GetDiagnosticsForIdsAsync(Solution solution, ProjectId? projectId = null, DocumentId? documentId = null, ImmutableHashSet<string>? diagnosticIds = null, bool includeSuppressedDiagnostics = false, CancellationToken cancellationToken = default)
  => throw new NotImplementedException();
 
- public Task<ImmutableArray<DiagnosticData>> GetDiagnosticsForSpanAsync(Document document, TextSpan range, string? diagnosticIdOpt = null, bool includeSuppressedDiagnostics = false, Func<string, IDisposable?>? addOperationScope = null, CancellationToken cancellationToken = default)
+ public Task<ImmutableArray<DiagnosticData>> GetDiagnosticsForSpanAsync(Document document, TextSpan? range, string? diagnosticId = null, bool includeSuppressedDiagnostics = false, Func<string, IDisposable?>? addOperationScope = null, CancellationToken cancellationToken = default)
  => throw new NotImplementedException();
 
  public Task<ImmutableArray<DiagnosticData>> GetProjectDiagnosticsForIdsAsync(Solution solution, ProjectId? projectId = null, ImmutableHashSet<string>? diagnosticIds = null, bool includeSuppressedDiagnostics = false, CancellationToken cancellationToken = default)

src/Features/Core/Portable/CodeFixes/CodeFixService.cs

@@ -164,7 +164,7 @@ public async Task<ImmutableArray<CodeFixCollection>> GetFixesAsync(Document docu
  // invariant: later code gathers & runs CodeFixProviders for diagnostics with one identical diagnostics span (that gets set later as CodeFixCollection's TextSpan)
  // order diagnostics by span.
  SortedDictionary<TextSpan, List<DiagnosticData>>? aggregatedDiagnostics = null;
- foreach (var diagnostic in await _diagnosticService.GetDiagnosticsForSpanAsync(document, range, diagnosticIdOpt: null, includeConfigurationFixes, addOperationScope, cancellationToken).ConfigureAwait(false))
+ foreach (var diagnostic in await _diagnosticService.GetDiagnosticsForSpanAsync(document, range, diagnosticId: null, includeConfigurationFixes, addOperationScope, cancellationToken).ConfigureAwait(false))
  {
  if (diagnostic.IsSuppressed)
  {

src/Features/Core/Portable/Diagnostics/DiagnosticAnalyzerService.cs

@@ -75,7 +75,8 @@ public Task<bool> TryAppendDiagnosticsForSpanAsync(Document document, TextSpan r
  return SpecializedTasks.False;
  }
 
- public Task<ImmutableArray<DiagnosticData>> GetDiagnosticsForSpanAsync(Document document, TextSpan range, string? diagnosticId = null, bool includeSuppressedDiagnostics = false, Func<string, IDisposable?>? addOperationScope = null, CancellationToken cancellationToken = default)
+ public Task<ImmutableArray<DiagnosticData>> GetDiagnosticsForSpanAsync(
+ Document document, TextSpan? range, string? diagnosticId = null, bool includeSuppressedDiagnostics = false, Func<string, IDisposable?>? addOperationScope = null, CancellationToken cancellationToken = default)
  {
  if (_map.TryGetValue(document.Project.Solution.Workspace, out var analyzer))
  {

src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer_GetDiagnosticsForSpan.cs

@@ -19,13 +19,15 @@ namespace Microsoft.CodeAnalysis.Diagnostics.EngineV2
 {
  internal partial class DiagnosticIncrementalAnalyzer
  {
- public async Task<bool> TryAppendDiagnosticsForSpanAsync(Document document, TextSpan range, ArrayBuilder<DiagnosticData> result, string? diagnosticId, bool includeSuppressedDiagnostics, bool blockForData, Func<string, IDisposable?>? addOperationScope, CancellationToken cancellationToken)
+ public async Task<bool> TryAppendDiagnosticsForSpanAsync(
+ Document document, TextSpan? range, ArrayBuilder<DiagnosticData> result, string? diagnosticId, bool includeSuppressedDiagnostics, bool blockForData, Func<string, IDisposable?>? addOperationScope, CancellationToken cancellationToken)
  {
  var getter = await LatestDiagnosticsForSpanGetter.CreateAsync(this, document, range, blockForData, addOperationScope, includeSuppressedDiagnostics, diagnosticId, cancellationToken).ConfigureAwait(false);
  return await getter.TryGetAsync(result, cancellationToken).ConfigureAwait(false);
  }
 
- public async Task<ImmutableArray<DiagnosticData>> GetDiagnosticsForSpanAsync(Document document, TextSpan range, string? diagnosticId, bool includeSuppressedDiagnostics, bool blockForData, Func<string, IDisposable?>? addOperationScope, CancellationToken cancellationToken)
+ public async Task<ImmutableArray<DiagnosticData>> GetDiagnosticsForSpanAsync(
+ Document document, TextSpan? range, string? diagnosticId, bool includeSuppressedDiagnostics, bool blockForData, Func<string, IDisposable?>? addOperationScope, CancellationToken cancellationToken)
  {
  using var _ = ArrayBuilder<DiagnosticData>.GetInstance(out var list);
  var result = await TryAppendDiagnosticsForSpanAsync(document, range, list, diagnosticId, includeSuppressedDiagnostics, blockForData, addOperationScope, cancellationToken).ConfigureAwait(false);
@@ -44,7 +46,7 @@ private sealed class LatestDiagnosticsForSpanGetter
  private readonly IEnumerable<StateSet> _stateSets;
  private readonly CompilationWithAnalyzers? _compilationWithAnalyzers;
 
- private readonly TextSpan _range;
+ private readonly TextSpan? _range;
  private readonly bool _blockForData;
  private readonly bool _includeSuppressedDiagnostics;
  private readonly string? _diagnosticId;
@@ -55,7 +57,7 @@ private sealed class LatestDiagnosticsForSpanGetter
  public static async Task<LatestDiagnosticsForSpanGetter> CreateAsync(
  DiagnosticIncrementalAnalyzer owner,
  Document document,
- TextSpan range,
+ TextSpan? range,
  bool blockForData,
  Func<string, IDisposable?>? addOperationScope,
  bool includeSuppressedDiagnostics,
@@ -73,7 +75,8 @@ public static async Task<LatestDiagnosticsForSpanGetter> CreateAsync(
 
  var compilationWithAnalyzers = await CreateCompilationWithAnalyzersAsync(document.Project, stateSets, includeSuppressedDiagnostics, cancellationToken).ConfigureAwait(false);
 
- return new LatestDiagnosticsForSpanGetter(owner, compilationWithAnalyzers, document, stateSets, diagnosticId, range, blockForData, addOperationScope, includeSuppressedDiagnostics);
+ return new LatestDiagnosticsForSpanGetter(
+ owner, compilationWithAnalyzers, document, stateSets, diagnosticId, range, blockForData, addOperationScope, includeSuppressedDiagnostics);
  }
 
  private LatestDiagnosticsForSpanGetter(
@@ -82,7 +85,7 @@ private LatestDiagnosticsForSpanGetter(
  Document document,
  IEnumerable<StateSet> stateSets,
  string? diagnosticId,
- TextSpan range,
+ TextSpan? range,
  bool blockForData,
  Func<string, IDisposable?>? addOperationScope,
  bool includeSuppressedDiagnostics)
@@ -211,7 +214,8 @@ private async Task ComputeDocumentDiagnosticsAsync(
 
  private bool ShouldInclude(DiagnosticData diagnostic)
  {
- return diagnostic.DocumentId == _document.Id && _range.IntersectsWith(diagnostic.GetTextSpan())
+ return diagnostic.DocumentId == _document.Id &&
+ (_range == null || _range.Value.IntersectsWith(diagnostic.GetTextSpan()))
  && (_includeSuppressedDiagnostics || !diagnostic.IsSuppressed)
  && (_diagnosticId == null || _diagnosticId == diagnostic.Id);
  }

src/Features/Core/Portable/Diagnostics/IDiagnosticAnalyzerService.cs

@@ -72,10 +72,14 @@ internal interface IDiagnosticAnalyzerService
 
  /// <summary>
  /// Return up to date diagnostics for the given span for the document
- ///
- /// This can be expensive since it is force analyzing diagnostics if it doesn't have up-to-date one yet.
- /// If diagnosticIdOpt is not null, it gets diagnostics only for this given diagnosticIdOpt value
+ /// <para>
+ /// This can be expensive since it is force analyzing diagnostics if it doesn't have up-to-date one yet. If
+ /// <paramref name="diagnosticId"/> is not null, it gets diagnostics only for this given <paramref
+ /// name="diagnosticId"/> value.
+ /// </para>
  /// </summary>
- Task<ImmutableArray<DiagnosticData>> GetDiagnosticsForSpanAsync(Document document, TextSpan range, string? diagnosticIdOpt = null, bool includeSuppressedDiagnostics = false, Func<string, IDisposable?>? addOperationScope = null, CancellationToken cancellationToken = default);
+ /// <param name="range">The span of the document to get diagnostics for. If null, diagnostics for the entire
+ /// document should be returned.</param>
+ Task<ImmutableArray<DiagnosticData>> GetDiagnosticsForSpanAsync(Document document, TextSpan? range, string? diagnosticId = null, bool includeSuppressedDiagnostics = false, Func<string, IDisposable?>? addOperationScope = null, CancellationToken cancellationToken = default);
  }
 }

src/Features/Core/Portable/UnifiedSuggestions/UnifiedSuggestedActionsSource.cs

@@ -38,10 +38,8 @@ public static async ValueTask<ImmutableArray<UnifiedSuggestedActionSet>> GetFilt
  Func<string, IDisposable?> addOperationScope,
  CancellationToken cancellationToken)
  {
- // It may seem strange that we kick off a task, but then immediately 'Wait' on 
- // it. However, it's deliberate. We want to make sure that the code runs on 
- // the background so that no one takes an accidentally dependency on running on 
- // the UI thread.
+ // Intentionally switch to a threadpool thread to compute fixes. We do not want to accidentally
+ // run any of this on the UI thread and potentially allow any code to take a dependency on that.
  var fixes = await Task.Run(() => codeFixService.GetFixesAsync(
  document, selection, includeSuppressionFixes: true, isBlocking, addOperationScope, cancellationToken), cancellationToken).ConfigureAwait(false);
 

src/Features/LanguageServer/Protocol/Handler/Diagnostics/DocumentPullDiagnosticHandler.cs

@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 
 namespace Microsoft.CodeAnalysis.LanguageServer.Handler.Diagnostics
@@ -83,7 +84,7 @@ protected override Task<ImmutableArray<DiagnosticData>> GetDiagnosticsAsync(
  // we're passing in. If information is already cached for that snapshot, it will be returned. Otherwise,
  // it will be computed on demand. Because it is always accurate as per this snapshot, all spans are correct
  // and do not need to be adjusted.
- return _analyzerService.GetDiagnosticsAsync(document.Project.Solution, documentId: document.Id, cancellationToken: cancellationToken);
+ return _analyzerService.GetDiagnosticsForSpanAsync(document, range: null, cancellationToken: cancellationToken);
  }
  }
 }

src/Tools/ExternalAccess/Razor/IRazorDocumentOptionsService.cs

@@ -8,7 +8,7 @@
 
 namespace Microsoft.CodeAnalysis.ExternalAccess.Razor
 {
- internal interface IRazorDocumentOptionsService : IDocumentService
+ internal interface IRazorDocumentOptionsService
  {
  Task<IRazorDocumentOptions> GetOptionsForDocumentAsync(Document document, CancellationToken cancellationToken);
  }

src/VisualStudio/Core/Test/Diagnostics/ExternalDiagnosticUpdateSourceTests.vb

@@ -512,7 +512,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Diagnostics
  Public Sub Reanalyze(workspace As Workspace, Optional projectIds As IEnumerable(Of ProjectId) = Nothing, Optional documentIds As IEnumerable(Of DocumentId) = Nothing, Optional highPriority As Boolean = False) Implements IDiagnosticAnalyzerService.Reanalyze
  End Sub
 
- Public Function GetDiagnosticsForSpanAsync(document As Document, range As TextSpan, Optional diagnosticId As String = Nothing, Optional includeSuppressedDiagnostics As Boolean = False, Optional addOperationScope As Func(Of String, IDisposable) = Nothing, Optional cancellationToken As CancellationToken = Nothing) As Task(Of ImmutableArray(Of DiagnosticData)) Implements IDiagnosticAnalyzerService.GetDiagnosticsForSpanAsync
+ Public Function GetDiagnosticsForSpanAsync(document As Document, range As TextSpan?, Optional diagnosticId As String = Nothing, Optional includeSuppressedDiagnostics As Boolean = False, Optional addOperationScope As Func(Of String, IDisposable) = Nothing, Optional cancellationToken As CancellationToken = Nothing) As Task(Of ImmutableArray(Of DiagnosticData)) Implements IDiagnosticAnalyzerService.GetDiagnosticsForSpanAsync
  Return SpecializedTasks.EmptyImmutableArray(Of DiagnosticData)
  End Function