From 8b3d15ada50de40f8a0ee8422aa7b97c28d44fa1 Mon Sep 17 00:00:00 2001 From: Simon H <5968653+dummdidumm@users.noreply.github.com> Date: Mon, 25 Jan 2021 15:14:14 +0100 Subject: [PATCH] (fix) syntax highlighting for self-closing (#779) - Fix highlighting break when there's no space between `name` and `/` (#773 ) - `/` is now part of `...definition.tag.end.svelte` --- .../svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml b/packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml index 73a4f112c..0def34403 100644 --- a/packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml +++ b/packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml @@ -431,7 +431,6 @@ repository: tags-start-attributes: begin: \G end: (?=/?>) - endCaptures: { 0: { name: punctuation.definition.tag.end.svelte } } name: meta.tag.start.svelte patterns: [ include: '#attributes' ] @@ -439,13 +438,12 @@ repository: tags-lang-start-attributes: begin: \G end: (?=/>)|> - endCaptures: { 0: { name: punctuation.definition.tag.end.svelte } } name: meta.tag.start.svelte patterns: [ include: '#attributes' ] # Matches the beginning (`]*) + match: (<)([^/\s>/]*) captures: 1: { name: punctuation.definition.tag.begin.svelte } 2: { patterns: [ include: '#tags-name' ] } @@ -496,8 +494,8 @@ repository: # Split up into start and end because we don't need to preserve the name # inside and because it makes whitespace matching logic more robust tags-general-start: - begin: (<)([^/\s>]*) - end: (>) + begin: (<)([^/\s>/]*) + end: (/?>) beginCaptures: { 0: { patterns: [ include: '#tags-start-node' ] } } endCaptures: 1: { name: meta.tag.start.svelte punctuation.definition.tag.end.svelte }