[main] Source code updates from dotnet/razor (#2764)

[main] Source code updates from dotnet/razor

Author: dotnet-maestro[bot]

src/razor/.github/workflows/copilot-setup-steps.yml

@@ -0,0 +1,49 @@
+name: "Copilot Setup Steps"
+
+# Allow testing of the setup steps from your repository's "Actions" tab.
+on: workflow_dispatch
+
+jobs:
+ # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
+ # See https://docs.github.com/en/copilot/customizing-copilot/customizing-the-development-environment-for-copilot-coding-agent
+ copilot-setup-steps:
+ runs-on: 8-core-ubuntu-latest
+
+ permissions:
+ contents: read
+
+ # You can define any steps you want, and they will run before the agent starts.
+ # If you do not check out your code, Copilot will do this for you.
+ steps:
+ - uses: actions/checkout@v5
+
+ # Install .NET SDK as specified in global.json
+ - name: Setup .NET
+ uses: actions/setup-dotnet@v5
+ with:
+ global-json-file: global.json
+
+ # Restore dependencies - this is critical for Copilot to understand the project structure
+ - name: Restore dependencies
+ continue-on-error: true
+ env:
+ # Prevent GitInfo errors and other CI-specific issues
+ CI: false
+ # Use restore script, but don't fail on errors so Copilot can still attempt to work
+ run: ./restore.sh
+
+ # Diagnostics in the log
+ - name: Show .NET info
+ run: dotnet --info
+
+ # Show build environment info that might be helpful for debugging
+ - name: Show environment info
+ run: |
+ echo "=== Git Status ==="
+ git status || true
+ echo "=== Directory structure ==="
+ ls -la
+ echo "=== Build artifacts ==="
+ ls -la artifacts/ || true
+ echo "=== Global.json ==="
+ cat global.json

src/razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/DirectiveAttributeCompletionItemProvider.cs

@@ -19,6 +19,11 @@ internal class DirectiveAttributeCompletionItemProvider : DirectiveAttributeComp
  private static ReadOnlyMemory<char> QuotedAttributeValueSnippet => "=\"$0\"".AsMemory();
  private static ReadOnlyMemory<char> UnquotedAttributeValueSnippet => "=$0".AsMemory();
 
+ private static readonly ImmutableArray<RazorCommitCharacter> EqualsCommitCharacters = [new("=")];
+ private static readonly ImmutableArray<RazorCommitCharacter> EqualsAndColonCommitCharacters = [new("="), new(":")];
+ private static readonly ImmutableArray<RazorCommitCharacter> SnippetEqualsCommitCharacters = [new("=", Insert: false)];
+ private static readonly ImmutableArray<RazorCommitCharacter> SnippetEqualsAndColonCommitCharacters = [new("=", Insert: false), new(":")];
+
  public override ImmutableArray<RazorCompletionItem> GetCompletionItems(RazorCompletionContext context)
  {
  if (!context.SyntaxTree.Options.FileKind.IsComponent())
@@ -83,7 +88,8 @@ internal static ImmutableArray<RazorCompletionItem> GetAttributeCompletions(
  }
 
  // Use ordinal dictionary because attributes are case sensitive when matching
- using var _ = StringDictionaryPool<(HashSet<BoundAttributeDescriptionInfo>, HashSet<string>)>.Ordinal.GetPooledObject(out var attributeCompletions);
+ using var _ = StringDictionaryPool<(ImmutableArray<BoundAttributeDescriptionInfo>, ImmutableArray<RazorCommitCharacter>)>.Ordinal.GetPooledObject(out var attributeCompletions);
+ var inSnippetContext = InSnippetContext(containingAttribute, razorCompletionOptions);
 
  foreach (var descriptor in descriptorsForTag)
  {
@@ -95,7 +101,7 @@ internal static ImmutableArray<RazorCompletionItem> GetAttributeCompletions(
  continue;
  }
 
- if (!TryAddCompletion(attributeDescriptor.Name, attributeDescriptor, descriptor, razorCompletionOptions) && attributeDescriptor.Parameters.Length > 0)
+ if (!TryAddCompletion(attributeDescriptor.Name, attributeDescriptor, descriptor, razorCompletionOptions, selectedAttributeName, attributes, inSnippetContext, attributeCompletions) && attributeDescriptor.Parameters.Length > 0)
  {
  // This attribute has parameters and the base attribute name (@bind) is already satisfied. We need to check if there are any valid
  // parameters left to be provided, if so, we need to still represent the base attribute name in the completion list.
@@ -105,15 +111,15 @@ internal static ImmutableArray<RazorCompletionItem> GetAttributeCompletions(
  if (!attributes.Any(name => TagHelperMatchingConventions.SatisfiesBoundAttributeWithParameter(parameterDescriptor, name, attributeDescriptor)))
  {
  // This bound attribute parameter has not had a completion entry added for it, re-represent the base attribute name in the completion list
- AddCompletion(attributeDescriptor.Name, attributeDescriptor, descriptor, razorCompletionOptions);
+ AddCompletion(attributeDescriptor.Name, attributeDescriptor, descriptor, razorCompletionOptions, inSnippetContext, attributeCompletions);
  break;
  }
  }
  }
 
  if (!attributeDescriptor.IndexerNamePrefix.IsNullOrEmpty())
  {
- TryAddCompletion(attributeDescriptor.IndexerNamePrefix + "...", attributeDescriptor, descriptor, razorCompletionOptions);
+ TryAddCompletion(attributeDescriptor.IndexerNamePrefix + "...", attributeDescriptor, descriptor, razorCompletionOptions, selectedAttributeName, attributes, inSnippetContext, attributeCompletions);
  }
  }
  }
@@ -142,62 +148,62 @@ internal static ImmutableArray<RazorCompletionItem> GetAttributeCompletions(
  else
  {
  // We are trying for snippet text only for non-indexer attributes, e.g. *not* something like "@bind-..."
- if (TryGetSnippetText(containingAttribute, insertTextSpan, razorCompletionOptions, out var snippetTextSpan))
+ if (inSnippetContext)
  {
- insertTextSpan = snippetTextSpan;
+ GetSnippetText(insertTextSpan, razorCompletionOptions, out insertTextSpan);
  isSnippet = true;
  }
  }
 
- // Don't create another string annecessarily, even thouth ReadOnlySpan.ToString() special-cases the string to avoid allocation
+ // Don't create another string unnecessarily, even though ReadOnlySpan.ToString() special-cases the string to avoid allocation
  var insertText = insertTextSpan == originalInsertTextSpan ? displayText : insertTextSpan.ToString();
 
- using var razorCommitCharacters = new PooledArrayBuilder<RazorCommitCharacter>(capacity: commitCharacters.Count);
-
- foreach (var c in commitCharacters)
- {
- razorCommitCharacters.Add(new(c));
- }
-
  var razorCompletionItem = RazorCompletionItem.CreateDirectiveAttribute(
  displayText,
  insertText,
- descriptionInfo: new([.. attributeDescriptions]),
- commitCharacters: razorCommitCharacters.ToImmutableAndClear(),
+ descriptionInfo: new(attributeDescriptions),
+ commitCharacters,
  isSnippet);
 
  completionItems.Add(razorCompletionItem);
  }
 
  return completionItems.ToImmutableAndClear();
 
- static bool TryGetSnippetText(
+ static bool InSnippetContext(
  RazorSyntaxNode owner,
- ReadOnlySpan<char> baseTextSpan,
- RazorCompletionOptions razorCompletionOptions,
- out ReadOnlySpan<char> snippetTextSpan)
+ RazorCompletionOptions razorCompletionOptions)
  {
- if (razorCompletionOptions.SnippetsSupported
+ return razorCompletionOptions.SnippetsSupported
  // Don't create snippet text when attribute is already in the tag and we are trying to replace it
  // Otherwise you could have something like @onabort=""=""
  && owner is not (MarkupTagHelperDirectiveAttributeSyntax or MarkupAttributeBlockSyntax)
- && owner.Parent is not (MarkupTagHelperDirectiveAttributeSyntax or MarkupAttributeBlockSyntax))
- {
- var suffixTextSpan = razorCompletionOptions.AutoInsertAttributeQuotes ? QuotedAttributeValueSnippet : UnquotedAttributeValueSnippet;
+ && owner.Parent is not (MarkupTagHelperDirectiveAttributeSyntax or MarkupAttributeBlockSyntax);
+ }
 
- var buffer = new char[baseTextSpan.Length + suffixTextSpan.Length];
- baseTextSpan.CopyTo(buffer);
- suffixTextSpan.CopyTo(buffer.AsMemory()[baseTextSpan.Length..]);
+ static void GetSnippetText(
+ ReadOnlySpan<char> baseTextSpan,
+ RazorCompletionOptions razorCompletionOptions,
+ out ReadOnlySpan<char> snippetTextSpan)
+ {
+ var suffixTextSpan = razorCompletionOptions.AutoInsertAttributeQuotes ? QuotedAttributeValueSnippet : UnquotedAttributeValueSnippet;
 
-  snippetTextSpan = buffer.AsSpan();
-  return true;
- }
+ var buffer = new char[baseTextSpan.Length + suffixTextSpan.Length];
+ baseTextSpan.CopyTo(buffer);
+ suffixTextSpan.CopyTo(buffer.AsMemory()[baseTextSpan.Length..]);
 
- snippetTextSpan = [];
- return false;
+ snippetTextSpan = buffer.AsSpan();
  }
 
- bool TryAddCompletion(string attributeName, BoundAttributeDescriptor boundAttributeDescriptor, TagHelperDescriptor tagHelperDescriptor, RazorCompletionOptions razorCompletionOptions)
+ static bool TryAddCompletion(
+ string attributeName,
+ BoundAttributeDescriptor boundAttributeDescriptor,
+ TagHelperDescriptor tagHelperDescriptor,
+ RazorCompletionOptions razorCompletionOptions,
+ string selectedAttributeName,
+ ImmutableArray<string> attributes,
+ bool inSnippetContext,
+ Dictionary<string, (ImmutableArray<BoundAttributeDescriptionInfo>, ImmutableArray<RazorCommitCharacter>)> attributeCompletions)
  {
  if (selectedAttributeName != attributeName &&
  attributes.Any(attributeName, static (name, attributeName) => name == attributeName))
@@ -207,60 +213,85 @@ bool TryAddCompletion(string attributeName, BoundAttributeDescriptor boundAttrib
  return false;
  }
 
- AddCompletion(attributeName, boundAttributeDescriptor, tagHelperDescriptor, razorCompletionOptions);
+ AddCompletion(attributeName, boundAttributeDescriptor, tagHelperDescriptor, razorCompletionOptions, inSnippetContext, attributeCompletions);
  return true;
  }
 
- void AddCompletion(string attributeName, BoundAttributeDescriptor boundAttributeDescriptor, TagHelperDescriptor tagHelperDescriptor, RazorCompletionOptions razorCompletionOptions)
+ static void AddCompletion(
+ string attributeName,
+ BoundAttributeDescriptor boundAttributeDescriptor,
+ TagHelperDescriptor tagHelperDescriptor,
+ RazorCompletionOptions razorCompletionOptions,
+ bool inSnippetContext,
+ Dictionary<string, (ImmutableArray<BoundAttributeDescriptionInfo>, ImmutableArray<RazorCommitCharacter>)> attributeCompletions)
  {
  if (!attributeCompletions.TryGetValue(attributeName, out var attributeDetails))
  {
  attributeDetails = ([], []);
- attributeCompletions[attributeName] = attributeDetails;
  }
 
  (var attributeDescriptions, var commitCharacters) = attributeDetails;
 
  var indexerCompletion = attributeName.EndsWith("...", StringComparison.Ordinal);
  var tagHelperTypeName = tagHelperDescriptor.TypeName;
  var descriptionInfo = BoundAttributeDescriptionInfo.From(boundAttributeDescriptor, isIndexer: indexerCompletion, tagHelperTypeName);
- attributeDescriptions.Add(descriptionInfo);
 
- if (indexerCompletion)
+ if (!attributeDescriptions.Contains(descriptionInfo))
  {
- // Indexer attribute, we don't want to commit with standard chars
- return;
+ attributeDescriptions = attributeDescriptions.Add(descriptionInfo);
  }
 
- if (!razorCompletionOptions.UseVsCodeCompletionCommitCharacters)
+ // Verify not an indexer attribute, as those don't commit with standard chars
+ if (!indexerCompletion)
  {
- // We don't add "=" as a commit character when using VSCode trigger characters.
- commitCharacters.Add("=");
- }
+ var equalsAdded = commitCharacters.Any(static c => c.Character == "=");
+ var spaceAdded = commitCharacters.Any(static c => c.Character == " ");
+  var colonAdded = commitCharacters.Any(static c => c.Character == ":");
 
- var spaceAdded = commitCharacters.Contains(" ");
- var colonAdded = commitCharacters.Contains(":");
+  // We don't add "=" as a commit character when using VSCode trigger characters.
+  equalsAdded |= !razorCompletionOptions.UseVsCodeCompletionCommitCharacters;
 
- if (!spaceAdded || !colonAdded)
- {
  foreach (var boundAttribute in tagHelperDescriptor.BoundAttributes)
  {
- if (!spaceAdded && boundAttribute.IsBooleanProperty)
+ spaceAdded |= boundAttribute.IsBooleanProperty;
+ colonAdded |= boundAttribute.Parameters.Length > 0;
+
+ if (spaceAdded && colonAdded)
+ {
+ break;
+ }
+ }
+
+ // Determine if we have a common commit character set
+ commitCharacters = (equalsAdded, spaceAdded, colonAdded, inSnippetContext) switch
+ {
+ (true, false, false, false) => EqualsCommitCharacters,
+ (true, false, true, false) => EqualsAndColonCommitCharacters,
+ (true, false, false, true) => SnippetEqualsCommitCharacters,
+ (true, false, true, true) => SnippetEqualsAndColonCommitCharacters,
+ _ => []
+ };
+
+ if (commitCharacters.IsEmpty)
+ {
+ if (equalsAdded)
  {
- commitCharacters.Add(" ");
- spaceAdded = true;
+ commitCharacters = commitCharacters.Add(new("=", Insert: !inSnippetContext));
  }
- else if (!colonAdded && boundAttribute.Parameters.Length > 0)
+
+ if (spaceAdded)
  {
- commitCharacters.Add(":");
- colonAdded = true;
+ commitCharacters = commitCharacters.Add(new(" "));
  }
- else if (spaceAdded && colonAdded)
+
+ if (colonAdded)
  {
- break;
+ commitCharacters = commitCharacters.Add(new(":"));
  }
  }
  }
+
+ attributeCompletions[attributeName] = (attributeDescriptions, commitCharacters);
  }
  }
 }

