[automated] Merge branch 'main' => 'prerelease' (#8066)

Author: dotnet-policy-service[bot]

CHANGELOG.md

@@ -3,6 +3,15 @@
 - Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
+# 2.70.x
+* Bump razor to 9.0.0-preview.25161.2 (PR: [#8058](https://github.com/dotnet/vscode-csharp/pull/8058))
+  * Move VS Code To Pull Diagnostics (#11602) (PR: [#11602](https://github.com/dotnet/razor/pull/11602))
+  * Upgrade to net9 (#11535) (PR: [#11535](https://github.com/dotnet/razor/pull/11535))
+  * Cleanup CompletionTriggerAndCommitCharacters (#11600) (PR: [#11600](https://github.com/dotnet/razor/pull/11600))
+  * Add constraints to CaptureParameters method (#11530) (PR: [#11530](https://github.com/dotnet/razor/pull/11530))
+  * [FUSE] Layout mapping (#11567) (PR: [#11567](https://github.com/dotnet/razor/pull/11567))
+* Bump xamlTools to 17.14.35913.250 (PR: [#8062](https://github.com/dotnet/vscode-csharp/pull/8062))
+
 # 2.69.x
 * Bump razor to 9.0.0-preview.25156.2 (PR: [#8047](https://github.com/dotnet/vscode-csharp/pull/8047))
   * Enable FUSE by default

azure-pipelines.yml

@@ -18,6 +18,7 @@ pr:
     exclude:
     - ./*.md 
     - .github/*
+    - azure-pipelines/release.yml
 
 # Run a scheduled build every night on main to run tests against insiders VSCode.
 # The variable testVSCodeVersion is set to insiders based on the build reason.

azure-pipelines/release.yml

@@ -51,6 +51,27 @@ extends:
           runOnce:
             deploy:
               steps:
+              - pwsh: |
+                  $artifactVersion = '$(resources.pipeline.officialBuildCI.runName)'
+                  $artifactBranchName = '$(resources.pipeline.officialBuildCI.sourceBranch)' -replace 'refs/heads/',''
+                  
+                  # Set the BuildNumber in the form `# Publish prerelease v2.69.22 #` to improve readability in AzDO
+                  $buildNumberName = "Publish $artifactBranchName $artifactVersion"
+                  if ('${{ parameters.test }}' -eq 'true') {
+                    $buildNumberName = 'Test ' + $buildNumberName
+                  }
+
+                  # Replace invalid characters
+                  $buildNumberName = $buildNumberName -replace '["/:<>\|?@*]','_'
+                  # Maximum buildnumber length is 255 chars and we are going to add a prefix and suffix so ensure we have space.
+                  if ($buildNumberName.Length -GT 252) {
+                    $buildNumberName = $buildNumberName.Substring(0, 252)
+                  }
+                  # Avoid ever ending the BuildNumber with a `.` by always appending to it.
+                  $buildNumberName = ' ' + $buildNumberName + ' #'
+
+                  Write-Host "##vso[build.updatebuildnumber]$buildNumberName"
+                displayName: Set BuildNumber
               - template: /azure-pipelines/install-node.yml@self
               - pwsh: |
                   npm install --global @vscode/vsce
@@ -113,6 +134,7 @@ extends:
                       Write-Host "##[command]vsce $publishArgs"
                       vsce @publishArgs
                     }
+
     - stage: 'TagRelease'
       displayName: 'Tag release of vscode-csharp'
       dependsOn: 'PublishStage'

package.json

@@ -39,9 +39,9 @@
   "defaults": {
     "roslyn": "4.14.0-3.25156.1",
     "omniSharp": "1.39.12",
-    "razor": "9.0.0-preview.25156.2",
+    "razor": "9.0.0-preview.25161.2",
     "razorOmnisharp": "7.0.0-preview.23363.1",
-    "xamlTools": "17.14.35904.287"
+    "xamlTools": "17.14.35913.250"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",

src/razor/src/diagnostics/razorDiagnosticHandler.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { DocumentDiagnosticReport, DocumentDiagnosticParams, RequestType } from 'vscode-languageserver-protocol';
+import { DocumentDiagnosticParams, DocumentDiagnosticReport, RequestType } from 'vscode-languageserver-protocol';
 import { RazorLanguageServerClient } from '../razorLanguageServerClient';
 import { RazorDocumentManager } from '../document/razorDocumentManager';
 import { UriConverter } from '../../../lsptoolshost/utils/uriConverter';
@@ -13,14 +13,15 @@ import { RazorLanguageFeatureBase } from '../razorLanguageFeatureBase';
 import { RazorDocumentSynchronizer } from '../document/razorDocumentSynchronizer';
 import { RazorLogger } from '../razorLogger';
 import { roslynPullDiagnosticCommand } from '../../../lsptoolshost/razor/razorCommands';
+import { SerializableTextDocumentIdentifierAndVersion } from '../simplify/serializableTextDocumentIdentifierAndVersion';
 
 export class RazorDiagnosticHandler extends RazorLanguageFeatureBase {
     private static readonly razorPullDiagnosticsCommand = 'razor/csharpPullDiagnostics';
-    private diagnosticRequestType: RequestType<DocumentDiagnosticParams, DocumentDiagnosticReport, any> =
+    private diagnosticRequestType: RequestType<DelegatedDiagnosticParams, DocumentDiagnosticReport, any> =
         new RequestType(RazorDiagnosticHandler.razorPullDiagnosticsCommand);
 
     constructor(
-        documentSynchronizer: RazorDocumentSynchronizer,
+        protected readonly documentSynchronizer: RazorDocumentSynchronizer,
         protected readonly serverClient: RazorLanguageServerClient,
         protected readonly serviceClient: RazorLanguageServiceClient,
         protected readonly documentManager: RazorDocumentManager,
@@ -31,31 +32,55 @@ export class RazorDiagnosticHandler extends RazorLanguageFeatureBase {
 
     public async register() {
         await this.serverClient.onRequestWithParams<
-            DocumentDiagnosticParams,
+            DelegatedDiagnosticParams,
             DocumentDiagnosticReport | undefined,
             any
-        >(this.diagnosticRequestType, async (request: DocumentDiagnosticParams, token: vscode.CancellationToken) =>
+        >(this.diagnosticRequestType, async (request: DelegatedDiagnosticParams, token: vscode.CancellationToken) =>
             this.getDiagnostic(request, token)
         );
     }
 
     private async getDiagnostic(
-        request: DocumentDiagnosticParams,
-        _: vscode.CancellationToken
+        request: DelegatedDiagnosticParams,
+        token: vscode.CancellationToken
     ): Promise<DocumentDiagnosticReport | undefined> {
         if (!this.documentManager.roslynActivated) {
             return undefined;
         }
 
-        const razorDocumentUri = vscode.Uri.parse(request.textDocument.uri, true);
+        const razorDocumentUri = vscode.Uri.parse(request.identifier.textDocumentIdentifier.uri, true);
+        const textDocument = await vscode.workspace.openTextDocument(razorDocumentUri);
         const razorDocument = await this.documentManager.getDocument(razorDocumentUri);
+
+        const synchronized = await this.documentSynchronizer.trySynchronizeProjectedDocument(
+            textDocument,
+            razorDocument.csharpDocument,
+            request.identifier.version,
+            token
+        );
+
+        if (!synchronized) {
+            return undefined;
+        }
+
         const virtualCSharpUri = razorDocument.csharpDocument.uri;
-        request.textDocument.uri = UriConverter.serialize(virtualCSharpUri);
+
+        const roslynRequest: DocumentDiagnosticParams = {
+            textDocument: {
+                uri: UriConverter.serialize(virtualCSharpUri),
+            },
+        };
+
         const response: DocumentDiagnosticReport = await vscode.commands.executeCommand(
             roslynPullDiagnosticCommand,
-            request
+            roslynRequest
         );
 
         return response;
     }
 }
+
+interface DelegatedDiagnosticParams {
+    identifier: SerializableTextDocumentIdentifierAndVersion;
+    correlationId: string;
+}

src/razor/src/razorLanguageFeatureBase.ts

@@ -14,7 +14,7 @@ import { getUriPath } from './uriPaths';
 
 export class RazorLanguageFeatureBase {
     constructor(
-        private readonly documentSynchronizer: RazorDocumentSynchronizer,
+        protected readonly documentSynchronizer: RazorDocumentSynchronizer,
         protected readonly documentManager: RazorDocumentManager,
         protected readonly serviceClient: RazorLanguageServiceClient,
         protected readonly logger: RazorLogger

version.json

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