Simplify results pane text

bnason-nf · May 21, 2021 · 689dda8 · 689dda8
1 parent 8413a83
commit 689dda8
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 32 deletions.
diff --git a/src/findResult.ts b/src/findResult.ts
@@ -5,6 +5,9 @@ import * as vscode from "vscode";
 import { localize } from "./localize";
 
 export class FindResult {
+	// eslint-disable-next-line no-magic-numbers, @typescript-eslint/no-magic-numbers
+	private static readonly truncateContext: number = 15;
+
 	public readonly columnBegin: number;
 
 	public readonly columnEnd: number;
@@ -15,12 +18,29 @@ export class FindResult {
 
 	public readonly text: string;
 
+	public readonly trimmedText: string;
+
+	public readonly trimmedColumnBegin: number;
+
+	public readonly trimmedColumnEnd: number;
+
 	public constructor(text: string, line: number, columnBegin: number, columnEnd: number, index: number) {
 		this.columnBegin = columnBegin;
 		this.columnEnd = columnEnd;
 		this.index = index;
 		this.line = line;
 		this.text = text;
+
+		const trimmedTextBegin: number = this.columnBegin - FindResult.truncateContext;
+		if (trimmedTextBegin < 0) {
+			this.trimmedText = this.text;
+			this.trimmedColumnBegin = this.columnBegin;
+			this.trimmedColumnEnd = this.columnEnd;
+		} else {
+			this.trimmedText = `…${this.text.substr(trimmedTextBegin)}`;
+			this.trimmedColumnBegin = this.columnBegin - trimmedTextBegin + 1;
+			this.trimmedColumnEnd = this.columnEnd - trimmedTextBegin + 1;
+		}
 	}
 
 	public toMarkdown(): vscode.MarkdownString {

diff --git a/src/treeDataProvider.ts b/src/treeDataProvider.ts
@@ -81,46 +81,17 @@ export class TreeDataProvider implements vscode.TreeDataProvider<TreeElement>, I
 		}
 
 		if (element instanceof FindError) {
-			// No command needed
-			const label: string = element.toString();
-			const treeItem: vscode.TreeItem = new vscode.TreeItem(label);
+			const treeItem: vscode.TreeItem = new vscode.TreeItem(element.toString());
 			treeItem.tooltip = element.text;
 			return treeItem;
 		}
 
 		if (element instanceof FindInfo) {
-			const label: string = element.toString();
-			const treeItem: vscode.TreeItem = new vscode.TreeItem(label);
-			treeItem.tooltip = element.text;
-
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-			const args: any[] = [this];
-			treeItem.command = {
-				arguments: args,
-				command: "findallinfile.copyResults",
-				title: "",
-			};
-			return treeItem;
+			return this.itemFromInfo(element);
 		}
 
 		if (element instanceof FindResult) {
-			const labelStr: string = element.toString();
-			const labelStrIndex: number = labelStr.indexOf(element.text);
-			const highlight: [number, number] = [labelStrIndex + element.columnBegin, labelStrIndex + element.columnEnd];
-			const label: vscode.TreeItemLabel = { highlights: [highlight], label: labelStr };
-			const treeItem: vscode.TreeItem = new vscode.TreeItem(label);
-			if (typeof this.doc !== "undefined") {
-				treeItem.tooltip = element.toMarkdown();
-
-				// eslint-disable-next-line @typescript-eslint/no-explicit-any
-				const args: any[] = [this.doc, element.line, element.columnBegin, element.columnEnd];
-				treeItem.command = {
-					arguments: args,
-					command: "findallinfile.viewResult",
-					title: "",
-				};
-			}
-			return treeItem;
+			return this.itemFromResult(element);
 		}
 
 		return new vscode.TreeItem("");
@@ -146,4 +117,37 @@ export class TreeDataProvider implements vscode.TreeDataProvider<TreeElement>, I
 	private refreshTree(): void {
 		this.eventEmitter.fire(new FindInfo(""));
 	}
+
+	private itemFromInfo(element: Readonly<FindInfo>): vscode.TreeItem {
+		const label: string = element.toString();
+		const treeItem: vscode.TreeItem = new vscode.TreeItem(label);
+		treeItem.tooltip = element.text;
+
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		const args: any[] = [this];
+		treeItem.command = {
+			arguments: args,
+			command: "findallinfile.copyResults",
+			title: "",
+		};
+		return treeItem;
+	}
+
+	private itemFromResult(element: Readonly<FindResult>): vscode.TreeItem {
+		const highlight: [number, number] = [element.trimmedColumnBegin, element.trimmedColumnEnd];
+		const label: vscode.TreeItemLabel = { highlights: [highlight], label: element.trimmedText };
+		const treeItem: vscode.TreeItem = new vscode.TreeItem(label);
+		if (typeof this.doc !== "undefined") {
+			treeItem.tooltip = element.toMarkdown();
+
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			const args: any[] = [this.doc, element.line, element.columnBegin, element.columnEnd];
+			treeItem.command = {
+				arguments: args,
+				command: "findallinfile.viewResult",
+				title: "",
+			};
+		}
+		return treeItem;
+	}
 }