Use correct checksum values. Use base64 checksum

Author: Andrew Hall

src/razor/src/csharp/csharpProjectedDocument.ts

@@ -19,9 +19,9 @@ export class CSharpProjectedDocument implements IProjectedDocument {
     private resolveProvisionalEditAt: number | undefined;
     private ProvisionalDotPosition: Position | undefined;
     private hostDocumentVersion: number | null = null;
-    private updates: Update[] | null = null;
-    private _checksum: Uint8Array = new Uint8Array();
-    private _checksumAlgorithm: number = 0;
+    private updates: CSharpDocumentUpdate[] | null = null;
+    private _checksum: string = '';
+    private _checksumAlgorithm: number = 1; // Default to Sha1
     private _encodingCodePage: number | null = null;
 
     public constructor(public readonly uri: vscode.Uri) {
@@ -36,7 +36,11 @@ export class CSharpProjectedDocument implements IProjectedDocument {
         return this.content.length;
     }
 
-    public get checksum(): Uint8Array {
+    public clear() {
+        this.setContent('');
+    }
+
+    public get checksum(): string {
         return this._checksum;
     }
 
@@ -48,15 +52,11 @@ export class CSharpProjectedDocument implements IProjectedDocument {
         return this._encodingCodePage;
     }
 
-    public clear() {
-        this.setContent('');
-    }
-
     public update(
         hostDocumentIsOpen: boolean,
         edits: ServerTextChange[],
         hostDocumentVersion: number,
-        checksum: Uint8Array,
+        checksum: string,
         checksumAlgorithm: number,
         encodingCodePage: number | null
     ) {
@@ -73,35 +73,45 @@ export class CSharpProjectedDocument implements IProjectedDocument {
             }
 
             this.updateContent(edits);
+            this._checksum = checksum;
+            this._checksumAlgorithm = checksumAlgorithm;
+            this._encodingCodePage = encodingCodePage;
         } else {
+            const update = new CSharpDocumentUpdate(edits, checksum, checksumAlgorithm, encodingCodePage);
+
             if (this.updates) {
-                this.updates = this.updates.concat(new Update(edits));
+                this.updates = this.updates.concat(update);
             } else {
-                this.updates = [new Update(edits)];
+                this.updates = [update];
             }
         }
 
-        this._checksum = checksum;
-        this._checksumAlgorithm = checksumAlgorithm;
-        this._encodingCodePage = encodingCodePage;
         this.hostDocumentVersion = hostDocumentVersion;
     }
 
-    public getAndApplyEdits() {
+    public applyEdits(): ApplyEditsResponse {
         const updates = this.updates;
         this.updates = null;
 
+        const originalChecksum = this._checksum;
+        const originalChecksumAlgorithm = this._checksumAlgorithm;
+        const originalEncodingCodePage = this._encodingCodePage;
+
         if (updates) {
-            let changes: ServerTextChange[] = [];
             for (const update of updates) {
                 this.updateContent(update.changes);
-                changes = changes.concat(update.changes);
+                this._checksum = update.checksum;
+                this._checksumAlgorithm = update.checksumAlgorithm;
+                this._encodingCodePage = update.encodingCodePage;
             }
-
-            return changes;
         }
 
-        return null;
+        return {
+            edits: updates,
+            originalChecksum: originalChecksum,
+            originalChecksumAlgorithm: originalChecksumAlgorithm,
+            originalEncodingCodePage: originalEncodingCodePage,
+        };
     }
 
     public getContent() {
@@ -216,6 +226,18 @@ export class CSharpProjectedDocument implements IProjectedDocument {
     }
 }
 
-class Update {
-    constructor(public readonly changes: ServerTextChange[]) {}
+export class CSharpDocumentUpdate {
+    constructor(
+        public readonly changes: ServerTextChange[],
+        public readonly checksum: string,
+        public readonly checksumAlgorithm: number,
+        public readonly encodingCodePage: number | null
+    ) {}
+}
+
+export interface ApplyEditsResponse {
+    edits: CSharpDocumentUpdate[] | null;
+    originalChecksum: string;
+    originalChecksumAlgorithm: number;
+    originalEncodingCodePage: number | null;
 }

src/razor/src/document/razorDocumentManager.ts

@@ -308,13 +308,7 @@ export class RazorDocumentManager implements IRazorDocumentManager {
                 htmlProjectedDocument.clear();
             }
 
-            htmlProjectedDocument.update(
-                updateBufferRequest.changes,
-                updateBufferRequest.hostDocumentVersion,
-                updateBufferRequest.checksum,
-                updateBufferRequest.checksumAlgorithm,
-                updateBufferRequest.encodingCodePage
-            );
+            htmlProjectedDocument.update(updateBufferRequest.changes, updateBufferRequest.hostDocumentVersion);
 
             this.notifyDocumentChange(document, RazorDocumentChangeKind.htmlChanged);
         } else {

src/razor/src/dynamicFile/dynamicFileInfoHandler.ts

@@ -14,6 +14,7 @@ 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';
 
 // Handles Razor generated doc communication between the Roslyn workspace and Razor.
 // didChange behavior for Razor generated docs is handled in the RazorDocumentManager.
@@ -70,6 +71,27 @@ export class DynamicFileInfoHandler {
                 return null;
             }
 
+            const csharpDocument = razorDocument.csharpDocument as CSharpProjectedDocument;
+            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,
+                    },
+                };
+
+                return new ProvideDynamicFileResponse(
+                    request.razorDocument,
+                    [change],
+                    csharpDocument.checksum,
+                    csharpDocument.checksumAlgorithm,
+                    csharpDocument.encodingCodePage
+                );
+            }
+
             const virtualCsharpUri = UriConverter.serialize(razorDocument.csharpDocument.uri);
 
             if (this.documentManager.isRazorDocumentOpenInCSharpWorkspace(vscodeUri)) {
@@ -78,22 +100,22 @@ export class DynamicFileInfoHandler {
                 return new ProvideDynamicFileResponse(
                     { uri: virtualCsharpUri },
                     null,
-                    razorDocument.csharpDocument.checksum,
-                    razorDocument.csharpDocument.checksumAlgorithm,
-                    razorDocument.csharpDocument.encodingCodePage
+                    csharpDocument.checksum,
+                    csharpDocument.checksumAlgorithm,
+                    csharpDocument.encodingCodePage
                 );
             } 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 csharpDocument = razorDocument.csharpDocument as CSharpProjectedDocument;
-                const edits = csharpDocument.getAndApplyEdits();
+                const response = csharpDocument.applyEdits();
+                const changes = response.edits?.map((e) => e.changes).reduce((a, b) => a.concat(b)) ?? null;
 
                 return new ProvideDynamicFileResponse(
                     { uri: virtualCsharpUri },
-                    edits ?? null,
-                    razorDocument.csharpDocument.checksum,
-                    razorDocument.csharpDocument.checksumAlgorithm,
-                    razorDocument.csharpDocument.encodingCodePage
+                    changes,
+                    response.originalChecksum,
+                    response.originalChecksumAlgorithm,
+                    response.originalEncodingCodePage
                 );
             }
         } catch (error) {

src/razor/src/dynamicFile/provideDynamicFileParams.ts

@@ -7,5 +7,5 @@ import { TextDocumentIdentifier } from 'vscode-languageserver-protocol';
 
 // matches https://github.com/dotnet/roslyn/blob/9e91ca6590450e66e0041ee3135bbf044ac0687a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/RazorDynamicFileInfoProvider.cs#L22
 export class ProvideDynamicFileParams {
-    constructor(public readonly razorDocument: TextDocumentIdentifier) {}
+    constructor(public readonly razorDocument: TextDocumentIdentifier, public readonly fullText: boolean) {}
 }

src/razor/src/dynamicFile/provideDynamicFileResponse.ts

@@ -11,7 +11,7 @@ export class ProvideDynamicFileResponse {
     constructor(
         public readonly csharpDocument: TextDocumentIdentifier | null,
         public readonly edits: ServerTextChange[] | null,
-        public readonly checksum: Uint8Array,
+        public readonly checksum: string,
         public readonly checksumAlgorithm: number,
         public readonly encodingCodePage: number | null
     ) {}

src/razor/src/html/htmlProjectedDocument.ts

@@ -12,9 +12,6 @@ export class HtmlProjectedDocument implements IProjectedDocument {
     public readonly path: string;
     private content = '';
     private hostDocumentVersion: number | null = null;
-    private _checksum: Uint8Array = new Uint8Array();
-    private _checksumAlgorithm: number = 0;
-    private _encodingCodePage: number | null = null;
 
     public constructor(public readonly uri: vscode.Uri) {
         this.path = getUriPath(uri);
@@ -32,13 +29,7 @@ export class HtmlProjectedDocument implements IProjectedDocument {
         this.setContent('');
     }
 
-    public update(
-        edits: ServerTextChange[],
-        hostDocumentVersion: number,
-        checksum: Uint8Array,
-        checksumAlgorithm: number,
-        encodingCodePage: number | null
-    ) {
+    public update(edits: ServerTextChange[], hostDocumentVersion: number) {
         this.hostDocumentVersion = hostDocumentVersion;
 
         if (edits.length === 0) {
@@ -52,27 +43,12 @@ export class HtmlProjectedDocument implements IProjectedDocument {
         }
 
         this.setContent(content);
-        this._checksum = checksum;
-        this._checksumAlgorithm = checksumAlgorithm;
-        this._encodingCodePage = encodingCodePage;
     }
 
     public getContent() {
         return this.content;
     }
 
-    public get checksum(): Uint8Array {
-        return this._checksum;
-    }
-
-    public get checksumAlgorithm(): number {
-        return this._checksumAlgorithm;
-    }
-
-    public get encodingCodePage(): number | null {
-        return this._encodingCodePage;
-    }
-
     private getEditedContent(newText: string, start: number, end: number, content: string) {
         const before = content.substr(0, start);
         const after = content.substr(end);

src/razor/src/projection/IProjectedDocument.ts

@@ -11,7 +11,4 @@ export interface IProjectedDocument {
     readonly hostDocumentSyncVersion: number | null;
     readonly length: number;
     getContent(): string;
-    checksum: Uint8Array;
-    checksumAlgorithm: number;
-    encodingCodePage: number | null;
 }

src/razor/src/rpc/updateBufferRequest.ts

@@ -11,7 +11,7 @@ export class UpdateBufferRequest {
         public readonly hostDocumentFilePath: string,
         public readonly changes: ServerTextChange[],
         public readonly previousWasEmpty: boolean,
-        public readonly checksum: Uint8Array,
+        public readonly checksum: string,
         public readonly checksumAlgorithm: number,
         public readonly encodingCodePage: number | null
     ) {}