Fixing comments

Author: jdiazgon

Diff for: src/components/classDeclaration/ClassDeclaration.ts

@@ -97,10 +97,15 @@ export class ClassDeclaration extends FileDeclaration {
   }
 
   parseComments(fileClass: ts.Node, sourceFile: ts.SourceFile) {
-    // getText() returns the first line without comments
-    let firstLine: string = sourceFile.getText();
-    // getFullText() returns also the comments, now I need the position of the declared class
-    let declarationPos: number = sourceFile.getFullText().indexOf(firstLine);
+    // Now I need the position of the declared class
+    let text: string = sourceFile.getFullText();
+    let regex: string = 'class +(' + this.getIdentifier() + ')';
+
+    let match = text.match(regex);
+
+    if (match == null) return;
+
+    let declarationPos: number = text.indexOf(match[0]);
     forEachComment(
       fileClass,
       (sourceFile, comment) => {

Diff for: src/components/interfaceDeclaration/InterfaceDeclaration.ts

@@ -75,10 +75,15 @@ export class InterfaceDeclaration extends FileDeclaration {
   }
 
   parseComments(fileInterface: ts.Node, sourceFile: ts.SourceFile) {
-    // getText() returns the first line without comments
-    let firstLine: string = sourceFile.getText();
-    // getFullText() returns also the comments, now I need the position of the declared class
-    let declarationPos: number = sourceFile.getFullText().indexOf(firstLine);
+    // Now I need the position of the declared class
+    let text: string = sourceFile.getFullText();
+    let regex: string = 'interface +(' + this.getIdentifier() + ')';
+
+    let match = text.match(regex);
+
+    if (match == null) return;
+
+    let declarationPos: number = text.indexOf(match[0]);
     forEachComment(
       fileInterface,
       (sourceFile, comment) => {