Incrementally reparse regex nodes

Author: RedCMD

src/DiagnosticCollection.ts

@@ -163,7 +163,7 @@ function Diagnostics(document: vscode.TextDocument) {
 							type == ',' ?
 								new vscode.Range(
 									toPosition(node.previousSibling.endPosition),
-									toPosition(node.previousSibling.endPosition)
+									toPosition(node.previousSibling.endPosition),
 								)
 								: range,
 						message: `'${parentType}' is missing character${type.length > 1 ? 's' : ''} '${type}'`,
@@ -184,8 +184,13 @@ function Diagnostics(document: vscode.TextDocument) {
 		// vscode.window.showInformationMessage(JSON.stringify("diagnostics Regex"));
 		// const start = performance.now();
 		const regexTrees = trees.regexTrees;
-		for (const id in regexTrees) {
-			const tree = regexTrees[id];
+		for (const tree of regexTrees.values()) {
+			// diagnostics.push({
+			// 	range: toRange(tree.rootNode),
+			// 	message: tree.rootNode.text,
+			// 	severity: vscode.DiagnosticSeverity.Information,
+			// 	source: 'regex',
+			// });
 			// vscode.window.showInformationMessage(JSON.stringify(tree.rootNode.toString()));
 
 			const queryString = `;scm
@@ -303,11 +308,11 @@ function Diagnostics(document: vscode.TextDocument) {
 		// const start = performance.now();
 		const regexNodes = trees.regexNodes;
 
-		for (const id in regexNodes) {
-			const regexNode = regexNodes[id];
+		for (const regexNode of regexNodes.values()) {
 			const text = regexNode.text;
 			const key = regexNode.previousNamedSibling;
 			if (!key) { // `previousNamedSibling` is broken on 0width nodes
+				vscode.window.showInformationMessage("0width broken!!");
 				continue;
 			}
 

src/Providers/CodeActionsProvider.ts

@@ -14,6 +14,7 @@ export const CodeActionsProvider: vscode.CodeActionProvider = {
 	provideCodeActions(document: vscode.TextDocument, range: vscode.Range | vscode.Selection, context: vscode.CodeActionContext, token: vscode.CancellationToken): vscode.CodeAction[] {
 		// vscode.window.showInformationMessage(JSON.stringify("CodeActions"));
 		// vscode.window.showInformationMessage(JSON.stringify(context));
+		// const start = performance.now();
 
 		const codeActions: vscode.CodeAction[] = [];
 		let codeAction: CodeAction;
@@ -87,15 +88,14 @@ export const CodeActionsProvider: vscode.CodeActionProvider = {
 
 		const trees = getTrees(document);
 		const regexNodes = trees.regexNodes;
-		for (const key in regexNodes) {
-			const regexNode = regexNodes[key];
+		for (const regexNode of regexNodes.values()) {
 			const parentRange = toRange(trueParent(regexNode));
 			if (parentRange.intersection(range)) {
 				codeAction = {
 					title: `Minify Regex`,
 					kind: vscode.CodeActionKind.RefactorRewrite.append("minify"),
 					document: document,
-					nodeId: <number><unknown>key, // why?
+					nodeId: regexNode.id,
 				};
 				codeActions.push(codeAction);
 				minifyRegex = true;
@@ -112,10 +112,12 @@ export const CodeActionsProvider: vscode.CodeActionProvider = {
 		}
 
 		// vscode.window.showInformationMessage(JSON.stringify(codeActions));
+		// vscode.window.showInformationMessage(`codeActions ${performance.now() - start}ms`);
 		return codeActions;
 	},
 	resolveCodeAction(codeAction: CodeAction, token: vscode.CancellationToken): vscode.CodeAction {
 		// vscode.window.showInformationMessage(JSON.stringify(codeAction));
+		// const start = performance.now();
 		const document = codeAction.document;
 		const uri = document.uri;
 
@@ -126,24 +128,23 @@ export const CodeActionsProvider: vscode.CodeActionProvider = {
 		const id = codeAction.nodeId;
 
 		if (id == -1) {
-			for (const key in regexTrees) {
-				const regexTree = regexTrees[key];
+			for (const regexTree of regexTrees.values()) {
 				const rootNode = regexTree.rootNode;
 				rootNodes.push(rootNode);
 			}
 		}
 		else {
 			const regexNodes = trees.regexNodes;
-			const jsonNode = regexNodes[id];
-			const regexTree = regexTrees[jsonNode.id];
+			const jsonNode = regexNodes.get(id);
+			const regexTree = regexTrees.get(jsonNode.id);
 			const rootNode = regexTree.rootNode;
 			rootNodes.push(rootNode);
 		}
 
 		const edit = new vscode.WorkspaceEdit;
 
 		for (const rootNode of rootNodes) {
-			const minifyQuery = `
+			const minifyQuery = `;scm
 				(backslash) @backslash
 				(comment_group) @comment
 				(comment_extended) @comment
@@ -300,6 +301,7 @@ export const CodeActionsProvider: vscode.CodeActionProvider = {
 
 		// vscode.window.showInformationMessage(JSON.stringify(edit));
 		codeAction.edit = edit;
+		// vscode.window.showInformationMessage(`codeAction ${performance.now() - start}ms`);
 		return codeAction;
 	},
 };

src/Providers/CompletionItemProvider.ts

@@ -27,7 +27,7 @@ export const CompletionItemProvider: vscode.CompletionItemProvider = {
 		const rootNode = tree.rootNode;
 		const point = toPoint(position);
 
-		const cursorQuery = `
+		const cursorQuery = `;scm
 			(schema (value) @schema)
 			(scopeName (value) @scopeName)
 			(name_display (value) @name)
@@ -319,7 +319,7 @@ export const CompletionItemProvider: vscode.CompletionItemProvider = {
 				}
 
 				const scopes: string[] = [];
-				const scopeQuery = `
+				const scopeQuery = `;scm
 					(name (value (scope) @scope (.not-match? @scope "^(\\\\$0*[0-9]{1,3})+$")))
 					(contentName (value (scope) @scope (.not-match? @scope "^(\\\\$0*[0-9]{1,3})+$")))
 				`;
@@ -359,9 +359,9 @@ export const CompletionItemProvider: vscode.CompletionItemProvider = {
 
 				break;
 			case 'regex':
-				const regexRootNode = trees.regexTrees[cursorNode.id].rootNode;
+				const regexRootNode = trees.regexTrees.get(cursorNode.id).rootNode;
 
-				const regexQuery = `
+				const regexQuery = `;scm
 					(character_property (character_property_name) @property)
 				`;
 				const regexCapture = queryNode(regexRootNode, regexQuery, point);

src/Providers/DefinitionProvider.ts

@@ -377,7 +377,7 @@ function pushDefinitionLink(definitions: vscode.LocationLink[], node: SyntaxNode
 
 function getCaptureRefs(trees: trees, node: SyntaxNode, position: vscode.Position) {
 	const regexTrees = trees.regexTrees;
-	const regexNode = regexTrees[node.id]?.rootNode;
+	const regexNode = regexTrees.get(node.id)?.rootNode;
 
 	const captureGroupQuery = `;scm
 		(capture_group) @group
@@ -439,7 +439,7 @@ function getRegexGroup(trees: trees, parentNode: SyntaxNode, captureNode: Syntax
 	}
 	const regexTrees = trees.regexTrees;
 	const id = node.childForFieldName('regex').id;
-	const regexNode = regexTrees[id]?.rootNode;
+	const regexNode = regexTrees.get(id)?.rootNode;
 
 	const index = parseInt(captureNode.text.replace('$', '')); // Ignores random characters after the first numerics, just like VSCode TextMate
 	if (index == 0) {

src/Providers/HoverProvider.ts

@@ -16,7 +16,7 @@ export const HoverProvider: vscode.HoverProvider = {
 
 		if (node.type == 'regex') {
 			const regexTrees = getTrees(document).regexTrees;
-			const regexTree = regexTrees[node.id];
+			const regexTree = regexTrees.get(node.id);
 			const regexNode = regexTree.rootNode.descendantForPosition(point);
 			const parentNode = regexNode.parent;
 			const markdownString = new vscode.MarkdownString();
@@ -46,4 +46,4 @@ export const HoverProvider: vscode.HoverProvider = {
 			return hover;
 		}
 	}
-}
+}