rev2 addressed comments

Author: Deep Furiya

src/document/Document.ts

@@ -17,12 +17,14 @@ export class Document {
 
     constructor(
         public readonly uri: DocumentUri,
-        private readonly textDocument: (uri: string) => TextDocument,
+        private readonly textDocument: (uri: string) => TextDocument | undefined,
         detectIndentation: boolean = true,
         fallbackTabSize: number = DefaultSettings.editor.tabSize,
     ) {
-        const doc = this.textDocument(uri);
-        const { extension, type } = detectDocumentType(doc.uri, doc.getText());
+        const doc = this.getTextDocument();
+        const { extension, type } = doc
+            ? detectDocumentType(doc.uri, doc.getText())
+            : { extension: '', type: DocumentType.YAML };
 
         this.extension = extension;
         this.documentType = type;
@@ -34,24 +36,28 @@ export class Document {
         this.processIndentation(detectIndentation, fallbackTabSize);
     }
 
-    public get languageId(): string {
-        return this.textDocument(this.uri).languageId;
+    private getTextDocument(): TextDocument | undefined {
+        return this.textDocument(this.uri);
     }
 
-    public get version(): number {
-        return this.textDocument(this.uri).version;
+    public get languageId(): string | undefined {
+        return this.getTextDocument()?.languageId;
     }
 
-    public get lineCount(): number {
-        return this.textDocument(this.uri).lineCount;
+    public get version(): number | undefined {
+        return this.getTextDocument()?.version;
+    }
+
+    public get lineCount(): number | undefined {
+        return this.getTextDocument()?.lineCount;
     }
 
     public get cfnFileType(): CloudFormationFileType {
         return this._cfnFileType;
     }
 
     public updateCfnFileType(): void {
-        const content = this.textDocument(this.uri).getText();
+        const content = this.getTextDocument()?.getText() ?? '';
         if (!content.trim()) {
             this._cfnFileType = CloudFormationFileType.Empty;
             this.cachedParsedContent = undefined;
@@ -69,7 +75,7 @@ export class Document {
     }
 
     private parseContent(): unknown {
-        const content = this.textDocument(this.uri).getText();
+        const content = this.getTextDocument()?.getText() ?? '';
         if (this.documentType === DocumentType.JSON) {
             return JSON.parse(content);
         }
@@ -132,27 +138,27 @@ export class Document {
     }
 
     public getText(range?: Range) {
-        return this.textDocument(this.uri).getText(range);
+        return this.getTextDocument()?.getText(range) ?? '';
     }
 
     public getLines(): string[] {
         return this.getText().split('\n');
     }
 
     public positionAt(offset: number) {
-        return this.textDocument(this.uri).positionAt(offset);
+        return this.getTextDocument()?.positionAt(offset);
     }
 
     public offsetAt(position: Position) {
-        return this.textDocument(this.uri).offsetAt(position);
+        return this.getTextDocument()?.offsetAt(position);
     }
 
     public isTemplate() {
         return this.cfnFileType === CloudFormationFileType.Template;
     }
 
     public contents() {
-        return this.textDocument(this.uri).getText();
+        return this.getTextDocument()?.getText() ?? '';
     }
 
     public metadata(): DocumentMetadata {
@@ -162,9 +168,9 @@ export class Document {
             ext: this.extension,
             type: this.documentType,
             cfnType: this.cfnFileType,
-            languageId: this.languageId,
-            version: this.version,
-            lineCount: this.lineCount,
+            languageId: this.languageId ?? '',
+            version: this.version ?? 0,
+            lineCount: this.lineCount ?? 0,
         };
     }
 

src/document/DocumentManager.ts

@@ -46,25 +46,19 @@ export class DocumentManager implements SettingsConfigurable, Closeable {
     }
 
     get(uri: string) {
-        let document = this.documentMap.get(uri);
-        if (document) {
-            return document;
-        }
-
         const textDocument = this.documents.get(uri);
         if (!textDocument) {
             return;
         }
 
+        let document = this.documentMap.get(uri);
+        if (document) {
+            return document;
+        }
+
         document = new Document(
             uri,
-            (u) => {
-                const doc = this.documents.get(u);
-                if (!doc) {
-                    throw new Error(`TextDocument not found for uri: ${u}`);
-                }
-                return doc;
-            },
+            (u) => this.documents.get(u),
             this.editorSettings.detectIndentation,
             this.editorSettings.tabSize,
         );
@@ -86,13 +80,7 @@ export class DocumentManager implements SettingsConfigurable, Closeable {
             if (!document) {
                 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;
-                    },
+                    (u) => this.documents.get(u),
                     this.editorSettings.detectIndentation,
                     this.editorSettings.tabSize,
                 );

src/resourceState/ResourceStateImporter.ts

@@ -114,7 +114,7 @@ export class ResourceStateImporter {
         if (insertPosition.replaceEntireFile) {
             // Replace entire file with properly formatted JSON
             snippetText = docFormattedText;
-            const endPosition = { line: document.lineCount, character: 0 };
+            const endPosition = { line: document.lineCount ?? 0, character: 0 };
             textEdit = TextEdit.replace(Range.create({ line: 0, character: 0 }, endPosition), snippetText);
         } else {
             // Insert at specific position
@@ -420,7 +420,7 @@ export class ResourceStateImporter {
                         : { line: resourcesSection.endPosition.row + 1, character: 0 };
             } else {
                 // Find the last non-empty line
-                let lastNonEmptyLine = document.lineCount - 1;
+                let lastNonEmptyLine = (document.lineCount ?? 1) - 1;
                 while (lastNonEmptyLine >= 0 && document.getLine(lastNonEmptyLine)?.trim().length === 0) {
                     lastNonEmptyLine--;
                 }
@@ -434,7 +434,7 @@ export class ResourceStateImporter {
             };
         }
 
-        let line = resourcesSection ? resourcesSection.endPosition.row : document.lineCount - 1;
+        let line = resourcesSection ? resourcesSection.endPosition.row : (document.lineCount ?? 1) - 1;
 
         // For JSON without Resources section, check if file is essentially empty
         if (!resourcesSection) {
@@ -495,7 +495,7 @@ export class ResourceStateImporter {
         }
         // malformed case, allow import to end of document
         return {
-            position: { line: document.lineCount, character: 0 },
+            position: { line: document.lineCount ?? 0, character: 0 },
             commaPrefixNeeded: false,
             newLineSuffixNeeded: false,
             replaceEntireFile: false,

src/utils/ResourceInsertionUtils.ts

@@ -29,16 +29,17 @@ export function getInsertPosition(resourcesSection: SyntaxNode | undefined, docu
                     ? { line: resourcesSection.endPosition.row, character: 0 }
                     : { line: resourcesSection.endPosition.row + 1, character: 0 };
         } else {
+            const lineCount = document.lineCount ?? 1;
             position =
-                document.getLine(document.lineCount - 1)?.trim().length === 0
-                    ? { line: document.lineCount - 1, character: 0 }
-                    : { line: document.lineCount, character: 0 };
+                document.getLine(lineCount - 1)?.trim().length === 0
+                    ? { line: lineCount - 1, character: 0 }
+                    : { line: lineCount, character: 0 };
         }
         return { position, commaPrefixNeeded: false, newLineSuffixNeeded: false };
     }
 
     // JSON handling
-    let line = resourcesSection ? resourcesSection.endPosition.row : document.lineCount - 1;
+    let line = resourcesSection ? resourcesSection.endPosition.row : (document.lineCount ?? 1) - 1;
     while (line > 0) {
         const previousLine = document.getLine(line - 1);
         if (previousLine === undefined) {
@@ -61,7 +62,7 @@ export function getInsertPosition(resourcesSection: SyntaxNode | undefined, docu
     }
     // malformed case, allow import to end of document
     return {
-        position: { line: document.lineCount, character: 0 },
+        position: { line: document.lineCount ?? 0, character: 0 },
         commaPrefixNeeded: false,
         newLineSuffixNeeded: false,
     };