@vituum/vite-plugin-latte 1.0.0-beta.1 → 1.1.0

package/vendor/latte/latte/src/Latte/Compiler/TemplateGenerator.php

@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 namespace Latte\Compiler;
 
-use Latte;
 use Latte\ContentType;
 
 
@@ -18,8 +17,6 @@ use Latte\ContentType;
  */
 final class TemplateGenerator
 {
-	use Latte\Strict;
-
 	/** @var array<string, ?array{body: string, arguments: string, returns: string, comment: ?string}> */
 	private array $methods = [];
 
@@ -36,7 +33,7 @@ final class TemplateGenerator
 	public function generate(
 		Nodes\TemplateNode $node,
 		string $className,
-		?string $comment = null,
+		?string $sourceName = null,
 		bool $strictMode = false,
 	): string
 	{
@@ -57,6 +54,10 @@ final class TemplateGenerator
 			$this->addConstant('ContentType', $node->contentType);
 		}
 
+		if ($sourceName !== null) {
+			$this->addConstant('Source', $sourceName);
+		}
+
 		$this->generateBlocks($context->blocks, $context);
 
 		$members = [];
@@ -79,7 +80,7 @@ final class TemplateGenerator
 		$code = "<?php\n\n"
 			. ($strictMode ? "declare(strict_types=1);\n\n" : '')
 			. "use Latte\\Runtime as LR;\n\n"
-			. ($comment === null ? '' : '/** ' . str_replace('*/', '* /', $comment) . " */\n")
+			. ($sourceName === null ? '' : '/** source: ' . str_replace('*/', '* /', $sourceName) . " */\n")
 			. "final class $className extends Latte\\Runtime\\Template\n{\n"
 			. implode("\n\n", $members)
 			. "\n}\n";

package/vendor/latte/latte/src/Latte/Compiler/TemplateLexer.php

@@ -9,15 +9,22 @@ declare(strict_types=1);
 
 namespace Latte\Compiler;
 
-use Latte;
 use Latte\CompileException;
-use Latte\ContentType;
-use Latte\RegexpException;
 
 
 final class TemplateLexer
 {
-	use Latte\Strict;
+	public const
+		StatePlain = 'Plain',
+		StateLatteTag = 'LatteTag',
+		StateLatteComment = 'LatteComment',
+		StateHtmlText = 'HtmlText',
+		StateHtmlTag = 'HtmlTag',
+		StateHtmlQuotedValue = 'HtmlQuotedValue',
+		StateHtmlQuotedNAttrValue = 'HtmlQuotedNAttrValue',
+		StateHtmlRawText = 'HtmlRawText',
+		StateHtmlComment = 'HtmlComment',
+		StateHtmlBogus = 'HtmlBogus';
 
 	/** HTML tag name for Latte needs (actually is [a-zA-Z][^\s/>]*) */
 	public const ReTagName = '[a-zA-Z][a-zA-Z0-9:_.-]*';
@@ -27,45 +34,50 @@ final class TemplateLexer
 
 	/** HTML attribute name/value (\p{C} means \x00-\x1F except space) */
 	private const ReAttrName = '[^\p{C} "\'<>=`/]';
-	private const StateEnd = 'end';
 
 	public string $openDelimiter;
 	public string $closeDelimiter;
 	private TagLexer $tagLexer;
 
 	/** @var array<array{name: string, args: mixed[]}> */
-	private array $states;
+	private array $states = [];
 	private string $input;
 	private Position $position;
-	private bool $xmlMode;
 
 
-	/** @return \Generator<Token> */
-	public function tokenize(string $template, string $contentType = ContentType::Html): \Generator
+	public function __construct()
 	{
-		$this->position = new Position(1, 1, 0);
-		$this->input = $this->normalize($template);
-		$this->states = [];
-		$this->setContentType($contentType);
+		$this->position = new Position;
+		$this->setState(self::StatePlain);
 		$this->setSyntax(null);
 		$this->tagLexer = new TagLexer;
+	}
+
+
+	/** @return \Generator<Token> */
+	public function tokenize(string $template): \Generator
+	{
+		$this->input = $this->normalize($template);
 
 		do {
+			$offset = $this->position->offset;
 			$state = $this->states[0];
-			yield from $this->{$state['name']}(...$state['args']);
-		} while ($this->states[0]['name'] !== self::StateEnd);
+			$tokens = $this->{"state$state[name]"}(...$state['args']);
+			yield from $tokens;
+
+		} while ($offset !== $this->position->offset);
 
-		if ($this->position->offset < strlen($this->input)) {
-			throw new CompileException("Unexpected '" . substr($this->input, $this->position->offset, 10) . "'", $this->position);
+		if ($offset < strlen($this->input)) {
+			throw new CompileException("Unexpected '" . substr($this->input, $offset, 10) . "'", $this->position);
 		}
 
 		yield new Token(Token::End, '', $this->position);
 	}
 
 
-	private function statePlain(): \Generator
+	private function statePlain(): array
 	{
-		$m = yield from $this->match('~
+		return $this->match('~
 			(?<Text>.+?)??
 			(?<Indentation>(?<=\n|^)[ \t]+)?
 			(
@@ -74,163 +86,102 @@ final class TemplateLexer
 				$
 			)
 		~xsiAuD');
-
-		if (isset($m['Latte_TagOpen'])) {
-			$this->pushState('stateLatteTag');
-		} elseif (isset($m['Latte_CommentOpen'])) {
-			$this->pushState('stateLatteComment');
-		} else {
-			$this->setState(self::StateEnd);
-		}
 	}
 
 
-	private function stateLatteTag(): \Generator
+	private function stateLatteTag(): array
 	{
-		$pos = $this->states[0]['pos'];
-		$this->popState();
-
-		yield from $this->match('~
+		$tokens[] = $this->match('~
 			(?<Slash>/)?
 			(?<Latte_Name> = | _(?!_) | [a-z]\w*+(?:[.:-]\w+)*+(?!::|\(|\\\\))?   # name, /name, but not function( or class:: or namespace\
 		~xsiAu');
 
-		yield from $this->tagLexer->tokenizePartially($this->input, $this->position);
+		$tokens[] = $this->tagLexer->tokenizePartially($this->input, $this->position);
 
-		yield from $this->match('~
+		$tokens[] = $this->match('~
 			(?<Slash>/)?
 			(?<Latte_TagClose>' . $this->closeDelimiter . ')
 			(?<Newline>[ \t]*\R)?
-		~xsiAu')
-		or throw new CompileException('Unterminated Latte tag', $pos);
+		~xsiAu');
+
+		return array_merge(...$tokens);
 	}
 
 
-	private function stateLatteComment(): \Generator
+	private function stateLatteComment(): array
 	{
-		yield from $this->match('~
+		return $this->match('~
 			(?<Text>.+?)??
-			(?<Latte_CommentClose>\*' . $this->closeDelimiter . ')
-			(?<Newline>[ \t]*\R{1,2})?
-		~xsiAu')
-		or throw new CompileException('Unterminated Latte comment', $this->states[0]['pos']);
-		$this->popState();
+			(
+				(?<Latte_CommentClose>\*' . $this->closeDelimiter . ')(?<Newline>[ \t]*\R{1,2})?|
+				$
+			)
+		~xsiAu');
 	}
 
 
-	private function stateHtmlText(): \Generator
+	private function stateHtmlText(): array
 	{
-		$m = yield from $this->match('~(?J)
+		return $this->match('~(?J)
 			(?<Text>.+?)??
 			(
-				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Html_TagOpen><)(?<Slash>/)?(?<Html_Name>' . self::ReTagName . ')|  # <tag </tag
+				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Html_TagOpen><)(?<Slash>/)?(?=[a-z]|' . $this->openDelimiter . ')|  # < </ tag
 				(?<Html_CommentOpen><!--(?!>|->))|                                                      # <!-- comment
-				(?<Html_BogusOpen><[/?!])|                                                              # <!doctype <?xml or error
+				(?<Html_BogusOpen><[?!])|                                                               # <!doctype <?xml or error
 				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Latte_TagOpen>' . $this->openDelimiter . '(?!\*))|   # {tag
 				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)|   # {* comment
 				$
 			)
 		~xsiAuD');
-
-		if (isset($m['Html_TagOpen'])) {
-			$tagName = isset($m['Slash']) ? null : strtolower($m['Html_Name']);
-			$this->setState('stateHtmlTag', $tagName);
-		} elseif (isset($m['Html_CommentOpen'])) {
-			$this->setState('stateHtmlComment');
-		} elseif (isset($m['Html_BogusOpen'])) {
-			$this->setState('stateHtmlBogus');
-		} elseif (isset($m['Latte_TagOpen'])) {
-			$this->pushState('stateLatteTag');
-		} elseif (isset($m['Latte_CommentOpen'])) {
-			$this->pushState('stateLatteComment');
-		} else {
-			$this->setState(self::StateEnd);
-		}
 	}
 
 
-	private function stateHtmlTag(?string $tagName = null, ?string $attrName = null): \Generator
+	private function stateHtmlTag(): array
 	{
-		$m = yield from $this->match('~
+		return $this->match('~(?J)
+			(?<Equals>=)
+				(?<Whitespace>\s+)?
+				(?<Html_Name>(?:(?!' . $this->openDelimiter . ')' . self::ReAttrName . '|/)+)?  # HTML attribute value can contain /
+			|
 			(?<Whitespace>\s+)|                                        # whitespace
-			(?<Equals>=)|
 			(?<Quote>["\'])|
 			(?<Slash>/)?(?<Html_TagClose>>)(?<Newline>[ \t]*\R)?|      # > />
 			(?<Html_Name>(?:(?!' . $this->openDelimiter . ')' . self::ReAttrName . ')+)|  # HTML attribute name/value
 			(?<Latte_TagOpen>' . $this->openDelimiter . '(?!\*))|      # {tag
 			(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)       # {* comment
 		~xsiAu');
-
-		if (isset($m['Html_Name'])) {
-			$this->states[0]['args'][1] = $m['Html_Name']; // sets $attrName
-		} elseif (isset($m['Equals'])) {
-			yield from $this->match('~
-				(?<Whitespace>\s+)?                                    # whitespace
-				(?<Html_Name>(?:(?!' . $this->openDelimiter . ')' . self::ReAttrName . '|/)+)  # HTML attribute value can contain /
-			~xsiAu');
-		} elseif (isset($m['Whitespace'])) {
-		} elseif (isset($m['Quote'])) {
-			$this->pushState(str_starts_with($attrName ?? '', self::NPrefix)
-				? 'stateHtmlQuotedNAttrValue'
-				: 'stateHtmlQuotedValue', $m['Quote']);
-		} elseif (
-			isset($m['Html_TagClose'])
-			&& !$this->xmlMode
-			&& !isset($m['Slash'])
-			&& in_array($tagName, ['script', 'style'], true)
-		) {
-			$this->setState('stateHtmlRawText', $tagName);
-		} elseif (isset($m['Html_TagClose'])) {
-			$this->setState('stateHtmlText');
-		} elseif (isset($m['Latte_TagOpen'])) {
-			$this->pushState('stateLatteTag');
-		} elseif (isset($m['Latte_CommentOpen'])) {
-			$this->pushState('stateLatteComment');
-		} else {
-			$this->setState(self::StateEnd);
-		}
 	}
 
 
-	private function stateHtmlQuotedValue(string $quote): \Generator
+	private function stateHtmlQuotedValue(string $quote): array
 	{
-		$m = yield from $this->match('~
-			(?<Text>.+?)??(
+		return $this->match('~
+			(?<Text>.+?)??
+			(
 				(?<Quote>' . $quote . ')|
 				(?<Latte_TagOpen>' . $this->openDelimiter . '(?!\*))|      # {tag
-				(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)       # {* comment
+				(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)|      # {* comment
+				$
 			)
 		~xsiAu');
-
-		if (isset($m['Quote'])) {
-			$this->popState();
-		} elseif (isset($m['Latte_TagOpen'])) {
-			$this->pushState('stateLatteTag');
-		} elseif (isset($m['Latte_CommentOpen'])) {
-			$this->pushState('stateLatteComment');
-		} else {
-			throw new CompileException('Unterminated HTML attribute value', $this->states[0]['pos']);
-		}
 	}
 
 
-	private function stateHtmlQuotedNAttrValue(string $quote): \Generator
+	private function stateHtmlQuotedNAttrValue(string $quote): array
 	{
-		$m = yield from $this->match('~
-			(?<Text>.+?)??(?<Quote>' . $quote . ')|
+		return $this->match('~
+			(?<Text>.+?)??
+			(
+				(?<Quote>' . $quote . ')|
+				$
+			)
 		~xsiAu');
-
-		if (isset($m['Quote'])) {
-			$this->popState();
-		} else {
-			throw new CompileException('Unterminated n:attribute value', $this->states[0]['pos']);
-		}
 	}
 
 
-	private function stateHtmlRawText(string $tagName): \Generator
+	private function stateHtmlRawText(string $tagName): array
 	{
-		$m = yield from $this->match('~
+		return $this->match('~
 			(?<Text>.+?)??
 			(?<Indentation>(?<=\n|^)[ \t]+)?
 			(
@@ -240,114 +191,82 @@ final class TemplateLexer
 				$
 			)
 		~xsiAu');
-
-		if (isset($m['Html_TagOpen'])) {
-			$this->setState('stateHtmlTag');
-		} elseif (isset($m['Latte_TagOpen'])) {
-			$this->pushState('stateLatteTag');
-		} elseif (isset($m['Latte_CommentOpen'])) {
-			$this->pushState('stateLatteComment');
-		} else {
-			$this->setState(self::StateEnd);
-		}
 	}
 
 
-	private function stateHtmlComment(): \Generator
+	private function stateHtmlComment(): array
 	{
-		$m = yield from $this->match('~(?J)
+		return $this->match('~(?J)
 			(?<Text>.+?)??
 			(
 				(?<Html_CommentClose>-->)|                                                              # -->
 				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Latte_TagOpen>' . $this->openDelimiter . '(?!\*))|   # {tag
-				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)    # {* comment
+				(?<Indentation>(?<=\n|^)[ \t]+)?(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)|   # {* comment
+				$
 			)
 		~xsiAu');
-
-		if (isset($m['Html_CommentClose'])) {
-			$this->setState('stateHtmlText');
-		} elseif (isset($m['Latte_TagOpen'])) {
-			$this->pushState('stateLatteTag');
-		} elseif (isset($m['Latte_CommentOpen'])) {
-			$this->pushState('stateLatteComment');
-		} else {
-			throw new CompileException('Unterminated HTML comment', $this->states[0]['pos']);
-		}
 	}
 
 
-	private function stateHtmlBogus(): \Generator
+	private function stateHtmlBogus(): array
 	{
-		$m = yield from $this->match('~
-			(?<Text>.+?)??(
+		return $this->match('~
+			(?<Text>.+?)??
+			(
 				(?<Html_TagClose>>)|                                       # >
 				(?<Latte_TagOpen>' . $this->openDelimiter . '(?!\*))|      # {tag
-				(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)       # {* comment
+				(?<Latte_CommentOpen>' . $this->openDelimiter . '\*)|      # {* comment
+				$
 			)
 		~xsiAu');
-
-		if (isset($m['Html_TagClose'])) {
-			$this->setState('stateHtmlText');
-		} elseif (isset($m['Latte_TagOpen'])) {
-			$this->pushState('stateLatteTag');
-		} elseif (isset($m['Latte_CommentOpen'])) {
-			$this->pushState('stateLatteComment');
-		} else {
-			throw new CompileException('Unterminated HTML tag', $this->states[0]['pos']);
-		}
 	}
 
 
 	/**
 	 * Matches next token.
+	 * @return Token[]
 	 */
-	private function match(string $re): \Generator
+	private function match(string $re): array
 	{
 		preg_match($re, $this->input, $matches, PREG_UNMATCHED_AS_NULL, $this->position->offset);
 		if (preg_last_error()) {
-			throw new RegexpException;
+			throw new CompileException(preg_last_error_msg());
 		}
 
+		$tokens = [];
 		foreach ($matches as $k => $v) {
 			if ($v !== null && !\is_int($k)) {
-				yield new Token(\constant(Token::class . '::' . $k), $v, $this->position);
+				$tokens[] = new Token(\constant(Token::class . '::' . $k), $v, $this->position);
 				$this->position = $this->position->advance($v);
 			}
 		}
 
-		return $matches;
+		return $tokens;
 	}
 
 
-	public function setContentType(string $type): static
+	public function setState(string $state, ...$args): void
 	{
-		if ($type === ContentType::Html || $type === ContentType::Xml) {
-			$this->setState('stateHtmlText');
-			$this->xmlMode = $type === ContentType::Xml;
-		} else {
-			$this->setState('statePlain');
-		}
-
-		return $this;
+		$this->states[0] = ['name' => $state, 'args' => $args];
 	}
 
 
-	private function setState(string $state, ...$args): void
+	public function pushState(string $state, ...$args): void
 	{
-		$this->states[0] = ['name' => $state, 'args' => $args, 'pos' => $this->position];
+		array_unshift($this->states, null);
+		$this->setState($state, ...$args);
 	}
 
 
-	private function pushState(string $state, ...$args): void
+	public function popState(): void
 	{
-		array_unshift($this->states, null);
-		$this->setState($state, ...$args);
+		array_shift($this->states);
 	}
 
 
-	private function popState(): void
+	public function getState(): string
 	{
-		array_shift($this->states);
+		return $this->states[0]['name'];
 	}
 
 

package/vendor/latte/latte/src/Latte/Compiler/TemplateParser.php

@@ -21,17 +21,11 @@ use Latte\SecurityViolationException;
 
 final class TemplateParser
 {
-	use Latte\Strict;
-
-	public const
-		LocationHead = 1,
-		LocationText = 2,
-		LocationTag = 3;
-
 	/** @var Block[][] */
 	public array $blocks = [[]];
 	public int $blockLayer = Template::LayerTop;
-	public int $location = self::LocationHead;
+	public bool $inHead = true;
+	public bool $strict = false;
 	public ?Nodes\TextNode $lastIndentation = null;
 
 	/** @var array<string, callable(Tag, self): (Node|\Generator|void)> */
@@ -42,27 +36,35 @@ final class TemplateParser
 
 	private TemplateParserHtml $html;
 	private ?TokenStream $stream = null;
-	private ?TemplateLexer $lexer = null;
+	private TemplateLexer $lexer;
 	private ?Policy $policy = null;
-	private string $contentType = ContentType::Html;
+	private string $contentType;
 	private int $counter = 0;
 	private ?Tag $tag = null;
 	private $lastResolver;
+	private \WeakMap $lookFor;
+
+
+	public function __construct()
+	{
+		$this->lexer = new TemplateLexer;
+		$this->setContentType(ContentType::Html);
+	}
 
 
 	/**
 	 * Parses tokens to nodes.
 	 * @throws CompileException
 	 */
-	public function parse(string $template, TemplateLexer $lexer): Nodes\TemplateNode
+	public function parse(string $template): Nodes\TemplateNode
 	{
-		$this->lexer = $lexer;
 		$this->html = new TemplateParserHtml($this, $this->completeAttrParsers());
-		$this->stream = new TokenStream($lexer->tokenize($template, $this->contentType));
+		$this->stream = new TokenStream($this->lexer->tokenize($template));
+		$this->lookFor = new \WeakMap;
 
 		$headLength = 0;
 		$findLength = function (FragmentNode $fragment) use (&$headLength) {
-			if ($this->location === self::LocationHead && !end($fragment->children) instanceof Nodes\TextNode) {
+			if ($this->inHead && !end($fragment->children) instanceof Nodes\TextNode) {
 				$headLength = count($fragment->children);
 			}
 		};
@@ -119,9 +121,7 @@ final class TemplateParser
 	public function parseText(): Nodes\TextNode
 	{
 		$token = $this->stream->consume(Token::Text, Token::Html_Name);
-		if ($this->location === self::LocationHead && trim($token->text) !== '') {
-			$this->location = self::LocationText;
-		}
+		$this->inHead = $this->inHead && trim($token->text) === '';
 		$this->lastIndentation = null;
 		return new Nodes\TextNode($token->text, $token->position);
 	}
@@ -152,20 +152,25 @@ final class TemplateParser
 		if (str_ends_with($this->stream->peek(-1)?->text ?? "\n", "\n")) {
 			$this->lastIndentation ??= new Nodes\TextNode('');
 		}
-		$this->stream->consume(Token::Latte_CommentOpen);
+		$openToken = $this->stream->consume(Token::Latte_CommentOpen);
+		$this->lexer->pushState(TemplateLexer::StateLatteComment);
 		$this->stream->consume(Token::Text);
-		$this->stream->consume(Token::Latte_CommentClose);
+		$this->stream->tryConsume(Token::Latte_CommentClose) || $this->stream->throwUnexpectedException([Token::Latte_CommentClose], addendum: " started $openToken->position");
+		$this->lexer->popState();
 		return new Nodes\NopNode;
 	}
 
 
-	public function parseLatteStatement(): ?Node
+	public function parseLatteStatement(?callable $resolver = null): ?Node
 	{
+		$this->lexer->pushState(TemplateLexer::StateLatteTag);
 		if ($this->stream->peek(1)->is(Token::Slash)
-			|| isset($this->tag->data->filters) && in_array($this->stream->peek(1)->text, $this->tag->data->filters, true)
+			|| (isset($this->tag, $this->lookFor[$this->tag]) && in_array($this->stream->peek(1)->text, $this->lookFor[$this->tag], true))
 		) {
+			$this->lexer->popState();
 			return null; // go back to previous parseLatteStatement()
 		}
+		$this->lexer->popState();
 
 		$token = $this->stream->peek();
 		$startTag = $this->pushTag($this->parseLatteTag());
@@ -186,8 +191,8 @@ final class TemplateParser
 				$res->send([new FragmentNode, $startTag]);
 			} else {
 				while ($res->valid()) {
-					$startTag->data->filters = $res->current() ?: null;
-					$content = $this->parseFragment($this->lastResolver);
+					$this->lookFor[$startTag] = $res->current() ?: null;
+					$content = $this->parseFragment($resolver ?? $this->lastResolver);
 
 					if (!$this->stream->is(Token::Latte_TagOpen)) {
 						$this->checkEndTag($startTag, null);
@@ -206,7 +211,7 @@ final class TemplateParser
 						$res->send([$content, $tag]);
 						$this->ensureIsConsumed($tag);
 						break;
-					} elseif (in_array($tag->name, $startTag->data->filters ?? [], true)) {
+					} elseif (in_array($tag->name, $this->lookFor[$startTag] ?? [], true)) {
 						$this->pushTag($tag);
 						$res->send([$content, $tag]);
 						$this->ensureIsConsumed($tag);
@@ -238,9 +243,7 @@ final class TemplateParser
 			throw new \LogicException("Incorrect behavior of {{$startTag->name}} parser, unexpected returned value (on line {$startTag->position->line})");
 		}
 
-		if ($this->location === self::LocationHead && $startTag->outputMode !== $startTag::OutputNone) {
-			$this->location = self::LocationText;
-		}
+		$this->inHead = $this->inHead && $startTag->outputMode === $startTag::OutputNone;
 
 		$this->popTag();
 
@@ -256,17 +259,21 @@ final class TemplateParser
 			$this->lastIndentation ??= new Nodes\TextNode('');
 		}
 
+		$inTag = in_array($this->lexer->getState(), [TemplateLexer::StateHtmlTag, TemplateLexer::StateHtmlQuotedValue, TemplateLexer::StateHtmlComment, TemplateLexer::StateHtmlBogus], true);
 		$openToken = $stream->consume(Token::Latte_TagOpen);
+		$this->lexer->pushState(TemplateLexer::StateLatteTag);
 		$tag = new Tag(
 			position: $openToken->position,
 			closing: $closing = (bool) $stream->tryConsume(Token::Slash),
 			name: $stream->tryConsume(Token::Latte_Name)?->text ?? ($closing ? '' : '='),
 			tokens: $this->consumeTag(),
 			void: (bool) $stream->tryConsume(Token::Slash),
-			location: $this->location,
+			inHead: $this->inHead,
+			inTag: $inTag,
 			htmlElement: $this->html->getElement(),
 		);
-		$stream->consume(Token::Latte_TagClose);
+		$stream->tryConsume(Token::Latte_TagClose) || $stream->throwUnexpectedException([Token::Latte_TagClose], addendum: " started $openToken->position");
+		$this->lexer->popState();
 		return $tag;
 	}
 
@@ -309,9 +316,7 @@ final class TemplateParser
 			$hint = ($t = Helpers::getSuggestion(array_keys($this->tagParsers), $name))
 				? ", did you mean {{$t}}?"
 				: '';
-			if ($this->contentType === ContentType::Html
-				&& in_array($this->html->getElement()?->name, ['script', 'style'], true)
-			) {
+			if ($this->html->getElement()?->isRawText()) {
 				$hint .= ' (in JavaScript or CSS, try to put a space after bracket or use n:syntax=off)';
 			}
 			throw new CompileException("Unexpected tag {{$name}}$hint", $pos);
@@ -391,7 +396,9 @@ final class TemplateParser
 	public function setContentType(string $type): static
 	{
 		$this->contentType = $type;
-		$this->lexer?->setContentType($type);
+		$this->lexer->setState($type === ContentType::Html || $type === ContentType::Xml
+			? TemplateLexer::StateHtmlText
+			: TemplateLexer::StatePlain);
 		return $this;
 	}