reuse bracket matching logic

Author: Rich-Harris

packages/svelte/src/compiler/phases/1-parse/read/context.js

@@ -1,7 +1,12 @@
 /** @import { Location } from 'locate-character' */
 /** @import { Pattern } from 'estree' */
 /** @import { Parser } from '../index.js' */
-import { is_bracket_open, is_bracket_close, get_bracket_close } from '../utils/bracket.js';
+import {
+	is_bracket_open,
+	is_bracket_close,
+	get_bracket_close,
+	match_bracket
+} from '../utils/bracket.js';
 import { parse_expression_at } from '../acorn.js';
 import { regex_not_newline_characters } from '../../patterns.js';
 import * as e from '../../../errors.js';
@@ -71,75 +76,6 @@ export default function read_pattern(parser) {
 	}
 }
 
-/**
- * @param {Parser} parser
- * @param {number} start
- */
-function match_bracket(parser, start) {
-	const bracket_stack = [];
-
-	let i = start;
-
-	while (i < parser.template.length) {
-		let char = parser.template[i++];
-
-		if (char === "'" || char === '"' || char === '`') {
-			i = match_quote(parser, i, char);
-			continue;
-		}
-
-		if (is_bracket_open(char)) {
-			bracket_stack.push(char);
-		} else if (is_bracket_close(char)) {
-			const popped = /** @type {string} */ (bracket_stack.pop());
-			const expected = /** @type {string} */ (get_bracket_close(popped));
-
-			if (char !== expected) {
-				e.expected_token(i - 1, expected);
-			}
-
-			if (bracket_stack.length === 0) {
-				return i;
-			}
-		}
-	}
-
-	e.unexpected_eof(parser.template.length);
-}
-
-/**
- * @param {Parser} parser
- * @param {number} start
- * @param {string} quote
- */
-function match_quote(parser, start, quote) {
-	let is_escaped = false;
-	let i = start;
-
-	while (i < parser.template.length) {
-		const char = parser.template[i++];
-
-		if (is_escaped) {
-			is_escaped = false;
-			continue;
-		}
-
-		if (char === quote) {
-			return i;
-		}
-
-		if (char === '\\') {
-			is_escaped = true;
-		}
-
-		if (quote === '`' && char === '$' && parser.template[i] === '{') {
-			i = match_bracket(parser, i);
-		}
-	}
-
-	e.unterminated_string_constant(start);
-}
-
 /**
  * @param {Parser} parser
  * @returns {any}

packages/svelte/src/compiler/phases/1-parse/state/tag.js

@@ -8,9 +8,12 @@ import { parse_expression_at } from '../acorn.js';
 import read_pattern from '../read/context.js';
 import read_expression, { get_loose_identifier } from '../read/expression.js';
 import { create_fragment } from '../utils/create.js';
+import { match_bracket } from '../utils/bracket.js';
 
 const regex_whitespace_with_closing_curly_brace = /^\s*}/;
 
+const pointy_bois = { '<': '>' };
+
 /** @param {Parser} parser */
 export default function tag(parser) {
 	const start = parser.index;
@@ -352,35 +355,17 @@ function open(parser) {
 		const params_start = parser.index;
 
 		// snippets could have a generic signature, e.g. `#snippet foo<T>(...)`
+		/** @type {string | undefined} */
 		let generic;
 
 		// if we match a generic opening
 		if (parser.ts && parser.match('<')) {
-			parser.index += 1;
-			// keep track of the amount of open brackets
-			let open_brackets = 1;
-			// except when we are in quotes eg. <T extends "<">
-			let in_quotes;
-
-			while (parser.index < parser.template.length) {
-				const char = parser.template[parser.index];
-				if (!in_quotes && char === '<') open_brackets++;
-				if (!in_quotes && char === '>') open_brackets--;
-				if (!in_quotes && (char === '"' || char === "'" || char === '`')) {
-					in_quotes = char;
-				} else if (char === in_quotes && parser.template[parser.index - 1] !== '\\') {
-					// don't close the quotes if we are escaping
-					in_quotes = undefined;
-				}
-				parser.index += 1;
-				if (open_brackets === 0) {
-					break;
-				}
-				if (generic == null) {
-					generic = '';
-				}
-				generic += char;
-			}
+			const start = parser.index;
+			const end = match_bracket(parser, start, pointy_bois);
+
+			generic = parser.template.slice(start + 1, end - 1);
+
+			parser.index = end;
 		}
 
 		parser.allow_whitespace();

packages/svelte/src/compiler/phases/1-parse/utils/bracket.js

@@ -1,3 +1,6 @@
+/** @import { Parser } from '../index.js' */
+import * as e from '../../../errors.js';
+
 const SQUARE_BRACKET_OPEN = '[';
 const SQUARE_BRACKET_CLOSE = ']';
 const CURLY_BRACKET_OPEN = '{';
@@ -162,3 +165,80 @@ export function find_matching_bracket(template, index, open) {
 	}
 	return undefined;
 }
+
+const default_brackets = {
+	'{': '}',
+	'(': ')',
+	'[': ']'
+};
+
+/**
+ * @param {Parser} parser
+ * @param {number} start
+ * @param {Record<string, string>} brackets
+ */
+export function match_bracket(parser, start, brackets = default_brackets) {
+	const close = Object.values(brackets);
+	const bracket_stack = [];
+
+	let i = start;
+
+	while (i < parser.template.length) {
+		let char = parser.template[i++];
+
+		if (char === "'" || char === '"' || char === '`') {
+			i = match_quote(parser, i, char);
+			continue;
+		}
+
+		if (char in brackets) {
+			bracket_stack.push(char);
+		} else if (close.includes(char)) {
+			const popped = /** @type {string} */ (bracket_stack.pop());
+			const expected = /** @type {string} */ (brackets[popped]);
+
+			if (char !== expected) {
+				e.expected_token(i - 1, expected);
+			}
+
+			if (bracket_stack.length === 0) {
+				return i;
+			}
+		}
+	}
+
+	e.unexpected_eof(parser.template.length);
+}
+
+/**
+ * @param {Parser} parser
+ * @param {number} start
+ * @param {string} quote
+ */
+function match_quote(parser, start, quote) {
+	let is_escaped = false;
+	let i = start;
+
+	while (i < parser.template.length) {
+		const char = parser.template[i++];
+
+		if (is_escaped) {
+			is_escaped = false;
+			continue;
+		}
+
+		if (char === quote) {
+			return i;
+		}
+
+		if (char === '\\') {
+			is_escaped = true;
+		}
+
+		if (quote === '`' && char === '$' && parser.template[i] === '{') {
+			i = match_bracket(parser, i);
+		}
+	}
+
+	e.unterminated_string_constant(start);
+}