Merge pull request #303 from webschik/ter-newline-after-var

[bug] fixed ter-newline-after-var (closes #302)

Author: buzinas

src/rules/terNewlineAfterVarRule.ts

@@ -100,12 +100,15 @@ class RuleWalker extends Lint.AbstractWalker<ITerNewlineAfterVarOptions> {
               unexpectedLineFixes.push(Lint.Replacement.deleteText(i, 1));
             }
           } else if (code !== 9 && code !== 13 && code !== 32) {
-            const leadingComments: ts.CommentRange[]|undefined = ts.getLeadingCommentRanges(sourceFileText, i - 1);
+            const leadingComments: ts.CommentRange[]|undefined = ts.getLeadingCommentRanges(
+              `\n${ sourceFileText.slice(i) }`,
+              0
+            );
             const lastLeadingComment: ts.CommentRange|undefined = leadingComments && leadingComments.pop();
 
             if (lastLeadingComment && (!isNewLineRequired || (isNewLineRequired && newLinesCount < 2))) {
               newLinesCount = 0;
-              expectedLinePos = lastLeadingComment.end;
+              expectedLinePos = i - 1 + lastLeadingComment.end;
               i = expectedLinePos - 1;
             } else {
               if (isNewLineRequired && newLinesCount < 2) {

src/test/rules/terNewlineAfterVarRuleTests.ts

@@ -158,6 +158,30 @@ ruleTester.addTestGroup('always', 'should always require an empty line after var
     errors: expecting([
       ['expectedBlankLine', 5]
     ])
+  },
+  {
+    code: dedent`
+     const dateOfBirth: string = value.slice(1, 9); // yyyymmdd
+
+     value = '';`,
+    output: dedent`
+     const dateOfBirth: string = value.slice(1, 9); // yyyymmdd
+
+     value = '';`,
+    options: ['always']
+  },
+  {
+    code: dedent`
+     const dateOfBirth: string = value.slice(1, 9); // yyyymmdd
+     value = '';`,
+    output: dedent`
+     const dateOfBirth: string = value.slice(1, 9); // yyyymmdd
+
+     value = '';`,
+    options: ['always'],
+    errors: expecting([
+      ['expectedBlankLine', 1]
+    ])
   }
 ]);
 
@@ -301,6 +325,28 @@ ruleTester.addTestGroup('never', 'should disallow empty lines after variable dec
     errors: expecting([
       ['unexpectedBlankLine', 5]
     ])
+  },
+  {
+    code: dedent`
+     const dateOfBirth: string = value.slice(1, 9); // yyyymmdd
+     value = '';`,
+    output: dedent`
+     const dateOfBirth: string = value.slice(1, 9); // yyyymmdd
+     value = '';`,
+    options: ['never']
+  },
+  {
+    code: dedent`
+     const dateOfBirth: string = value.slice(1, 9); // yyyymmdd
+
+     value = '';`,
+    output: dedent`
+     const dateOfBirth: string = value.slice(1, 9); // yyyymmdd
+     value = '';`,
+    options: ['never'],
+    errors: expecting([
+      ['unexpectedBlankLine', 1]
+    ])
   }
 ]);