From fb97f40fdee22d4c0e9e6a26129bdcdd2f7e2831 Mon Sep 17 00:00:00 2001 From: Georgi Gardev Date: Mon, 27 Mar 2017 16:32:56 -0700 Subject: [PATCH 1/2] Add support for single quotes for embedded languages --- vue.YAML-tmLanguage | 20 ++++++++++---------- vue.sublime-settings | 2 +- vue.tmLanguage | 20 ++++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/vue.YAML-tmLanguage b/vue.YAML-tmLanguage index 8b9ef05..2a622a8 100644 --- a/vue.YAML-tmLanguage +++ b/vue.YAML-tmLanguage @@ -64,7 +64,7 @@ patterns: match: (\s*)(?!--|>)\S(\s*) - name: text.slm.embedded.html - begin: (?:^\s+)?(<)((?i:template))\b(?=[^>]*lang="slm(?:\?[^"]*)?") + begin: (?:^\s+)?(<)((?i:template))\b(?=[^>]*lang=['"]slm(?:\?[^"]*)?['"]) end: ()(?:\s*\n)? captures: '1': {name: punctuation.definition.tag.begin.html} @@ -80,7 +80,7 @@ patterns: - include: text.slm - name: text.jade.embedded.html - begin: (?:^\s+)?(<)((?i:template))\b(?=[^>]*lang="jade(?:\?[^"]*)?") + begin: (?:^\s+)?(<)((?i:template))\b(?=[^>]*lang=['"]jade(?:\?[^"]*)?['"]) end: ()(?:\s*\n)? captures: '1': {name: punctuation.definition.tag.begin.html} @@ -96,7 +96,7 @@ patterns: - include: text.jade - name: text.pug.embedded.html - begin: (?:^\s+)?(<)((?i:template))\b(?=[^>]*lang="pug(?:\?[^"]*)?") + begin: (?:^\s+)?(<)((?i:template))\b(?=[^>]*lang=['"]pug(?:\?[^"]*)?['"]) end: ()(?:\s*\n)? captures: '1': {name: punctuation.definition.tag.begin.html} @@ -113,7 +113,7 @@ patterns: - name: source.stylus.embedded.html - begin: (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang="stylus(?:\?[^"]*)?") + begin: (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang=['"]stylus(?:\?[^"]*)?['"]) end: ()(?:\s*\n)? captures: '1': {name: punctuation.definition.tag.begin.html} @@ -129,7 +129,7 @@ patterns: - include: source.stylus - name: source.postcss.embedded.html - begin: (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang="postcss(?:\?[^"]*)?") + begin: (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang=['"]postcss(?:\?[^"]*)?['"]) end: ()(?:\s*\n)? captures: '1': {name: punctuation.definition.tag.begin.html} @@ -145,7 +145,7 @@ patterns: - include: source.postcss - name: source.sass.embedded.html - begin: (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang="(?:sass)(?:\?[^"]*)?") + begin: (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang=['"](?:sass)(?:\?[^"]*)?['"]) end: ()(?:\s*\n)? captures: '1': {name: punctuation.definition.tag.begin.html} @@ -162,7 +162,7 @@ patterns: - include: source.scss - name: source.scss.embedded.html - begin: (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang="(?:scss)(?:\?[^"]*)?") + begin: (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang=['"](?:scss)(?:\?[^"]*)?['"]) end: ()(?:\s*\n)? captures: '1': {name: punctuation.definition.tag.begin.html} @@ -180,7 +180,7 @@ patterns: - name: source.less.embedded.html - begin: (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang="less(?:\?[^"]*)?") + begin: (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang=['"]less(?:\?[^"]*)?['"]) end: ()(?:\s*\n)? captures: '1': {name: punctuation.definition.tag.begin.html} @@ -212,7 +212,7 @@ patterns: - include: source.css - name: source.coffee.embedded.html - begin: (?:^\s+)?(<)((?i:script))\b(?=[^>]*lang="coffee(?:\?[^"]*)?") + begin: (?:^\s+)?(<)((?i:script))\b(?=[^>]*lang=['"]coffee(?:\?[^"]*)?['"]) beginCaptures: '1': {name: punctuation.definition.tag.begin.html} '2': {name: entity.name.tag.script.html} @@ -230,7 +230,7 @@ patterns: - include: source.coffee - name: source.livescript.embedded.html - begin: (?:^\s+)?(<)((?i:script))\b(?=[^>]*lang="livescript(?:\?[^"]*)?") + begin: (?:^\s+)?(<)((?i:script))\b(?=[^>]*lang=['"]livescript(?:\?[^"]*)?['"]) beginCaptures: '1': {name: punctuation.definition.tag.begin.html} '2': {name: entity.name.tag.script.html} diff --git a/vue.sublime-settings b/vue.sublime-settings index 51a28de..2298db3 100644 --- a/vue.sublime-settings +++ b/vue.sublime-settings @@ -2,7 +2,7 @@ "extensions": [ "vue", - "we", + "we", "wpy" ] } diff --git a/vue.tmLanguage b/vue.tmLanguage index 60a7861..7bc2850 100644 --- a/vue.tmLanguage +++ b/vue.tmLanguage @@ -211,7 +211,7 @@ begin - (?:^\s+)?(<)((?i:template))\b(?=[^>]*lang="slm(?:\?[^"]*)?") + (?:^\s+)?(<)((?i:template))\b(?=[^>]*lang=['"]slm(?:\?[^"]*)?['"]) captures 1 @@ -265,7 +265,7 @@ begin - (?:^\s+)?(<)((?i:template))\b(?=[^>]*lang="jade(?:\?[^"]*)?") + (?:^\s+)?(<)((?i:template))\b(?=[^>]*lang=['"]jade(?:\?[^"]*)?['"]) captures 1 @@ -319,7 +319,7 @@ begin - (?:^\s+)?(<)((?i:template))\b(?=[^>]*lang="pug(?:\?[^"]*)?") + (?:^\s+)?(<)((?i:template))\b(?=[^>]*lang=['"]pug(?:\?[^"]*)?['"]) captures 1 @@ -373,7 +373,7 @@ begin - (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang="stylus(?:\?[^"]*)?") + (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang=['"]stylus(?:\?[^"]*)?['"]) captures 1 @@ -427,7 +427,7 @@ begin - (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang="postcss(?:\?[^"]*)?") + (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang=['"]postcss(?:\?[^"]*)?['"]) captures 1 @@ -481,7 +481,7 @@ begin - (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang="(?:sass)(?:\?[^"]*)?") + (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang=['"](?:sass)(?:\?[^"]*)?['"]) captures 1 @@ -539,7 +539,7 @@ begin - (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang="(?:scss)(?:\?[^"]*)?") + (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang=['"](?:scss)(?:\?[^"]*)?['"]) captures 1 @@ -597,7 +597,7 @@ begin - (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang="less(?:\?[^"]*)?") + (?:^\s+)?(<)((?i:style))\b(?=[^>]*lang=['"]less(?:\?[^"]*)?['"]) captures 1 @@ -705,7 +705,7 @@ begin - (?:^\s+)?(<)((?i:script))\b(?=[^>]*lang="coffee(?:\?[^"]*)?") + (?:^\s+)?(<)((?i:script))\b(?=[^>]*lang=['"]coffee(?:\?[^"]*)?['"]) beginCaptures 1 @@ -767,7 +767,7 @@ begin - (?:^\s+)?(<)((?i:script))\b(?=[^>]*lang="livescript(?:\?[^"]*)?") + (?:^\s+)?(<)((?i:script))\b(?=[^>]*lang=['"]livescript(?:\?[^"]*)?['"]) beginCaptures 1 From f0c90dba4c71af294329b7fecbabdc3afb40a253 Mon Sep 17 00:00:00 2001 From: Georgi Gardev Date: Mon, 27 Mar 2017 16:37:43 -0700 Subject: [PATCH 2/2] Fix indentation for extensions --- vue.sublime-settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.sublime-settings b/vue.sublime-settings index 2298db3..35a04cc 100644 --- a/vue.sublime-settings +++ b/vue.sublime-settings @@ -2,7 +2,7 @@ "extensions": [ "vue", - "we", + "we", "wpy" ] }