msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

handle invalid blocks

Browse Source
pull/14691/head
Simon Holthausen 2 years ago
parent 72850e5ce9
commit 4e727ed900
5 changed files with 326 additions and 13 deletions
Show Stats Download Patch File Download Diff File

35
packages/svelte/src/compiler/phases/1-parse/state/tag.js
Unescape View File

@ -279,34 +279,43 @@ function open(parser) {
parser.require_whitespace();
const name_start = parser.index;
const name = parser.read_identifier();
let name = parser.read_identifier();
const name_end = parser.index;
if (name === null) {
e.expected_identifier(parser.index);
if (parser.loose) {
name = '';
} else {
e.expected_identifier(parser.index);
}
}
parser.allow_whitespace();
const params_start = parser.index;
parser.eat('(', true);
let parentheses = 1;
const matched = parser.eat('(', true, false);
while (parser.index < parser.template.length && (!parser.match(')') || parentheses !== 1)) {
if (parser.match('(')) parentheses++;
if (parser.match(')')) parentheses--;
parser.index += 1;
}
if (matched) {
let parentheses = 1;
parser.eat(')', true);
while (parser.index < parser.template.length && (!parser.match(')') || parentheses !== 1)) {
if (parser.match('(')) parentheses++;
if (parser.match(')')) parentheses--;
parser.index += 1;
}
parser.eat(')', true);
}
const prelude = parser.template.slice(0, params_start).replace(/\S/g, ' ');
const params = parser.template.slice(params_start, parser.index);
let function_expression = /** @type {ArrowFunctionExpression} */ (
parse_expression_at(prelude + `${params} => {}`, parser.ts, params_start)
);
let function_expression = matched
? /** @type {ArrowFunctionExpression} */ (
parse_expression_at(prelude + `${params} => {}`, parser.ts, params_start)
)
: { params: [] };
parser.allow_whitespace();
parser.eat('}', true);

13
packages/svelte/tests/parser-legacy/samples/loose-invalid-block/input.svelte
Unescape View File

@ -0,0 +1,13 @@
{#if }
{:else if }
{:else }
{/if}
{#each }
{/each}
{#snippet }
{/snippet}
{#snippet foo}
{/snippet}

107
packages/svelte/tests/parser-legacy/samples/loose-invalid-block/output.json
Unescape View File

@ -0,0 +1,107 @@
{
"html": {
"type": "Fragment",
"start": 0,
"end": 102,
"children": [
{
"type": "IfBlock",
"start": 0,
"end": 33,
"expression": {
"type": "Identifier",
"start": 5,
"end": 5,
"name": ""
},
"children": [],
"else": {
"type": "ElseBlock",
"start": 18,
"end": 28,
"children": [
{
"type": "IfBlock",
"start": 18,
"end": 33,
"expression": {
"type": "Identifier",
"start": 17,
"end": 17,
"name": ""
},
"children": [],
"else": {
"type": "ElseBlock",
"start": 27,
"end": 28,
"children": []
},
"elseif": true
}
]
}
},
{
"type": "Text",
"start": 33,
"end": 35,
"raw": "\n\n",
"data": "\n\n"
},
{
"type": "EachBlock",
"start": 35,
"end": 51,
"children": [],
"context": null,
"expression": {
"type": "Identifier",
"start": 42,
"end": 42,
"name": ""
}
},
{
"type": "Text",
"start": 51,
"end": 53,
"raw": "\n\n",
"data": "\n\n"
},
{
"type": "SnippetBlock",
"start": 53,
"end": 75,
"expression": {
"type": "Identifier",
"start": 63,
"end": 63,
"name": ""
},
"parameters": [],
"children": []
},
{
"type": "Text",
"start": 75,
"end": 77,
"raw": "\n\n",
"data": "\n\n"
},
{
"type": "SnippetBlock",
"start": 77,
"end": 102,
"expression": {
"type": "Identifier",
"start": 87,
"end": 90,
"name": "foo"
},
"parameters": [],
"children": []
}
]
}
}

13
packages/svelte/tests/parser-modern/samples/loose-invalid-block/input.svelte
Unescape View File

@ -0,0 +1,13 @@
{#if }
{:else if }
{:else }
{/if}
{#each }
{/each}
{#snippet }
{/snippet}
{#snippet foo}
{/snippet}

171
packages/svelte/tests/parser-modern/samples/loose-invalid-block/output.json
Unescape View File

@ -0,0 +1,171 @@
{
"css": null,
"js": [],
"start": 0,
"end": 102,
"type": "Root",
"fragment": {
"type": "Fragment",
"nodes": [
{
"type": "IfBlock",
"elseif": false,
"start": 0,
"end": 33,
"test": {
"type": "Identifier",
"start": 5,
"end": 5,
"name": ""
},
"consequent": {
"type": "Fragment",
"nodes": [
{
"type": "Text",
"start": 6,
"end": 7,
"raw": "\n",
"data": "\n"
}
]
},
"alternate": {
"type": "Fragment",
"nodes": [
{
"start": 7,
"end": 33,
"type": "IfBlock",
"elseif": true,
"test": {
"type": "Identifier",
"start": 17,
"end": 17,
"name": ""
},
"consequent": {
"type": "Fragment",
"nodes": [
{
"type": "Text",
"start": 18,
"end": 19,
"raw": "\n",
"data": "\n"
}
]
},
"alternate": {
"type": "Fragment",
"nodes": [
{
"type": "Text",
"start": 27,
"end": 28,
"raw": "\n",
"data": "\n"
}
]
}
}
]
}
},
{
"type": "Text",
"start": 33,
"end": 35,
"raw": "\n\n",
"data": "\n\n"
},
{
"type": "EachBlock",
"start": 35,
"end": 51,
"expression": {
"type": "Identifier",
"start": 42,
"end": 42,
"name": ""
},
"body": {
"type": "Fragment",
"nodes": [
{
"type": "Text",
"start": 43,
"end": 44,
"raw": "\n",
"data": "\n"
}
]
},
"context": null
},
{
"type": "Text",
"start": 51,
"end": 53,
"raw": "\n\n",
"data": "\n\n"
},
{
"type": "SnippetBlock",
"start": 53,
"end": 75,
"expression": {
"type": "Identifier",
"start": 63,
"end": 63,
"name": ""
},
"parameters": [],
"body": {
"type": "Fragment",
"nodes": [
{
"type": "Text",
"start": 64,
"end": 65,
"raw": "\n",
"data": "\n"
}
]
}
},
{
"type": "Text",
"start": 75,
"end": 77,
"raw": "\n\n",
"data": "\n\n"
},
{
"type": "SnippetBlock",
"start": 77,
"end": 102,
"expression": {
"type": "Identifier",
"start": 87,
"end": 90,
"name": "foo"
},
"parameters": [],
"body": {
"type": "Fragment",
"nodes": [
{
"type": "Text",
"start": 91,
"end": 92,
"raw": "\n",
"data": "\n"
}
]
}
}
]
},
"options": null
}
Write Preview
Loading…
Cancel
Save