Merge branch 'main' into dev/jorobich/update-roslyn-4.14.0-3.25178.1

dibarbet · web-flow · commit edf04019afdb · 2025-03-28T16:23:23.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ out
 .razoromnisharp/
 .razortelemetry/
 .razorDevKit/
+.razorExtension/
 .vscode-test/
 msbuild/signing/signJs/*.log
 msbuild/signing/signVsix/*.log
diff --git a/.vscodeignore b/.vscodeignore
@@ -7,6 +7,7 @@
 !.razor/**
 !.razorDevKit/**
 !.razoromnisharp/**
+!.razorExtension/**
 .rpt2_cache/**
 .config/**
 .devcontainer/**
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -82,7 +82,7 @@ The server DLL is typically at `$roslynRepoRoot/artifacts/bin/Microsoft.CodeAnal
 1. Clone the [Razor repository](https://github.com/dotnet/razor). This repository contains the Razor server implementation.
 2. Follow the build instructions provided in the repository.
 
-The server DLL is typically at `$razorRepoRoot/artifacts/bin/rzls/Debug/net8.0`.
+The server DLL is typically at `$razorRepoRoot/artifacts/bin/rzls/Debug/net9.0`.
 
 ### Debugging Local Language Servers
 
@@ -135,7 +135,7 @@ In your workspace settings.json file, add the following lines:
 
 ```json
 "razor.languageServer.debug": true,
-"razor.languageServer.directory": "<razorRepoRoot>/artifacts/bin/rzls/Debug/net8.0",
+"razor.languageServer.directory": "<razorRepoRoot>/artifacts/bin/rzls/Debug/net9.0",
 "razor.server.trace": "Debug"
 ```
 
diff --git a/azure-pipelines/dotnet-variables.yml b/azure-pipelines/dotnet-variables.yml
@@ -1,3 +1,3 @@
 variables:
 - name: defaultDotnetVersion
-  value: '8.0.403'
+  value: '9.0.202'
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
   "defaults": {
     "roslyn": "4.14.0-3.25178.1",
     "omniSharp": "1.39.12",
-    "razor": "9.0.0-preview.25161.2",
+    "razor": "9.0.0-preview.25177.4",
     "razorOmnisharp": "7.0.0-preview.23363.1",
     "xamlTools": "17.14.35927.264"
   },
diff --git a/src/lsptoolshost/extensions/builtInComponents.ts b/src/lsptoolshost/extensions/builtInComponents.ts
@@ -32,6 +32,11 @@ export const componentInfo: { [key: string]: ComponentInfo } = {
         optionName: 'razorDevKit',
         componentDllPaths: ['Microsoft.VisualStudio.DevKit.Razor.dll'],
     },
+    razorExtension: {
+        defaultFolderName: '.razorExtension',
+        optionName: 'razorExtension',
+        componentDllPaths: ['Microsoft.VisualStudioCode.RazorExtension.dll'],
+    },
 };
 
 export function getComponentPaths(componentName: string, options: LanguageServerOptions | undefined): string[] {
diff --git a/src/lsptoolshost/server/roslynLanguageServer.ts b/src/lsptoolshost/server/roslynLanguageServer.ts
@@ -619,6 +619,10 @@ export class RoslynLanguageServer {
             path.join(razorPath, 'Targets', 'Microsoft.NET.Sdk.Razor.DesignTime.targets')
         );
 
+        getComponentPaths('razorExtension', languageServerOptions).forEach((path) =>
+            additionalExtensionPaths.push(path)
+        );
+
         // Get the brokered service pipe name from C# Dev Kit (if installed).
         // We explicitly call this in the LSP server start action instead of awaiting it
         // in our activation because C# Dev Kit depends on C# activation completing.
@@ -966,6 +970,7 @@ export class RoslynLanguageServer {
                 additionalExtensionPaths.push(path)
             );
         }
+
         return args;
     }
 
diff --git a/src/razor/src/dynamicFile/dynamicFileInfoHandler.ts b/src/razor/src/dynamicFile/dynamicFileInfoHandler.ts
@@ -8,13 +8,14 @@ import { UriConverter } from '../../../lsptoolshost/utils/uriConverter';
 import { RazorDocumentManager } from '../document/razorDocumentManager';
 import { RazorLogger } from '../razorLogger';
 import { ProvideDynamicFileParams } from './provideDynamicFileParams';
-import { ProvideDynamicFileResponse, DynamicFileUpdate } from './provideDynamicFileResponse';
+import { ProvideDynamicFileResponse } from './provideDynamicFileResponse';
 import { RemoveDynamicFileParams } from './removeDynamicFileParams';
 import { CSharpProjectedDocument } from '../csharp/csharpProjectedDocument';
 import { RazorDocumentChangeKind } from '../document/razorDocumentChangeKind';
 import { RazorDynamicFileChangedParams } from './dynamicFileUpdatedParams';
 import { TextDocumentIdentifier } from 'vscode-languageserver-protocol';
-import { ServerTextChange } from '../rpc/serverTextChange';
+import { razorTextChange } from './razorTextChange';
+import { razorTextSpan } from './razorTextSpan';
 
 // Handles Razor generated doc communication between the Roslyn workspace and Razor.
 // didChange behavior for Razor generated docs is handled in the RazorDocumentManager.
@@ -75,19 +76,11 @@ export class DynamicFileInfoHandler {
             if (request.fullText) {
                 // The server asked for a full replace so the newtext is the important
                 // thing here, the span doesn't matter.
-                const change: ServerTextChange = {
-                    newText: razorDocument.csharpDocument.getContent(),
-                    span: {
-                        start: 0,
-                        length: 0,
-                    },
-                };
-
-                const update = new DynamicFileUpdate([change]);
+                const change = new razorTextChange(razorDocument.csharpDocument.getContent(), new razorTextSpan(0, 0));
 
                 return new ProvideDynamicFileResponse(
                     request.razorDocument,
-                    [update],
+                    [change],
                     csharpDocument.checksum,
                     csharpDocument.checksumAlgorithm,
                     csharpDocument.encodingCodePage
@@ -99,22 +92,18 @@ export class DynamicFileInfoHandler {
             if (this.documentManager.isRazorDocumentOpenInCSharpWorkspace(vscodeUri)) {
                 // Open documents have didOpen/didChange to update the csharp buffer. Razor
                 // does not send edits and instead lets vscode handle them.
-                return new ProvideDynamicFileResponse(
-                    { uri: virtualCsharpUri },
-                    null,
-                    csharpDocument.checksum,
-                    csharpDocument.checksumAlgorithm,
-                    csharpDocument.encodingCodePage
-                );
+                return null;
             } else {
                 // Closed documents provide edits since the last time they were requested since
                 // there is no open buffer in vscode corresponding to the csharp content.
                 const response = csharpDocument.applyEdits();
-                const updates = response.edits?.map((e) => new DynamicFileUpdate(e.changes)) ?? null;
+                const updates = response.edits?.flatMap((e) =>
+                    e.changes.map((c) => new razorTextChange(c.newText, new razorTextSpan(c.span.start, c.span.length)))
+                );
 
                 return new ProvideDynamicFileResponse(
                     { uri: virtualCsharpUri },
-                    updates,
+                    updates ?? [],
                     response.originalChecksum,
                     response.originalChecksumAlgorithm,
                     response.originalEncodingCodePage
diff --git a/src/razor/src/dynamicFile/provideDynamicFileResponse.ts b/src/razor/src/dynamicFile/provideDynamicFileResponse.ts
@@ -5,12 +5,13 @@
 
 import { TextDocumentIdentifier } from 'vscode-languageserver-protocol';
 import { ServerTextChange } from '../rpc/serverTextChange';
+import { razorTextChange } from './razorTextChange';
 
 // matches https://github.com/dotnet/roslyn/blob/9e91ca6590450e66e0041ee3135bbf044ac0687a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/RazorDynamicFileInfoProvider.cs#L28
 export class ProvideDynamicFileResponse {
     constructor(
         public readonly csharpDocument: TextDocumentIdentifier | null,
-        public readonly updates: DynamicFileUpdate[] | null,
+        public readonly edits: razorTextChange[],
         public readonly checksum: string,
         public readonly checksumAlgorithm: number,
         public readonly encodingCodePage: number | null
diff --git a/src/razor/src/dynamicFile/razorTextChange.ts b/src/razor/src/dynamicFile/razorTextChange.ts
@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { razorTextSpan } from './razorTextSpan';
+
+export class razorTextChange {
+    constructor(public readonly newText: string | null, public readonly span: razorTextSpan) {}
+}
diff --git a/src/razor/src/dynamicFile/razorTextSpan.ts b/src/razor/src/dynamicFile/razorTextSpan.ts
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export class razorTextSpan {
+    constructor(public readonly start: number, public readonly length: number) {}
+}
diff --git a/tasks/offlinePackagingTasks.ts b/tasks/offlinePackagingTasks.ts
@@ -27,6 +27,7 @@ import {
     xamlToolsDirectory,
     razorLanguageServerDirectory,
     razorDevKitDirectory,
+    razorExtensionDirectory,
 } from '../tasks/projectPaths';
 import { getPackageJSON } from '../tasks/packageJson';
 import { createPackageAsync, generateVsixManifest } from '../tasks/vsceTasks';
@@ -98,6 +99,12 @@ export const allNugetPackages: { [key: string]: NugetPackageInfo } = {
         getPackageContentPath: (_platformInfo) => 'content',
         vsixOutputPath: razorDevKitDirectory,
     },
+    razorExtension: {
+        getPackageName: (_platformInfo) => 'Microsoft.VisualStudioCode.RazorExtension',
+        packageJsonName: 'razor',
+        getPackageContentPath: (_platformInfo) => 'content',
+        vsixOutputPath: razorExtensionDirectory,
+    },
 };
 
 const vsixTasks: string[] = [];
@@ -185,6 +192,9 @@ gulp.task(
 
         // Also pull in the Razor DevKit dependencies nuget package.
         await acquireNugetPackage(allNugetPackages.razorDevKit, undefined, getPackageJSON(), true);
+
+        // Pull in the .razorExtension code that gets loaded in the roslyn language server
+        await acquireNugetPackage(allNugetPackages.razorExtension, undefined, getPackageJSON(), true);
     }, 'installDependencies')
 );
 
diff --git a/tasks/projectPaths.ts b/tasks/projectPaths.ts
@@ -20,6 +20,7 @@ export const devKitDependenciesDirectory = path.join(rootPath, componentInfo.ros
 export const xamlToolsDirectory = path.join(rootPath, componentInfo.xamlTools.defaultFolderName);
 export const razorLanguageServerDirectory = path.join(rootPath, '.razor');
 export const razorDevKitDirectory = path.join(rootPath, componentInfo.razorDevKit.defaultFolderName);
+export const razorExtensionDirectory = path.join(rootPath, componentInfo.razorExtension.defaultFolderName);
 
 export const codeExtensionPath = commandLineOptions.codeExtensionPath || rootPath;
 
diff --git a/tasks/testHelpers.ts b/tasks/testHelpers.ts
@@ -125,14 +125,12 @@ export async function runJestIntegrationTest(
         }
 
         return result;
-    } catch (err) {
-        // If we hit an error, copy the logs VSCode produced to a directory that CI can find.
+    } finally {
+        // Copy the logs VSCode produced to a directory that CI can find.
         const vscodeLogs = path.join(userDataDir, 'logs');
         const logOutputPath = path.join(outPath, 'logs', logName);
         console.log(`Copying logs from ${vscodeLogs} to ${logOutputPath}`);
         fs.cpSync(vscodeLogs, logOutputPath, { recursive: true, force: true });
-
-        throw err;
     }
 }
 
diff --git a/test/vscodeLauncher.ts b/test/vscodeLauncher.ts
@@ -32,7 +32,7 @@ export async function prepareVSCodeAndExecuteTests(
     const extensionsToInstall = [
         'ms-dotnettools.vscode-dotnet-runtime',
         'ms-dotnettools.csharp',
-        'ms-dotnettools.csdevkit@1.16.6',
+        'ms-dotnettools.csdevkit',
     ];
 
     await installExtensions(extensionsToInstall, cli, args);