src/razor/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Logging/MemoryLoggerProvider.Buffer.cs renamed to src/razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Logging/AbstractMemoryLoggerProvider.Buffer.cs

@@ -4,9 +4,9 @@
 using System;
 using System.Threading;
 
-namespace Microsoft.VisualStudio.Razor.Logging;
+namespace Microsoft.CodeAnalysis.Razor.Logging;
 
-internal partial class MemoryLoggerProvider
+internal partial class AbstractMemoryLoggerProvider
 {
  /// <summary>
  /// A circular in memory buffer to store logs in memory.

src/razor/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Logging/MemoryLoggerProvider.Logger.cs renamed to src/razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Logging/AbstractMemoryLoggerProvider.Logger.cs

@@ -2,11 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using Microsoft.CodeAnalysis.Razor.Logging;
 
-namespace Microsoft.VisualStudio.Razor.Logging;
+namespace Microsoft.CodeAnalysis.Razor.Logging;
 
-internal partial class MemoryLoggerProvider
+internal partial class AbstractMemoryLoggerProvider
 {
  private class Logger(Buffer buffer, string categoryName) : ILogger
  {

src/razor/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Logging/AbstractMemoryLoggerProvider.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.CodeAnalysis.Razor.Logging;
+
+internal abstract partial class AbstractMemoryLoggerProvider : ILoggerProvider
+{
+ // How many messages will the buffer contain
+ private const int BufferSize = 5000;
+ private readonly Buffer _buffer = new(BufferSize);
+
+ public ILogger CreateLogger(string categoryName)
+ => new Logger(_buffer, categoryName);
+}

src/razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Logging/MemoryLoggerProvider.cs

@@ -0,0 +1,10 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis.Razor.Logging;
+
+namespace Microsoft.CodeAnalysis.Remote.Razor.Logging;
+
+internal sealed class MemoryLoggerProvider : AbstractMemoryLoggerProvider
+{
+}

src/razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Logging/TraceSourceLoggerFactory.cs

@@ -6,7 +6,10 @@
 
 namespace Microsoft.CodeAnalysis.Remote.Razor.Logging;
 
-internal sealed partial class TraceSourceLoggerFactory(TraceSource traceSource) : AbstractLoggerFactory([new LoggerProvider(traceSource)])
+internal sealed partial class TraceSourceLoggerFactory(TraceSource traceSource)
+ : AbstractLoggerFactory([
+ new LoggerProvider(traceSource),
+ new MemoryLoggerProvider()])
 {
  public TraceSource TraceSource { get; } = traceSource;
 }