Lazy evaluation of voidElements (#187)

microsoft · Jun 24, 2024 · 907177e · 907177e
1 parent ca7588a
commit 907177e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/src/services/htmlCompletion.ts b/src/services/htmlCompletion.ts
@@ -64,7 +64,6 @@ export class HTMLCompletion {
 		};
 		const completionParticipants = this.completionParticipants;
 		const dataProviders = this.dataManager.getDataProviders().filter(p => p.isApplicable(document.languageId) && (!settings || settings[p.getId()] !== false));
-		const voidElements = this.dataManager.getVoidElements(dataProviders);
 		const doesSupportMarkdown = this.doesSupportMarkdown();
 
 		const text = document.getText();
@@ -78,6 +77,7 @@ export class HTMLCompletion {
 		const scanner = createScanner(text, node.start);
 		let currentTag: string = '';
 		let currentAttributeName: string;
+		let voidElements: string[] | undefined;
 
 		function getReplaceRange(replaceStart: number, replaceEnd: number = offset): Range {
 			if (replaceStart > offset) {
@@ -169,6 +169,7 @@ export class HTMLCompletion {
 			if (settings && settings.hideAutoCompleteProposals) {
 				return result;
 			}
+			voidElements ??= this.dataManager.getVoidElements(dataProviders);
 			if (!this.dataManager.isVoidElement(tag, voidElements)) {
 				const pos = document.positionAt(tagCloseEnd);
 				result.items.push({
@@ -534,16 +535,18 @@ export class HTMLCompletion {
 		}
 		const char = document.getText().charAt(offset - 1);
 		if (char === '>') {
-			const voidElements = this.dataManager.getVoidElements(document.languageId);
 			const node = htmlDocument.findNodeBefore(offset);
-			if (node && node.tag && !this.dataManager.isVoidElement(node.tag, voidElements) && node.start < offset && (!node.endTagStart || node.endTagStart > offset)) {
-				const scanner = createScanner(document.getText(), node.start);
-				let token = scanner.scan();
-				while (token !== TokenType.EOS && scanner.getTokenEnd() <= offset) {
-					if (token === TokenType.StartTagClose && scanner.getTokenEnd() === offset) {
-						return `$0</${node.tag}>`;
+			if (node && node.tag && node.start < offset && (!node.endTagStart || node.endTagStart > offset)) {
+				const voidElements = this.dataManager.getVoidElements(document.languageId);
+				if (!this.dataManager.isVoidElement(node.tag, voidElements)) {
+					const scanner = createScanner(document.getText(), node.start);
+					let token = scanner.scan();
+					while (token !== TokenType.EOS && scanner.getTokenEnd() <= offset) {
+						if (token === TokenType.StartTagClose && scanner.getTokenEnd() === offset) {
+							return `$0</${node.tag}>`;
+						}
+						token = scanner.scan();
 					}
-					token = scanner.scan();
 				}
 			}
 		} else if (char === '/') {

diff --git a/src/services/htmlFolding.ts b/src/services/htmlFolding.ts
@@ -84,13 +84,13 @@ export class HTMLFolding {
 	}
 
 	public getFoldingRanges(document: TextDocument, context: { rangeLimit?: number } | undefined): FoldingRange[] {
-		const voidElements = this.dataManager.getVoidElements(document.languageId);
 		const scanner = createScanner(document.getText());
 		let token = scanner.scan();
 		const ranges: FoldingRange[] = [];
 		const stack: { startLine: number, tagName: string }[] = [];
 		let lastTagName = null;
 		let prevStart = -1;
+		let voidElements: string[] | undefined;
 
 		function addRange(range: FoldingRange) {
 			ranges.push(range);
@@ -111,7 +111,11 @@ export class HTMLFolding {
 					break;
 				}
 				case TokenType.StartTagClose:
-					if (!lastTagName || !this.dataManager.isVoidElement(lastTagName, voidElements)) {
+					if (!lastTagName) {
+						break;
+					}
+					voidElements ??= this.dataManager.getVoidElements(document.languageId);
+					if (!this.dataManager.isVoidElement(lastTagName, voidElements)) {
 						break;
 					}
 				// fallthrough