From 766facfb6853b49b63ca96fea40638c28e7fca50 Mon Sep 17 00:00:00 2001 From: tanmoyopenroot Date: Sun, 10 Nov 2019 13:35:13 +0530 Subject: [PATCH] fix[file-header]: fix enforce-trailing-newline --- src/rules/fileHeaderRule.ts | 4 +--- test/rules/file-header/good-newline/test.ts.lint | 3 +++ test/rules/file-header/good-newline/tslint.json | 10 ++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 test/rules/file-header/good-newline/test.ts.lint create mode 100644 test/rules/file-header/good-newline/tslint.json diff --git a/src/rules/fileHeaderRule.ts b/src/rules/fileHeaderRule.ts index 764404d3f44..545789a0bde 100644 --- a/src/rules/fileHeaderRule.ts +++ b/src/rules/fileHeaderRule.ts @@ -244,9 +244,7 @@ export class Rule extends Lint.Rules.AbstractRule { ); const NEW_LINE_FOLLOWING_HEADER = /^.*((\r)?\n){2,}$/gm; - return ( - entireComment !== undefined && NEW_LINE_FOLLOWING_HEADER.test(entireComment) !== null - ); + return entireComment !== undefined && !NEW_LINE_FOLLOWING_HEADER.test(entireComment); } private getFileHeaderText( diff --git a/test/rules/file-header/good-newline/test.ts.lint b/test/rules/file-header/good-newline/test.ts.lint new file mode 100644 index 00000000000..f724f642455 --- /dev/null +++ b/test/rules/file-header/good-newline/test.ts.lint @@ -0,0 +1,3 @@ +/* Copyright 2019 */ + +class Foo {} diff --git a/test/rules/file-header/good-newline/tslint.json b/test/rules/file-header/good-newline/tslint.json new file mode 100644 index 00000000000..858210b6a93 --- /dev/null +++ b/test/rules/file-header/good-newline/tslint.json @@ -0,0 +1,10 @@ +{ + "rules": { + "file-header": [ + true, + "Copyright \\d{4}", + "Copyright 2019", + "enforce-trailing-newline" + ] + } +}