lint all ts files in scripts. remove tslint: directive. add extended eslint config for CI environment

a-tarasyuk · a-tarasyuk · commit 3424f843f5f9 · 2019-08-14T14:10:40.000+03:00
diff --git a/Gulpfile.js b/Gulpfile.js
@@ -334,13 +334,17 @@ task("run-eslint-rules-tests").description = "Runs the eslint rule tests";
 const lintFoldStart = async () => { if (fold.isTravis()) console.log(fold.start("lint")); };
 const lintFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("lint")); };
 const eslint = (folder) => async () => {
+    const ESLINTRC_CI = ".eslintrc.ci.json";
+    const ESLINTRC = ".eslintrc.json";
+    const isCIEnv = process.env.CI === "true";
+    const config = isCIEnv && fs.existsSync(path.resolve(folder, ESLINTRC_CI)) ? ESLINTRC_CI : ESLINTRC;
+
     const args = [
         "node_modules/eslint/bin/eslint",
-        "--config", `${ folder }/.eslintrc.json`,
+        "--config", `${ folder }/${ config }`,
         "--format", "autolinkable-stylish",
         "--rulesdir", "scripts/eslint/built/rules",
-        "--ext", ".ts",
-        `${ folder }`,
+        "--ext", ".ts", folder,
     ];
 
     if (cmdLineOptions.fix) {
diff --git a/scripts/.eslintrc.json b/scripts/.eslintrc.json
@@ -5,7 +5,7 @@
         "project": [
             "./importDefinitelyTypedTests/tsconfig.json",
             "./eslint/tsconfig.json",
-            "./tsconfig.json"
+            "./tsconfig.eslint.json"
         ]
     }
 }
diff --git a/scripts/tsconfig.eslint.json b/scripts/tsconfig.eslint.json
@@ -0,0 +1,4 @@
+{
+    "extends": "./tsconfig.json",
+    "include": ["*.ts", "types"]
+}
diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json
@@ -11,17 +11,12 @@
         "lib": ["es6", "scripthost"],
     },
 
-    "includes": [
+    "include": [
         "generateLocalizedDiagnosticMessages.ts",
         "processDiagnosticMessages.ts",
         "configurePrerelease.ts",
-        "failed-tests.d.ts",
         "buildProtocol.ts",
         "produceLKG.ts",
         "word2md.ts"
-    ],
-
-    "exclude": [
-        "ambient.d.ts"
     ]
 }
diff --git a/src/.eslintrc.ci.json b/src/.eslintrc.ci.json
@@ -0,0 +1,7 @@
+{
+    "extends": "./.eslintrc.json",
+    "rules": {
+        "@typescript-eslint/no-unnecessary-qualifier": "error",
+        "@typescript-eslint/no-unnecessary-type-assertion": "error"
+    }
+}
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
@@ -1342,11 +1342,9 @@ namespace ts {
                 rawTextScanner.setText("`" + rawText + "`");
                 break;
             case SyntaxKind.TemplateHead:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("`" + rawText + "${");
                 break;
             case SyntaxKind.TemplateMiddle:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("}" + rawText + "${");
                 break;
             case SyntaxKind.TemplateTail:
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -599,10 +599,8 @@ namespace ts {
                     case SyntaxKind.NoSubstitutionTemplateLiteral:
                         return "`" + rawText + "`";
                     case SyntaxKind.TemplateHead:
-                        // tslint:disable-next-line no-invalid-template-strings
                         return "`" + rawText + "${";
                     case SyntaxKind.TemplateMiddle:
-                        // tslint:disable-next-line no-invalid-template-strings
                         return "}" + rawText + "${";
                     case SyntaxKind.TemplateTail:
                         return "}" + rawText + "`";

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"project": [`
`6`	`6`	`"./importDefinitelyTypedTests/tsconfig.json",`
`7`	`7`	`"./eslint/tsconfig.json",`
`8`		`- "./tsconfig.json"`
	`8`	`+ "./tsconfig.eslint.json"`
`9`	`9`	`]`
`10`	`10`	`}`
`11`	`11`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +    "extends": "./tsconfig.json",
 +    "include": ["*.ts", "types"]
 +}