Merge remote-tracking branch 'upstream/feature/net8' into InsertRazorNet8

Author: davidwengier

CHANGELOG.md

@@ -4,9 +4,19 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 ## Latest
-* Update Roslyn to run on .NET 8 (PR: [#6840](https://github.com/dotnet/vscode-csharp/pull/6840))
+* Update Roslyn to run on .NET 8 (PR: [#<>](https://github.com/dotnet/vscode-csharp/pull/<>))
+  * Upgrade language server to run on .NET 8 (PR: [#72247](https://github.com/dotnet/roslyn/pull/72247))
+  * Refactors LSP server extension assembly loading (PR: [#71862](https://github.com/dotnet/roslyn/pull/71862))
+  * Report better warnings and errors if build hosts exit abnormally (PR: [#71909](https://github.com/dotnet/roslyn/pull/71909))
+
+## 2.19.13
+* Fix `Attribute` snippet (PR: [#6879](https://github.com/dotnet/vscode-csharp/pull/6879))
+* Add grammar support for new Razor directives: rendermode, preservewhitespace and typeparam (PR: [#6887](https://github.com/dotnet/vscode-csharp/pull/6887))
+* Ensure failures to connect to the named pipe are propagated (PR: [#6881](https://github.com/dotnet/vscode-csharp/pull/6881))
 * Update Razor to 7.0.0-preview.24079.3 (PR: [#6841](https://github.com/dotnet/vscode-csharp/pull/6841))
   * Fix an issue with component hover not showing enough information (PR: [dotnet/razor#9862](https://github.com/dotnet/razor/pull/9862))
+
+# 2.18.15
 * Fix regression in override completion (PR: [#6869](https://github.com/dotnet/vscode-csharp/pull/6869))
 * Update debugger to 2.18.0 release (PR: [#6853](https://github.com/dotnet/vscode-csharp/pull/6853))
 

package.json

@@ -37,7 +37,7 @@
     }
   },
   "defaults": {
-    "roslyn": "4.10.0-2.24105.1",
+    "roslyn": "4.10.0-2.24124.2",
     "omniSharp": "1.39.11",
     "razor": "7.0.0-preview.24123.5",
     "razorOmnisharp": "7.0.0-preview.23363.1",

src/lsptoolshost/commands.ts

@@ -31,8 +31,8 @@ export function registerCommands(
     context.subscriptions.push(
         vscode.commands.registerCommand(
             'roslyn.client.completionComplexEdit',
-            async (uriStr, textEdit, isSnippetString, newOffset) =>
-                completionComplexEdit(uriStr, textEdit, isSnippetString, newOffset, outputChannel)
+            async (textDocument, textEdit, isSnippetString, newOffset) =>
+                completionComplexEdit(textDocument, textEdit, isSnippetString, newOffset, outputChannel)
         )
     );
     context.subscriptions.push(
@@ -97,7 +97,7 @@ async function restartServer(languageServer: RoslynLanguageServer): Promise<void
  * @param newPosition The offset for new cursor position. -1 if the edit has not specified one.
  */
 async function completionComplexEdit(
-    uriStr: string,
+    textDocument: languageClient.TextDocumentIdentifier,
     textEdit: vscode.TextEdit,
     isSnippetString: boolean,
     newOffset: number,
@@ -106,18 +106,21 @@ async function completionComplexEdit(
     const componentName = '[roslyn.client.completionComplexEdit]';
 
     // Find TextDocument, opening if needed.
-    const uri = UriConverter.deserialize(uriStr);
+    const uri = UriConverter.deserialize(textDocument.uri);
     const document = await vscode.workspace.openTextDocument(uri);
     if (document === undefined) {
-        outputAndThrow(outputChannel, `${componentName} Can't open document with path: '${uriStr}'`);
+        outputAndThrow(outputChannel, `${componentName} Can't open document with path: '${textDocument.uri}'`);
     }
 
     // Use editor if we need to deal with selection or snippets.
     let editor: vscode.TextEditor | undefined = undefined;
     if (isSnippetString || newOffset >= 0) {
         editor = await vscode.window.showTextDocument(document);
         if (editor === undefined) {
-            outputAndThrow(outputChannel, `${componentName} Editor unavailable for document with path: '${uriStr}'`);
+            outputAndThrow(
+                outputChannel,
+                `${componentName} Editor unavailable for document with path: '${textDocument.uri}'`
+            );
         }
     }