add missing property in params

Author: maryamariyan

src/razor/src/extension.ts

@@ -99,13 +99,7 @@ export async function activate(
                 languageServiceClient,
                 logger
             );
-            const semanticTokenHandler = new SemanticTokensRangeHandler(
-                documentSynchronizer,
-                languageServerClient,
-                languageServiceClient,
-                documentManager,
-                logger
-            );
+            const semanticTokenHandler = new SemanticTokensRangeHandler(languageServerClient);
             const colorPresentationHandler = new ColorPresentationHandler(
                 documentManager,
                 languageServerClient,

src/razor/src/semantic/semanticTokensRangeHandler.ts

@@ -8,10 +8,6 @@ import { RequestType } from 'vscode-languageclient';
 import { RazorLanguageServerClient } from '../razorLanguageServerClient';
 import { ProvideSemanticTokensResponse } from './provideSemanticTokensResponse';
 import { SerializableSemanticTokensParams } from './serializableSemanticTokensParams';
-import { RazorDocumentSynchronizer } from '../document/razorDocumentSynchronizer';
-import { RazorDocumentManager } from '../document/razorDocumentManager';
-import { RazorLanguageServiceClient } from '../razorLanguageServiceClient';
-import { RazorLogger } from '../razorLogger';
 
 export class SemanticTokensRangeHandler {
     private static readonly getSemanticTokensRangeEndpoint = 'razor/provideSemanticTokensRange';
@@ -20,18 +16,9 @@ export class SemanticTokensRangeHandler {
         ProvideSemanticTokensResponse,
         any
     > = new RequestType(SemanticTokensRangeHandler.getSemanticTokensRangeEndpoint);
-    private emptySemanticTokensResponse: ProvideSemanticTokensResponse = new ProvideSemanticTokensResponse(
-        new Array<Array<number>>(),
-        -1
-    );
+    private emptyTokensInResponse: Array<Array<number>> = new Array<Array<number>>();
 
-    constructor(
-        private readonly documentSynchronizer: RazorDocumentSynchronizer,
-        protected readonly serverClient: RazorLanguageServerClient,
-        protected readonly serviceClient: RazorLanguageServiceClient,
-        protected readonly documentManager: RazorDocumentManager,
-        protected readonly logger: RazorLogger
-    ) {}
+    constructor(private readonly serverClient: RazorLanguageServerClient) {}
 
     public async register() {
         await this.serverClient.onRequestWithParams<
@@ -49,33 +36,13 @@ export class SemanticTokensRangeHandler {
         _semanticTokensParams: SerializableSemanticTokensParams,
         _cancellationToken: vscode.CancellationToken
     ): Promise<ProvideSemanticTokensResponse> {
-        let version = -1;
-        try {
-            const razorDocumentUri = vscode.Uri.parse(_semanticTokensParams.textDocument.uri);
-            const razorDocument = await this.documentManager.getDocument(razorDocumentUri);
-            if (razorDocument === undefined) {
-                return this.emptySemanticTokensResponse;
-            }
-
-            const textDocument = await vscode.workspace.openTextDocument(razorDocumentUri);
-            version = textDocument.version;
-            const synchronized = await this.documentSynchronizer.trySynchronizeProjectedDocument(
-                textDocument,
-                razorDocument.csharpDocument,
-                version,
-                _cancellationToken
-            );
-            if (!synchronized) {
-                return this.emptySemanticTokensResponse;
-            }
-        } catch (error) {
-            this.logger.logWarning(`${SemanticTokensRangeHandler.getSemanticTokensRangeEndpoint} failed with ${error}`);
-        }
-
         // This is currently a no-op since (1) the default C# semantic tokens experience is already powerful and
         // (2) there seems to be an issue with the semantic tokens execute command - possibly either O# not
         // returning tokens, or an issue with the command itself:
         // https://github.com/dotnet/razor/issues/6922
-        return new ProvideSemanticTokensResponse(new Array<Array<number>>(), version);
+        return new ProvideSemanticTokensResponse(
+            this.emptyTokensInResponse,
+            _semanticTokensParams.requiredHostDocumentVersion
+        );
     }
 }

src/razor/src/semantic/serializableSemanticTokensParams.ts

@@ -7,6 +7,8 @@ import { SerializableRange } from '../rpc/serializableRange';
 import { SerializableTextDocumentIdentifier } from '../rpc/serializableTextDocumentIdentifier';
 
 export interface SerializableSemanticTokensParams {
+    correlationId: string;
     textDocument: SerializableTextDocumentIdentifier;
     ranges: SerializableRange[];
+    requiredHostDocumentVersion: number;
 }