Fix comment extraction issue

lukasgeiter · Sep 28, 2019 · a59fdef · a59fdef
1 parent a47dfc8
commit a59fdef
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 2 deletions.
diff --git a/src/js/extractors/comments.ts b/src/js/extractors/comments.ts
@@ -127,14 +127,14 @@ export abstract class JsCommentUtils {
             return false;
         }
 
-        let lineNumber = sourceFile.getLineAndCharacterOfPosition(nodes[index].getFullStart()).line;
+        let lineNumber = sourceFile.getLineAndCharacterOfPosition(nodes[index].getStart()).line;
         if (index > 0) {
             if (lineNumber === sourceFile.getLineAndCharacterOfPosition(nodes[index - 1].getEnd()).line) {
                 return false;
             }
         }
         if (index + 1 < nodes.length) {
-            if (lineNumber === sourceFile.getLineAndCharacterOfPosition(nodes[index + 1].getFullStart()).line) {
+            if (lineNumber === sourceFile.getLineAndCharacterOfPosition(nodes[index + 1].getStart()).line) {
                 return false;
             }
         }

diff --git a/tests/js/extractors/comments.test.ts b/tests/js/extractors/comments.test.ts
@@ -349,6 +349,19 @@ describe('JS: comments', () => {
                     });
                 });
 
+                test('first property - trailing comma', () => {
+                    check(`(
+                        // Irrelevant leading line comment
+                        {
+                            // Irrelevant leading line comment
+                            foo: getText('Foo'), // Relevant trailing line comment
+                            bar: 42, // Irrelevant trailing line comment
+                        } // Irrelevant trailing line comment
+                    )`, {
+                        sameLineTrailing: ['Relevant trailing line comment']
+                    });
+                });
+
                 test('first property with extra whitespace', () => {
                     check(`(
                         // Irrelevant leading line comment
@@ -362,6 +375,19 @@ describe('JS: comments', () => {
                     });
                 });
 
+                test('first property with extra whitespace - trailing comma', () => {
+                    check(`(
+                        // Irrelevant leading line comment
+                        {
+                            // Irrelevant leading line comment
+                            foo: getText('Foo')    ,    // Relevant trailing line comment
+                            bar: 42, // Irrelevant trailing line comment
+                        } // Irrelevant trailing line comment
+                    )`, {
+                        sameLineTrailing: ['Relevant trailing line comment']
+                    });
+                });
+
                 test('first property with directly relevant block comment', () => {
                     check(`(
                         // Irrelevant leading line comment
@@ -375,6 +401,19 @@ describe('JS: comments', () => {
                     });
                 });
 
+                test('first property with directly relevant block comment - trailing comma', () => {
+                    check(`(
+                        // Irrelevant leading line comment
+                        {
+                            // Irrelevant leading line comment 
+                            foo: getText('Foo') /* Relevant trailing block comment */, // Irrelevant trailing line comment
+                            bar: 42, // Irrelevant trailing line comment
+                        } // Irrelevant trailing line comment
+                    )`, {
+                        sameLineTrailing: ['Relevant trailing block comment']
+                    });
+                });
+
                 test('second property', () => {
                     check(`(
                         // Irrelevant leading line comment
@@ -388,6 +427,19 @@ describe('JS: comments', () => {
                     });
                 });
 
+                test('second property - trailing comma', () => {
+                    check(`(
+                        // Irrelevant leading line comment
+                        {
+                            bar: 42, // Irrelevant trailing line comment
+                            // Irrelevant leading line comment
+                            foo: getText('Foo'), // Relevant trailing line comment
+                        } // Irrelevant trailing line comment
+                    )`, {
+                        sameLineTrailing: ['Relevant trailing line comment']
+                    });
+                });
+
                 test('second property with extra whitespace', () => {
                     check(`(
                         // Irrelevant leading line comment
@@ -401,6 +453,19 @@ describe('JS: comments', () => {
                     });
                 });
 
+                test('second property with extra whitespace - trailing comma', () => {
+                    check(`(
+                        // Irrelevant leading line comment
+                        {
+                            bar: 42, // Irrelevant trailing line comment
+                            // Irrelevant leading line comment
+                            foo: getText('Foo')    ,    // Relevant trailing line comment
+                        } // Irrelevant trailing line comment
+                    )`, {
+                        sameLineTrailing: ['Relevant trailing line comment']
+                    });
+                });
+
                 test('second property with directly relevant block comment', () => {
                     check(`(
                         // Irrelevant leading line comment
@@ -414,6 +479,19 @@ describe('JS: comments', () => {
                     });
                 });
 
+                test('second property with directly relevant block comment - trailing comma', () => {
+                    check(`(
+                        // Irrelevant leading line comment
+                        {
+                            bar: 42, // Irrelevant trailing line comment
+                            // Irrelevant leading line comment
+                            foo: getText('Foo'), /* Relevant trailing block comment */ // Relevant trailing line comment
+                        } // Irrelevant trailing line comment
+                    )`, {
+                        sameLineTrailing: ['Relevant trailing block comment', 'Relevant trailing line comment']
+                    });
+                });
+
                 test('assignment shorthand', () => {
                     check(`(
                         // Irrelevant leading line comment
@@ -426,6 +504,19 @@ describe('JS: comments', () => {
                         sameLineTrailing: ['Relevant trailing line comment']
                     });
                 });
+
+                test('assignment shorthand - trailing comma', () => {
+                    check(`(
+                        // Irrelevant leading line comment
+                        {
+                            bar, // Irrelevant trailing line comment
+                            // Irrelevant leading line comment
+                            foo: getText('Foo'), // Relevant trailing line comment
+                        } // Irrelevant trailing line comment
+                    )`, {
+                        sameLineTrailing: ['Relevant trailing line comment']
+                    });
+                });
             });
         });