fix: Allow ignoring ui5.yaml files via config

For some files, only the passed ignorePatterns
were considered, but not pattern defined in the
configuration.

This mainly affected linting of ui5.yaml files, as
they are accessed via the so-called root reader
rather than the project workspace, where the
problem did not occur.

src/linter/lintWorkspace.ts

@@ -9,7 +9,7 @@ import {taskStart} from "../utils/perf.js";
 import TypeLinter from "./ui5Types/TypeLinter.js";
 import LinterContext, {LintResult, LinterParameters, LinterOptions, FSToVirtualPathOptions} from "./LinterContext.js";
 import {createReader} from "@ui5/fs/resourceFactory";
-import {resolveReader} from "./linter.js";
+import {mergeIgnorePatterns, resolveReader} from "./linter.js";
 import {UI5LintConfigType} from "../utils/ConfigManager.js";
 
 export default async function lintWorkspace(
@@ -33,7 +33,7 @@ export default async function lintWorkspace(
 		patternsMatch,
 	});
 	reader = resolveReader({
-		patterns: options.ignorePatterns ?? [],
+		patterns: mergeIgnorePatterns(options, config),
 		resourceReader: reader,
 		patternsMatch,
 		relFsBasePath: relFsBasePath ?? "",

src/linter/linter.ts

@@ -136,11 +136,8 @@ async function lint(
 	// that didn't match any file
 	const matchedPatterns = new Set<string>();
 
-	// Resolve ignores
-	ignorePatterns = [
-		...(config.ignores ?? []),
-		...(ignorePatterns ?? []), // CLI patterns go after config patterns
-	].filter(($) => $);
+	ignorePatterns = mergeIgnorePatterns(options, config);
+
 	// Apply ignores to the workspace reader.
 	// TypeScript needs the full context to provide correct analysis.
 	// so, we can do filtering later via the filePathsReader
@@ -380,3 +377,10 @@ function checkUnmatchedPatterns(patterns: FilePattern[], patternsMatch: Set<stri
 			` '${unmatchedPatterns.join("', '")}' did not match any resource`);
 	}
 }
+
+export function mergeIgnorePatterns(options: LinterOptions, config: UI5LintConfigType): string[] {
+	return [
+		...(config.ignores ?? []),
+		...(options.ignorePatterns ?? []), // CLI patterns go after config patterns
+	].filter(($) => $);
+}

test/fixtures/linter/projects/com.ui5.troublesome.app/ui5lint-custom.config.cjs

@@ -1,6 +1,7 @@
 module.exports = {
 	ignores: [
 		"webapp/test/**/*",
-		"!webapp/test/integration/opaTests.qunit.js"
+		"!webapp/test/integration/opaTests.qunit.js",
+		"ui5.yaml"
 	],
 };

test/lib/linter/linter.ts

@@ -162,6 +162,7 @@ test.serial("lint: Ignore files from library.with.custom.paths", async (t) => {
 		ignorePatterns: [
 			"src/",
 			"!src/main/",
+			"ui5.yaml",
 		],
 	});
 

test/lib/linter/snapshots/linter.ts.md

@@ -1899,22 +1899,6 @@ Generated by [AVA](https://avajs.dev).
         ],
         warningCount: 0,
       },
-      {
-        coverageInfo: [],
-        errorCount: 1,
-        fatalErrorCount: 0,
-        filePath: 'ui5.yaml',
-        messages: [
-          {
-            column: 7,
-            line: 15,
-            message: 'Use of deprecated library \'sap.landvisz\'',
-            ruleId: 'no-deprecated-library',
-            severity: 2,
-          },
-        ],
-        warningCount: 0,
-      },
     ]
 
 ## lint: All files of library with sap.f namespace
@@ -2363,22 +2347,6 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     [
-      {
-        coverageInfo: [],
-        errorCount: 1,
-        fatalErrorCount: 0,
-        filePath: 'ui5.yaml',
-        messages: [
-          {
-            column: 7,
-            line: 11,
-            message: 'Use of deprecated library \'sap.landvisz\'',
-            ruleId: 'no-deprecated-library',
-            severity: 2,
-          },
-        ],
-        warningCount: 0,
-      },
       {
         coverageInfo: [],
         errorCount: 0,

test/lib/utils/configManager.ts

@@ -18,6 +18,7 @@ test("Check config file", async (t) => {
 		ignores: [
 			"webapp/test/**/*",
 			"!webapp/test/integration/opaTests.qunit.js",
+			"ui5.yaml",
 		],
 	}, "The configuration is derived from the provided custom config file");
 });
@@ -64,6 +65,7 @@ test("Check config file with absolute path", async (t) => {
 		ignores: [
 			"webapp/test/**/*",
 			"!webapp/test/integration/opaTests.qunit.js",
+			"ui5.yaml",
 		],
 	}, "The configuration is derived from the provided custom config file");
 });