Fix: TypeScript Code Organizer Deletes Commented-Out Code (#107)

src/tsco-cli/source-code/source-code-analyzer.ts

@@ -29,6 +29,37 @@ export class SourceCodeAnalyzer
         return elements;
     }
 
+    /**
+     * Extracts trailing comments at the end of the file.
+     * These are comments that appear after the last syntax node and are attached to the EndOfFileToken.
+     * This ensures commented-out code at the end of files is preserved during reorganization.
+     * 
+     * @param sourceFile The TypeScript source file to analyze
+     * @returns The trailing comments text, or null if there are no trailing comments
+     */
+    public static getFileTrailer(sourceFile: ts.SourceFile)
+    {
+        // Get trailing comments from the EndOfFileToken
+        const children = sourceFile.getChildren(sourceFile);
+        const eofToken = children.find(node => node.kind === ts.SyntaxKind.EndOfFileToken);
+
+        if (eofToken)
+        {
+            const fullText = sourceFile.getFullText();
+            const commentRanges = ts.getLeadingCommentRanges(fullText, eofToken.pos);
+
+            if (commentRanges && commentRanges.length > 0)
+            {
+                const start = commentRanges[0].pos;
+                const end = commentRanges[commentRanges.length - 1].end;
+
+                return fullText.substring(start, end);
+            }
+        }
+
+        return null;
+    }
+
     public static hasReference(sourceFile: ts.SourceFile, identifier: string)
     {
         return sourceFile.getChildren(sourceFile).some(node => this.findReference(node, sourceFile, identifier));

src/tsco-cli/source-code/source-code-organizer.ts

@@ -40,9 +40,10 @@ export class SourceCodeOrganizer
 
                 const sourceFile = ts.createSourceFile(sourceCodeFilePath, sourceCodeWithoutRegions.toString(), ts.ScriptTarget.Latest, false, ts.ScriptKind.TS);
                 const elements = SourceCodeAnalyzer.getNodes(sourceFile, configuration);
+                const fileTrailer = SourceCodeAnalyzer.getFileTrailer(sourceFile);
                 const topLevelGroups = await this.organizeModuleMembers(elements, configuration, sourceFile, sourceCodeFilePath); // TODO: move this to module node
 
-                return SourceCodePrinter.print(fileHeader, topLevelGroups, configuration).toString();
+                return SourceCodePrinter.print(fileHeader, topLevelGroups, fileTrailer, configuration).toString();
             }
             catch (error)
             {

src/tsco-cli/source-code/source-code-printer.ts

@@ -30,7 +30,7 @@ export class SourceCodePrinter
 {
     // #region Public Static Methods (1)
 
-    public static print(fileHeader: string | null, nodeGroups: ElementNodeGroup[], configuration: Configuration)
+    public static print(fileHeader: string | null, nodeGroups: ElementNodeGroup[], fileTrailer: string | null, configuration: Configuration)
     {
         const printedSourceCode = this.printNodeGroups(nodeGroups, configuration);
 
@@ -42,9 +42,21 @@ export class SourceCodePrinter
         printedSourceCode.removeConsecutiveEmptyLines();
         printedSourceCode.trim();
 
-        if (printedSourceCode.length > 0)
+        const hasContent = printedSourceCode.length > 0;
+        const hasTrailer = fileTrailer && fileTrailer.length > 0;
+
+        if (hasContent)
         {
             printedSourceCode.addNewLineAfter();
+            if (hasTrailer)
+            {
+                printedSourceCode.addNewLineAfter();
+            }
+        }
+
+        if (hasTrailer)
+        {
+            printedSourceCode.addAfter(fileTrailer);
         }
 
         return printedSourceCode;