Fixed rebase issues, added test for filtering

arhelmus · arhelmus · commit 166da46467dc · 2020-08-16T11:55:11.000+01:00
diff --git a/src/vs/workbench/contrib/debug/browser/replFilterView.ts b/src/vs/workbench/contrib/debug/browser/replFilterView.ts
@@ -5,7 +5,7 @@
 
 import 'vs/css!./media/replFilter';
 import * as DOM from 'vs/base/browser/dom';
-import { BaseActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
+import { BaseActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { Delayer } from 'vs/base/common/async';
 import { IAction } from 'vs/base/common/actions';
 import { HistoryInputBox } from 'vs/base/browser/ui/inputbox/inputBox';
diff --git a/src/vs/workbench/contrib/debug/common/replModel.ts b/src/vs/workbench/contrib/debug/common/replModel.ts
@@ -174,13 +174,18 @@ export class ReplGroup implements IReplElement {
 	}
 }
 
+type FilterFunc = ((element: IReplElement) => void);
+
 export class ReplModel {
 	private replElements: IReplElement[] = [];
 	private readonly _onDidChangeElements = new Emitter<void>();
 	readonly onDidChangeElements = this._onDidChangeElements.event;
+	private filterFunc: FilterFunc | undefined;
 
 	getReplElements(): IReplElement[] {
-		return this.replElements;
+		return this.replElements.filter(element =>
+			this.filterFunc ? this.filterFunc(element) : true
+		);
 	}
 
 	async addReplExpression(session: IDebugSession, stackFrame: IStackFrame | undefined, name: string): Promise<void> {
@@ -315,6 +320,10 @@ export class ReplModel {
 		}
 	}
 
+	setFilter(filterFunc: FilterFunc): void {
+		this.filterFunc = filterFunc;
+	}
+
 	removeReplExpressions(): void {
 		if (this.replElements.length > 0) {
 			this.replElements = [];
diff --git a/src/vs/workbench/contrib/debug/test/browser/repl.test.ts b/src/vs/workbench/contrib/debug/test/browser/repl.test.ts
@@ -12,6 +12,8 @@ import { SimpleReplElement, RawObjectReplElement, ReplEvaluationInput, ReplModel
 import { RawDebugSession } from 'vs/workbench/contrib/debug/browser/rawDebugSession';
 import { timeout } from 'vs/base/common/async';
 import { createMockSession } from 'vs/workbench/contrib/debug/test/browser/callStack.test';
+import { ReplFilter } from 'vs/workbench/contrib/debug/browser/replFilter';
+import { TreeVisibility } from 'vs/base/browser/ui/tree/tree';
 
 suite('Debug - REPL', () => {
 	let model: DebugModel;
@@ -189,4 +191,59 @@ suite('Debug - REPL', () => {
 		assert.equal(repl.getReplElements().length, 3);
 		assert.equal((<SimpleReplElement>repl.getReplElements()[2]).value, 'second global line');
 	});
+
+	test('repl filter', async () => {
+		const session = createMockSession(model);
+		const repl = new ReplModel();
+		const replFilter = new ReplFilter('');
+
+		repl.setFilter((element) => {
+			const filterResult = replFilter.filter(element, TreeVisibility.Visible);
+			return filterResult === true || filterResult === TreeVisibility.Visible;
+		});
+
+		repl.appendToRepl(session, 'first line\n', severity.Info);
+		repl.appendToRepl(session, 'second line\n', severity.Info);
+		repl.appendToRepl(session, 'third line\n', severity.Info);
+		repl.appendToRepl(session, 'fourth line\n', severity.Info);
+
+		replFilter.filterQuery = 'first';
+		let r1 = <SimpleReplElement[]>repl.getReplElements();
+		assert.equal(r1.length, 1);
+		assert.equal(r1[0].value, 'first line\n');
+
+		replFilter.filterQuery = '!first';
+		let r2 = <SimpleReplElement[]>repl.getReplElements();
+		assert.equal(r1.length, 1);
+		assert.equal(r2[0].value, 'second line\n');
+		assert.equal(r2[1].value, 'third line\n');
+		assert.equal(r2[2].value, 'fourth line\n');
+
+		replFilter.filterQuery = 'first, line';
+		let r3 = <SimpleReplElement[]>repl.getReplElements();
+		assert.equal(r3.length, 4);
+		assert.equal(r3[0].value, 'first line\n');
+		assert.equal(r3[1].value, 'second line\n');
+		assert.equal(r3[2].value, 'third line\n');
+		assert.equal(r3[3].value, 'fourth line\n');
+
+		replFilter.filterQuery = 'line, !second';
+		let r4 = <SimpleReplElement[]>repl.getReplElements();
+		assert.equal(r4.length, 3);
+		assert.equal(r4[0].value, 'first line\n');
+		assert.equal(r4[1].value, 'third line\n');
+		assert.equal(r4[2].value, 'fourth line\n');
+
+		replFilter.filterQuery = '!second, line';
+		let r4_same = <SimpleReplElement[]>repl.getReplElements();
+		assert.equal(r4.length, r4_same.length);
+
+		replFilter.filterQuery = '!line';
+		let r5 = <SimpleReplElement[]>repl.getReplElements();
+		assert.equal(r5.length, 0);
+
+		replFilter.filterQuery = 'smth';
+		let r6 = <SimpleReplElement[]>repl.getReplElements();
+		assert.equal(r6.length, 0);
+	});
 });

Original file line number	Diff line number	Diff line change
`@@ -174,13 +174,18 @@ export class ReplGroup implements IReplElement {`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
	`177`	`+type FilterFunc = ((element: IReplElement) => void);`
	`178`	`+`
`177`	`179`	`export class ReplModel {`
`178`	`180`	`private replElements: IReplElement[] = [];`
`179`	`181`	`private readonly _onDidChangeElements = new Emitter<void>();`
`180`	`182`	`readonly onDidChangeElements = this._onDidChangeElements.event;`
	`183`	`+ private filterFunc: FilterFunc \| undefined;`
`181`	`184`
`182`	`185`	`getReplElements(): IReplElement[] {`
`183`		`- return this.replElements;`
	`186`	`+ return this.replElements.filter(element =>`
	`187`	`+ this.filterFunc ? this.filterFunc(element) : true`
	`188`	`+ );`
`184`	`189`	`}`
`185`	`190`
`186`	`191`	`async addReplExpression(session: IDebugSession, stackFrame: IStackFrame \| undefined, name: string): Promise<void> {`
`@@ -315,6 +320,10 @@ export class ReplModel {`
`315`	`320`	`}`
`316`	`321`	`}`
`317`	`322`
	`323`	`+ setFilter(filterFunc: FilterFunc): void {`
	`324`	`+ this.filterFunc = filterFunc;`
	`325`	`+ }`
	`326`	`+`
`318`	`327`	`removeReplExpressions(): void {`
`319`	`328`	`if (this.replElements.length > 0) {`
`320`	`329`	`this.replElements = [];`