diff --git a/tools/winscope/src/common/tree_utils.ts b/tools/winscope/src/common/tree_utils.ts index 7f3fdbe6a..e31047d5b 100644 --- a/tools/winscope/src/common/tree_utils.ts +++ b/tools/winscope/src/common/tree_utils.ts @@ -53,25 +53,11 @@ class TreeUtils { } static makeNodeFilter(filterString: string): FilterType { - const filterStrings = filterString.split(','); - const positive: any[] = []; - const negative: any[] = []; - filterStrings.forEach((f) => { - f = f.trim(); - if (f.startsWith('!')) { - const regex = new RegExp(f.substring(1), 'i'); - negative.push((s: any) => !regex.test(s)); - } else { - const regex = new RegExp(f, 'i'); - positive.push((s: any) => regex.test(s)); - } - }); const filter = (item: TreeNode | undefined | null) => { if (item) { - const apply = (f: any) => f(`${item.name}`); + const regex = new RegExp(filterString, 'i'); return ( - (positive.length === 0 || positive.some(apply)) && - (negative.length === 0 || negative.every(apply)) + (filterString.length === 0 || regex.test(`${item.name}`)) ); } return false; diff --git a/tools/winscope/src/viewers/common/ime_utils.ts b/tools/winscope/src/viewers/common/ime_utils.ts index b63e72dae..027da4d4a 100644 --- a/tools/winscope/src/viewers/common/ime_utils.ts +++ b/tools/winscope/src/viewers/common/ime_utils.ts @@ -129,7 +129,7 @@ class ImeUtils { return undefined; } - const isTaskLayer = TreeUtils.makeNodeFilter('Task, ImePlaceholder'); + const isTaskLayer = TreeUtils.makeNodeFilter('Task|ImePlaceholder'); const taskLayer = TreeUtils.findAncestorNode(imeLayer, isTaskLayer) as Layer; if (!taskLayer) { return undefined;