@tsslint/core 1.0.10 → 1.0.12

package/index.js

@@ -22,6 +22,7 @@ function createLinter(ctx, config, withStack) {
         });
     }
     const ts = ctx.typescript;
+    const fileRules = new Map();
     const fileFixes = new Map();
     const sourceFiles = new Map();
     const plugins = (config.plugins ?? []).map(plugin => plugin(ctx));
@@ -30,12 +31,6 @@ function createLinter(ctx, config, withStack) {
         const basePath = path.dirname(ctx.configFile);
         excludes.push(path.resolve(basePath, exclude));
     }
-    let rules = { ...config.rules };
-    for (const plugin of plugins) {
-        if (plugin.resolveRules) {
-            rules = plugin.resolveRules(rules);
-        }
-    }
     return {
         lint(fileName) {
             if (excludes.some(pattern => minimatch.minimatch(fileName, pattern))) {
@@ -53,8 +48,9 @@ function createLinter(ctx, config, withStack) {
                 reportSuggestion,
             };
             const token = ctx.languageServiceHost.getCancellationToken?.();
+            const rules = getFileRules(sourceFile.fileName);
             const fixes = getFileFixes(sourceFile.fileName);
-            let result = [];
+            let diagnostics = [];
             let currentRuleId;
             fixes.clear();
             for (const [id, rule] of Object.entries(rules)) {
@@ -72,10 +68,20 @@ function createLinter(ctx, config, withStack) {
             }
             for (const plugin of plugins) {
                 if (plugin.resolveDiagnostics) {
-                    result = plugin.resolveDiagnostics(sourceFile.fileName, result);
+                    diagnostics = plugin.resolveDiagnostics(sourceFile.fileName, diagnostics);
                 }
             }
-            return result;
+            const diagnosticSet = new Set(diagnostics);
+            for (const [ruleId, fix] of [...fixes]) {
+                const finalFixes = fix.filter(fix => diagnosticSet.has(fix.diagnostic));
+                if (finalFixes.length) {
+                    fixes.set(ruleId, finalFixes);
+                }
+                else {
+                    fixes.delete(ruleId);
+                }
+            }
+            return diagnostics;
             function reportError(message, start, end, traceOffset = 0) {
                 return report(ts.DiagnosticCategory.Error, message, start, end, traceOffset);
             }
@@ -107,7 +113,7 @@ function createLinter(ctx, config, withStack) {
                         }
                     }
                 }
-                result.push(error);
+                diagnostics.push(error);
                 return {
                     withDeprecated() {
                         error.reportsDeprecated = true;
@@ -202,6 +208,19 @@ function createLinter(ctx, config, withStack) {
             return result;
         },
     };
+    function getFileRules(fileName) {
+        let rules = fileRules.get(fileName);
+        if (!rules) {
+            rules = { ...config.rules };
+            for (const plugin of plugins) {
+                if (plugin.resolveRules) {
+                    rules = plugin.resolveRules(fileName, rules);
+                }
+            }
+            fileRules.set(fileName, rules);
+        }
+        return rules;
+    }
     function getFileFixes(fileName) {
         if (!fileFixes.has(fileName)) {
             fileFixes.set(fileName, new Map());

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/core",
-	"version": "1.0.10",
+	"version": "1.0.12",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -17,7 +17,7 @@
 		"source-map-support": "^0.5.21"
 	},
 	"devDependencies": {
-		"@tsslint/config": "1.0.10"
+		"@tsslint/config": "1.0.12"
 	},
-	"gitHead": "075fc3bf0058d41b4131345ab3634ad059562223"
+	"gitHead": "b34fbb2c8408616eb00536f00e525cb4fc8d8913"
 }