file-header fix for single-line comments (#2320)

src/rules/fileHeaderRule.ts

@@ -46,7 +46,7 @@ export class Rule extends Lint.Rules.AbstractRule {
 class FileHeaderWalker extends Lint.RuleWalker {
     // match a single line or multi line comment with leading whitespace
     // the wildcard dot does not match new lines - we can use [\s\S] instead
-    private commentRegexp: RegExp = /^\s*(\/\/(.*?)|\/\*([\s\S]*?)\*\/)/;
+    private commentRegexp: RegExp = /^\s*(\/\/(.*)|\/\*([\s\S]*?)\*\/)/;
     private headerRegexp: RegExp;
 
     public setRegexp(headerRegexp: RegExp) {

test/rules/file-header/bad-single-line/test.js.lint

@@ -0,0 +1,14 @@
+// Bad header 1
+~nil [missing file header]
+
+export class A {
+    x = 1;
+
+    B() {
+        return 2;
+    }
+}
+
+/*
+ * Good header 2
+ */

test/rules/file-header/bad-single-line/test.ts.lint

@@ -0,0 +1,14 @@
+// Bad header 1
+~nil [missing file header]
+
+export class A {
+    public x = 1;
+
+    public B() {
+        return 2;
+    }
+}
+
+/*
+ * Good header 2
+ */

test/rules/file-header/bad-single-line/tslint.json

@@ -0,0 +1,8 @@
+{
+    "rules": {
+        "file-header": [true, "Good header \\d"]
+    },
+    "jsRules": {
+        "file-header": [true, "Good header \\d"]
+    }
+}

test/rules/file-header/bad/test.js.lint

@@ -4,9 +4,9 @@
  */
 
 export class A {
-    public x = 1;
+    x = 1;
 
-    public B() {
+    B() {
         return 2;
     }
 }

test/rules/file-header/empty-file/test.js.lint

@@ -1 +1,2 @@
-// empty.
+
+~nil [missing file header]

test/rules/file-header/empty-file/test.ts.lint

@@ -1 +1,2 @@
-// empty.
+
+~nil [missing file header]

test/rules/file-header/good-single-line/test.js.lint

@@ -0,0 +1,9 @@
+// Good header 4
+
+export class A {
+    x = 1;
+
+    B() {
+        return 2;
+    }
+}

test/rules/file-header/good-single-line/test.ts.lint

@@ -0,0 +1,9 @@
+// Good header 4
+
+export class A {
+    public x = 1;
+
+    public B() {
+        return 2;
+    }
+}

test/rules/file-header/good-single-line/tslint.json

@@ -0,0 +1,8 @@
+{
+    "rules": {
+        "file-header": [true, "Good header \\d"]
+    },
+    "jsRules": {
+        "file-header": [true, "Good header \\d"]
+    }
+}