From bfac4892e5f52961e151fb3d750d4384ef1a73e6 Mon Sep 17 00:00:00 2001 From: jeanp413 Date: Mon, 15 Mar 2021 23:40:06 -0500 Subject: [PATCH] Fix #103631 --- .../contrib/markers/browser/markersFilterOptions.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/vs/workbench/contrib/markers/browser/markersFilterOptions.ts b/src/vs/workbench/contrib/markers/browser/markersFilterOptions.ts index aaee2569364..55d1bb3b5be 100644 --- a/src/vs/workbench/contrib/markers/browser/markersFilterOptions.ts +++ b/src/vs/workbench/contrib/markers/browser/markersFilterOptions.ts @@ -70,6 +70,15 @@ export class FilterOptions { const filesExcludeByRoot = Array.isArray(filesExclude) ? filesExclude : []; const excludesExpression: IExpression = Array.isArray(filesExclude) ? getEmptyExpression() : filesExclude; + for (const { expression } of filesExcludeByRoot) { + for (const pattern of Object.keys(expression)) { + if (!pattern.endsWith('/**')) { + // Append `/**` to pattern to match a parent folder #103631 + expression[`${strings.rtrim(pattern, '/')}/**`] = expression[pattern]; + } + } + } + const negate = filter.startsWith('!'); this.textFilter = { text: (negate ? strings.ltrim(filter, '!') : filter).trim(), negate }; const includeExpression: IExpression = getEmptyExpression();