chore: code adjust

johnsoncodehk · Jun 16, 2024 · 11479d6 · 11479d6
1 parent 7fae1d6
commit 11479d6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 31 deletions.
diff --git a/packages/cli/index.ts b/packages/cli/index.ts
@@ -150,10 +150,6 @@ import glob = require('glob');
 				}
 			}
 			else {
-				const sourceFile = languageService.getProgram()?.getSourceFile(fileName);
-				if (!sourceFile) {
-					throw new Error(`No source file found for ${fileName}`);
-				}
 				const diagnostics = linter.lint(fileName);
 				for (const diagnostic of diagnostics) {
 					let output = ts.formatDiagnosticsWithColorAndContext([diagnostic], {

diff --git a/packages/core/index.ts b/packages/core/index.ts
@@ -70,14 +70,14 @@ export function createLinter(ctx: ProjectContext, config: Config, withStack: boo
 				try {
 					rule(rulesContext);
 				} catch (err) {
-					console.error(`An unexpected error occurred in rule "${id}" in file ${fileName}.`);
+					console.error(`An unexpected error occurred in rule "${id}" in file ${sourceFile.fileName}.`);
 					console.error(err);
 				}
 			}
 
 			for (const plugin of plugins) {
 				if (plugin.resolveDiagnostics) {
-					result = plugin.resolveDiagnostics(fileName, result);
+					result = plugin.resolveDiagnostics(sourceFile.fileName, result);
 				}
 			}
 

diff --git a/packages/typescript-plugin/index.ts b/packages/typescript-plugin/index.ts
@@ -56,31 +56,33 @@ function decorateLanguageService(
 		if (!info.languageServiceHost.getScriptFileNames().includes(fileName)) {
 			return result;
 		}
-		const sourceFile = info.languageService.getProgram()?.getSourceFile(fileName);
-		if (sourceFile) {
-			if (configFileDiagnostics.length) {
-				result = result.concat(configFileDiagnostics.map<ts.DiagnosticWithLocation>(diagnostic => ({
-					...diagnostic,
-					file: sourceFile,
-					start: 0,
-					length: 0,
-				})));
-			}
-			if (config?.debug) {
-				result.push({
-					category: ts.DiagnosticCategory.Suggestion,
-					source: 'tsslint',
-					code: 'debug-info' as any,
-					messageText: JSON.stringify({
-						rules: Object.keys(config?.rules ?? {}),
-						plugins: config.plugins?.length,
-						configFile,
-						tsconfig,
-					}, null, 2),
-					file: sourceFile,
-					start: 0,
-					length: 0,
-				});
+		if (configFileDiagnostics.length || config?.debug) {
+			const sourceFile = info.languageService.getProgram()?.getSourceFile(fileName);
+			if (sourceFile) {
+				if (configFileDiagnostics.length) {
+					result = result.concat(configFileDiagnostics.map<ts.DiagnosticWithLocation>(diagnostic => ({
+						...diagnostic,
+						file: sourceFile,
+						start: 0,
+						length: 0,
+					})));
+				}
+				if (config?.debug) {
+					result.push({
+						category: ts.DiagnosticCategory.Suggestion,
+						source: 'tsslint',
+						code: 'debug-info' as any,
+						messageText: JSON.stringify({
+							rules: Object.keys(config?.rules ?? {}),
+							plugins: config.plugins?.length,
+							configFile,
+							tsconfig,
+						}, null, 2),
+						file: sourceFile,
+						start: 0,
+						length: 0,
+					});
+				}
 			}
 		}
 		if (linter) {