Merge pull request #7432 from dotnet/merge/main-to-prerelease

[automated] Merge branch 'main' => 'prerelease'

Author: dibarbet

CHANGELOG.md

@@ -4,13 +4,17 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # Latest
-* Bump Roslyn to 4.12.0-2.24401.2 (PR: [#7413](https://github.com/dotnet/vscode-csharp/pull/7413))
+* Bump Roslyn to 4.12.0-2.24408.4 (PR: [#7429](https://github.com/dotnet/vscode-csharp/pull/7429))
   * Reduce allocations in SyntaxEquivalence.AreEquivalent by using a more appropriate pooling mechanism for the stack it uses to walk trees. (PR: [#74610](https://github.com/dotnet/roslyn/pull/74610))
   * Reduce allocations in SyntaxNodeExtensions.GetMembers to instead execute a given lambda over the collection. (PR: [#74628](https://github.com/dotnet/roslyn/pull/74628))
   * Modify ISyntaxFacts methods to allocate less (PR: [#74596](https://github.com/dotnet/roslyn/pull/74596))
   * Fix cases where unused private members were not grayed out (PR: [#74589](https://github.com/dotnet/roslyn/pull/74589))
   * Fix URI handling when comparing encoded and unencoded URIs (PR: [#74544](https://github.com/dotnet/roslyn/pull/74544))
-* Bump xamltools to 17.12.35131.21 (PR: [#7409](https://github.com/dotnet/vscode-csharp/pull/7409))
+  * Only report project load events for initial load in VSCode (PR: [#74688](https://github.com/dotnet/roslyn/pull/74688))
+  * Reduce allocations in AbstractSymbolCompletionProvider.CreateItems (PR: [#74670](https://github.com/dotnet/roslyn/pull/74670))
+* Bump xamltools to 17.12.35209.18 (PR: [#7428](https://github.com/dotnet/vscode-csharp/pull/7428))
+* Task 2187810: [VS Code] Add OnEnter rules to indent tags (PR: [#7426](https://github.com/dotnet/vscode-csharp/pull/7426))
+* Fix completion handler bug that causes language server to crash (#7401) (PR: [#7406](https://github.com/dotnet/vscode-csharp/pull/7406))
 
 # 2.41.x
 * Bump Roslyn to 4.12.0-1.24376.3 (PR: [#7393](https://github.com/dotnet/vscode-csharp/pull/7393))

l10n/bundle.l10n.json

@@ -191,6 +191,7 @@
   "Unexpected message received from debugger.": "Unexpected message received from debugger.",
   "[ERROR]: C# Extension failed to install the debugger package.": "[ERROR]: C# Extension failed to install the debugger package.",
   "Could not find a process id to attach.": "Could not find a process id to attach.",
+  "Unable to launch Attach to Process dialog: ": "Unable to launch Attach to Process dialog: ",
   "[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'": "[ERROR] The debugger cannot be installed. The debugger is not supported on '{0}'",
   "[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.": "[ERROR] The debugger cannot be installed. The debugger requires macOS 12 (Monterey) or newer.",
   "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.": "[WARNING]: x86 Windows is not supported by the .NET debugger. Debugging will not be available.",

package.json

@@ -37,11 +37,11 @@
     }
   },
   "defaults": {
-    "roslyn": "4.12.0-2.24407.3",
+    "roslyn": "4.12.0-2.24408.4",
     "omniSharp": "1.39.11",
     "razor": "9.0.0-preview.24366.2",
     "razorOmnisharp": "7.0.0-preview.23363.1",
-    "xamlTools": "17.12.35131.21"
+    "xamlTools": "17.12.35209.18"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",
@@ -5575,4 +5575,4 @@
       }
     ]
   }
-}
+}

src/coreclrDebug/activate.ts

@@ -26,7 +26,8 @@ export async function activate(
     context: vscode.ExtensionContext,
     platformInformation: PlatformInformation,
     eventStream: EventStream,
-    csharpOutputChannel: vscode.OutputChannel
+    csharpOutputChannel: vscode.OutputChannel,
+    languageServerStartedPromise: Promise<any> | undefined
 ) {
     const disposables = new CompositeDisposable();
 
@@ -66,6 +67,19 @@ export async function activate(
     // Register a command to fire attach to process for the coreclr debug engine.
     disposables.add(
         vscode.commands.registerCommand('csharp.attachToProcess', async () => {
+            // Ensure dotnetWorkspaceConfigurationProvider is registered
+            if (languageServerStartedPromise) {
+                try {
+                    await languageServerStartedPromise;
+                } catch (e: any) {
+                    if (e as Error) {
+                        throw new Error(vscode.l10n.t('Unable to launch Attach to Process dialog: ') + e.message);
+                    } else {
+                        throw e;
+                    }
+                }
+            }
+
             vscode.debug.startDebugging(
                 undefined,
                 {

src/main.ts

@@ -323,7 +323,8 @@ export async function activate(
             context,
             platformInfo,
             eventStream,
-            csharpChannel
+            csharpChannel,
+            roslynLanguageServerStartedPromise ?? omnisharpLangServicePromise
         );
     }
 

src/xaml/language-configuration.json

@@ -55,5 +55,20 @@
 	},
 	"wordPattern": {
 		"pattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\@\\#\\$\\%\\^\\&\\*\\(\\)\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\?\\s]+)"
-	}
+	},
+  "onEnterRules": [
+    {
+      "beforeText": "^\\s*(<([A-Za-z0-9_.-]+)([^/>]*(?!/)>)[^<]*)(?!.*<\\/\\2>)$",
+      "afterText": "^\\s*<\\/([A-Za-z0-9_.-]+)[^>]*>$",
+      "action": {
+        "indent": "indentOutdent"
+      }
+    },
+    {
+      "beforeText": "^\\s*(<([A-Za-z0-9_.-]+)[^</]*)$",
+      "action": {
+        "indent": "indent"
+      }
+    },
+  ]
 }

version.json

@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "2.42",
+    "version": "2.43",
     "publicReleaseRefSpec": [
         "^refs/heads/release$",
         "^refs/heads/prerelease$",