Add regex failure handling

bnason-nf · May 7, 2020 · 9ee0584 · 9ee0584
1 parent e42fc86
commit 9ee0584
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 36 deletions.
diff --git a/src/findAllInFile.ts b/src/findAllInFile.ts
@@ -100,27 +100,33 @@ export function findRegexCase(
 		return;
 	}
 
-	outputSink.begin(doc, findText, true, true);
-
-	// Search each line of the document
-	const lineCount: number = doc.lineCount;
-	const findRegExp: RegExp = new RegExp(findText, "g");
-	for (let line: number = 0; line < lineCount; line += 1) {
-		const textLine: vscode.TextLine = doc.lineAt(line);
-		const text: string = textLine.text;
-		// Search for all the instances within each line
-		while (true) {
-			const match: RegExpExecArray | null = findRegExp.exec(text);
-			if (match === null) {
-				break;
+	try {
+		const findRegExp: RegExp = new RegExp(findText, "g");
+
+		outputSink.begin(doc, findText, true, true);
+
+		// Search each line of the document
+		const lineCount: number = doc.lineCount;
+		for (let line: number = 0; line < lineCount; line += 1) {
+			const textLine: vscode.TextLine = doc.lineAt(line);
+			const text: string = textLine.text;
+			// Search for all the instances within each line
+			while (true) {
+				const match: RegExpExecArray | null = findRegExp.exec(text);
+				if (match === null) {
+					break;
+				}
+				outputSink.item(
+					new FindResult(text, line, match.index, findRegExp.lastIndex)
+				);
 			}
-			outputSink.item(
-				new FindResult(text, line, match.index, findRegExp.lastIndex)
-			);
 		}
-	}
 
-	outputSink.end();
+		outputSink.end();
+	} catch (e) {
+		// tslint:disable:no-unsafe-any
+		outputSink.regexFailure(e);
+	}
 }
 
 // Search for all occurrences of a case insensitive search regex within the current file
@@ -135,25 +141,31 @@ export function findRegexNoCase(
 		return;
 	}
 
-	outputSink.begin(doc, findText, true, true);
-
-	// Search each line of the document
-	const lineCount: number = doc.lineCount;
-	const findRegExp: RegExp = new RegExp(findText, "gi");
-	for (let line: number = 0; line < lineCount; line += 1) {
-		const textLine: vscode.TextLine = doc.lineAt(line);
-		const text: string = textLine.text;
-		// Search for all the instances within each line
-		while (true) {
-			const match: RegExpExecArray | null = findRegExp.exec(text);
-			if (match === null) {
-				break;
+	try {
+		const findRegExp: RegExp = new RegExp(findText, "gi");
+
+		outputSink.begin(doc, findText, true, true);
+
+		// Search each line of the document
+		const lineCount: number = doc.lineCount;
+		for (let line: number = 0; line < lineCount; line += 1) {
+			const textLine: vscode.TextLine = doc.lineAt(line);
+			const text: string = textLine.text;
+			// Search for all the instances within each line
+			while (true) {
+				const match: RegExpExecArray | null = findRegExp.exec(text);
+				if (match === null) {
+					break;
+				}
+				outputSink.item(
+					new FindResult(text, line, match.index, findRegExp.lastIndex)
+				);
 			}
-			outputSink.item(
-				new FindResult(text, line, match.index, findRegExp.lastIndex)
-			);
 		}
-	}
 
-	outputSink.end();
+		outputSink.end();
+	} catch (e) {
+		// tslint:disable:no-unsafe-any
+		outputSink.regexFailure(e);
+	}
 }
diff --git a/src/iOutputSink.ts b/src/iOutputSink.ts
@@ -11,4 +11,5 @@ export interface IOutputSink {
 	end(): void;
 	item(findResult: FindResult): void;
 	noDocument(): void;
+	regexFailure(e: string): void;
 }
diff --git a/src/treeDataProvider.ts b/src/treeDataProvider.ts
@@ -82,6 +82,12 @@ export class TreeDataProvider implements vscode.TreeDataProvider<FindResult>, IO
 		this.refreshTree();
 	}
 
+	public regexFailure(e: string): void {
+		this.findResults.length = 0;
+		this.findResults.push(new FindResult(`Regex failure: ${e}`));
+		this.refreshTree();
+	}
+
 	private refreshTree(): void {
 		this.eventEmitter.fire();
 	}