updated Document constructor to pass in TextDocument function with uri

Author: Deep Furiya

src/document/Document.ts

@@ -16,15 +16,13 @@ export class Document {
     private cachedParsedContent: unknown;
 
     constructor(
-        private readonly textDocument: TextDocument,
+        public readonly uri: DocumentUri,
+        private readonly textDocument: (uri: string) => TextDocument,
         detectIndentation: boolean = true,
         fallbackTabSize: number = DefaultSettings.editor.tabSize,
-        public readonly uri: DocumentUri = textDocument.uri,
-        public readonly languageId: string = textDocument.languageId,
-        public readonly version: number = textDocument.version,
-        public readonly lineCount: number = textDocument.lineCount,
     ) {
-        const { extension, type } = detectDocumentType(textDocument.uri, textDocument.getText());
+        const doc = this.textDocument(uri);
+        const { extension, type } = detectDocumentType(doc.uri, doc.getText());
 
         this.extension = extension;
         this.documentType = type;
@@ -36,12 +34,24 @@ export class Document {
         this.processIndentation(detectIndentation, fallbackTabSize);
     }
 
+    public get languageId(): string {
+        return this.textDocument(this.uri).languageId;
+    }
+
+    public get version(): number {
+        return this.textDocument(this.uri).version;
+    }
+
+    public get lineCount(): number {
+        return this.textDocument(this.uri).lineCount;
+    }
+
     public get cfnFileType(): CloudFormationFileType {
         return this._cfnFileType;
     }
 
     public updateCfnFileType(): void {
-        const content = this.textDocument.getText();
+        const content = this.textDocument(this.uri).getText();
         if (!content.trim()) {
             this._cfnFileType = CloudFormationFileType.Empty;
             this.cachedParsedContent = undefined;
@@ -54,14 +64,12 @@ export class Document {
         } catch {
             // If parsing fails, leave cfnFileType unchanged and clear cache
             this.cachedParsedContent = undefined;
-            this.log.debug(
-                `Failed to parse document ${this.textDocument.uri}, keeping cfnFileType as ${this._cfnFileType}`,
-            );
+            this.log.debug(`Failed to parse document ${this.uri}, keeping cfnFileType as ${this._cfnFileType}`);
         }
     }
 
     private parseContent(): unknown {
-        const content = this.textDocument.getText();
+        const content = this.textDocument(this.uri).getText();
         if (this.documentType === DocumentType.JSON) {
             return JSON.parse(content);
         }
@@ -124,27 +132,27 @@ export class Document {
     }
 
     public getText(range?: Range) {
-        return this.textDocument.getText(range);
+        return this.textDocument(this.uri).getText(range);
     }
 
     public getLines(): string[] {
         return this.getText().split('\n');
     }
 
     public positionAt(offset: number) {
-        return this.textDocument.positionAt(offset);
+        return this.textDocument(this.uri).positionAt(offset);
     }
 
     public offsetAt(position: Position) {
-        return this.textDocument.offsetAt(position);
+        return this.textDocument(this.uri).offsetAt(position);
     }
 
     public isTemplate() {
         return this.cfnFileType === CloudFormationFileType.Template;
     }
 
     public contents() {
-        return this.textDocument.getText();
+        return this.textDocument(this.uri).getText();
     }
 
     public metadata(): DocumentMetadata {

src/document/DocumentManager.ts

@@ -56,7 +56,18 @@ export class DocumentManager implements SettingsConfigurable, Closeable {
             return;
         }
 
-        document = new Document(textDocument, this.editorSettings.detectIndentation, this.editorSettings.tabSize);
+        document = new Document(
+            uri,
+            (u) => {
+                const doc = this.documents.get(u);
+                if (!doc) {
+                    throw new Error(`TextDocument not found for uri: ${u}`);
+                }
+                return doc;
+            },
+            this.editorSettings.detectIndentation,
+            this.editorSettings.tabSize,
+        );
         this.documentMap.set(uri, document);
         return document;
     }
@@ -73,7 +84,18 @@ export class DocumentManager implements SettingsConfigurable, Closeable {
         for (const textDoc of this.documents.all()) {
             let document = this.documentMap.get(textDoc.uri);
             if (!document) {
-                document = new Document(textDoc, this.editorSettings.detectIndentation, this.editorSettings.tabSize);
+                document = new Document(
+                    textDoc.uri,
+                    (u) => {
+                        const doc = this.documents.get(u);
+                        if (!doc) {
+                            throw new Error(`TextDocument not found for uri: ${u}`);
+                        }
+                        return doc;
+                    },
+                    this.editorSettings.detectIndentation,
+                    this.editorSettings.tabSize,
+                );
                 this.documentMap.set(textDoc.uri, document);
             }
             allDocs.push(document);

src/handlers/DocumentHandler.ts

@@ -197,7 +197,7 @@ export function didSaveHandler(components: ServerComponents): (event: TextDocume
 
 function updateSyntaxTree(syntaxTreeManager: SyntaxTreeManager, textDocument: TextDocument, edit: Edit) {
     const uri = textDocument.uri;
-    const document = new Document(textDocument);
+    const document = new Document(uri, () => textDocument);
     if (syntaxTreeManager.getSyntaxTree(uri)) {
         if (document.cfnFileType === CloudFormationFileType.Other) {
             syntaxTreeManager.deleteSyntaxTree(uri);