use a constant marker

Author: 43081j

packages/lit-analyzer/src/analyze/parse/document/virtual-document/virtual-ast-document.ts

@@ -4,30 +4,26 @@ import { DocumentOffset, DocumentRange, Range, SourceFilePosition, SourceFileRan
 import { intersects, makeSourceFileRange } from "../../../util/range-util";
 import { VirtualDocument } from "./virtual-document";
 
+const marker = `lit$analyzer$`;
+
 export class VirtualAstDocument implements VirtualDocument {
 	readonly fileName: string;
 	readonly location: SourceFileRange;
 	private readonly parts: (Expression | string)[];
-	protected readonly substitutions: WeakMap<Expression, string> = new WeakMap();
-	protected substitutionIndex: number = 0;
 
 	private _text?: string;
 
 	get text(): string {
 		if (this._text == null) {
 			let str = "";
 
-			let prevPart = "";
 			this.parts.forEach((part, i) => {
 				const isLastPart = i >= this.parts.length - 1;
 
 				if (typeof part === "string") {
 					str += part.substring(i === 0 ? 0 : 1, part.length - (isLastPart ? 0 : 2));
-					prevPart = part;
 				} else {
-					const substitution = this.substituteExpression(part, prevPart, this.parts[i + 1] as string);
-					this.substitutions.set(part, substitution);
-					str += substitution;
+					str += marker;
 				}
 			});
 
@@ -72,19 +68,15 @@ export class VirtualAstDocument implements VirtualDocument {
 					resultParts.push(substr);
 				}
 			} else {
-				const sub = this.substitutions.get(part);
-
-				if (sub) {
-					offset += sub.length;
+				offset += marker.length;
 
-					const expressionPartRange: Range = {
-						start: startOffset,
-						end: offset
-					};
+				const expressionPartRange: Range = {
+					start: startOffset,
+					end: offset
+				};
 
-					if (intersects(expressionPartRange, range)) {
-						resultParts.push(part);
-					}
+				if (intersects(expressionPartRange, range)) {
+					resultParts.push(part);
 				}
 			}
 		});
@@ -129,10 +121,6 @@ export class VirtualAstDocument implements VirtualDocument {
 			this.fileName = this.fileName = astNodeOrParts.getSourceFile().fileName;
 		}
 	}
-
-	protected substituteExpression(expression: Expression, prev: string, next: string | undefined): string {
-		return `la_expr_${this.substitutionIndex++}`;
-	}
 }
 
 function getPartsFromTaggedTemplate(astNode: TaggedTemplateExpression): { expressionParts: Expression[]; literalParts: Node[] } {

packages/lit-analyzer/test/parser/css-document/css-substitutions.ts

@@ -17,29 +17,29 @@ function isTemplateText(t: ExecutionContext, text: string, testFile: string) {
 }
 
 tsTest("Substitute for template followed by percent", t => {
-	isTemplateText(t, "{ div { transform-origin: 00% 01%; } }", "css`{ div { transform-origin: ${x}% ${y}%; } }`");
+	isTemplateText(t, "{ div { transform-origin: lit$analyzer$% lit$analyzer$%; } }", "css`{ div { transform-origin: ${x}% ${y}%; } }`");
 });
 
 tsTest("Substitute for template last in css list", t => {
-	isTemplateText(t, "{ div { border: 2px solid _0; } }", "css`{ div { border: 2px solid ${COLOR}; } }`");
+	isTemplateText(t, "{ div { border: 2px solid lit$analyzer$; } }", "css`{ div { border: 2px solid ${COLOR}; } }`");
 });
 
 tsTest("Substitute for template first in css list", t => {
-	isTemplateText(t, "{ div { border: _0 solid #ffffff; } }", "css`{ div { border: ${WIDTH} solid #ffffff; } }`");
+	isTemplateText(t, "{ div { border: lit$analyzer$ solid #ffffff; } }", "css`{ div { border: ${WIDTH} solid #ffffff; } }`");
 });
 
 tsTest("Substitute for template middle in css list", t => {
-	isTemplateText(t, "{ div { border: 2px _0 #ffffff; } }", "css`{ div { border: 2px ${STYLE} #ffffff; } }`");
+	isTemplateText(t, "{ div { border: 2px lit$analyzer$ #ffffff; } }", "css`{ div { border: 2px ${STYLE} #ffffff; } }`");
 });
 
 tsTest("Substitute for template css key-value pair", t => {
-	isTemplateText(t, "{ div { $_:_0; } }", "css`{ div { ${unsafeCSS('color: red')}; } }`");
+	isTemplateText(t, "{ div { lit$analyzer$; } }", "css`{ div { ${unsafeCSS('color: red')}; } }`");
 });
 
 tsTest("Substitute for template css value only", t => {
-	isTemplateText(t, "{ div { color: _0; } }", "css`{ div { color: ${unsafeCSS('red')}; } }`");
+	isTemplateText(t, "{ div { color: lit$analyzer$; } }", "css`{ div { color: ${unsafeCSS('red')}; } }`");
 });
 
 tsTest("Substitute for template css key only", t => {
-	isTemplateText(t, "{ div { $_0: red; } }", "css`{ div { ${unsafeCSS('color')}: red; } }`");
+	isTemplateText(t, "{ div { lit$analyzer$: red; } }", "css`{ div { ${unsafeCSS('color')}: red; } }`");
 });