Account for regexes in ignoreErrors setting (fixes #70)

SanderRonde · Apr 22, 2024 · 3d33ad2 · 3d33ad2
1 parent 33b5cdc
commit 3d33ad2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/server/src/lib/config.ts b/server/src/lib/config.ts
@@ -33,9 +33,14 @@ export async function getConfiguration(
 		options: config.options.map((option) =>
 			replaceVariables(option, workspaceFolders)
 		),
-		ignoreErrors: config.ignoreErrors.map((error) =>
-			replaceVariables(error, workspaceFolders)
-		),
+		ignoreErrors: config.ignoreErrors.map((error) => {
+			if (error instanceof RegExp) {
+				return new RegExp(
+					replaceVariables(error.source, workspaceFolders)
+				);
+			}
+			return replaceVariables(error, workspaceFolders);
+		}),
 	};
 }
 

diff --git a/server/src/lib/phpstan/runner.ts b/server/src/lib/phpstan/runner.ts
@@ -174,10 +174,13 @@ export class PHPStanRunner implements Disposable {
 
 	private _filterIgnoredErrors(
 		errors: string[],
-		ignoredErrors: string[]
+		ignoredErrors: (string | RegExp)[]
 	): string[] {
 		for (const ignoreError of ignoredErrors) {
 			const regExp = (() => {
+				if (ignoreError instanceof RegExp) {
+					return ignoreError;
+				}
 				try {
 					return new RegExp(ignoreError);
 				} catch (e) {

diff --git a/shared/config.ts b/shared/config.ts
@@ -31,4 +31,9 @@ export type ConfigSettingsWithoutPrefix = {
 		? R
 		: unknown]: ConfigSettings[K];
 };
-export type ConfigSettings = GetConfigurationType<typeof config>;
+export type ConfigSettings = Omit<
+	GetConfigurationType<typeof config>,
+	'phpstan.ignoreErrors'
+> & {
+	'phpstan.ignoreErrors': (string | RegExp)[];
+};