don't remove failure that starts at end of disabled range (palantir#3177

) Fixes: palantir#3174
berickson1 · Aug 29, 2017 · 2ee8023 · 2ee8023
1 parent ca42fe9
commit 2ee8023
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/enableDisableRules.ts b/src/enableDisableRules.ts
@@ -43,7 +43,7 @@ export function removeDisabledFailures(sourceFile: ts.SourceFile, failures: Rule
         return disabledIntervals === undefined || !disabledIntervals.some(({ pos, end }) => {
             const failPos = failure.getStartPosition().getPosition();
             const failEnd = failure.getEndPosition().getPosition();
-            return failEnd >= pos && (end === -1 || failPos <= end);
+            return failEnd >= pos && (end === -1 || failPos < end);
         });
     });
 }

diff --git a/test/rules/_integration/enable-disable/test.ts.lint b/test/rules/_integration/enable-disable/test.ts.lint
@@ -126,3 +126,21 @@ var AAAaA = 'test'; //tslint:enable-line quotemark all
     ~~~~~          [variable name must be in lowerCamelCase or UPPER_CASE]
             ~~~~~~ [' should be "]
                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [comment must start with a space]
+
+// ensure line switches only switch the next line
+//tslint:enable-next-line:quotemark
+'foo';
+~~~~~ [' should be "]
+'bar';
+'baz'; // tslint:enable-line:quotemark
+~~~~~ [' should be "]
+'bas';
+
+//tslint:enable:quotemark
+//tslint:disable-next-line:quotemark
+'foo';
+'bar';
+~~~~~ [' should be "]
+'baz'; // tslint:disable-line:quotemark
+'bas';
+~~~~~ [' should be "]