From 067e07e137d26ca6bc3f8496fe7bd569500d7fa4 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Wed, 14 Apr 2021 12:11:13 +0200 Subject: Change svelte provider, fixes #700 --- syntax/svelte-html.vim | 127 ++++++++++++++++++ syntax/svelte.vim | 341 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 375 insertions(+), 93 deletions(-) create mode 100644 syntax/svelte-html.vim (limited to 'syntax') diff --git a/syntax/svelte-html.vim b/syntax/svelte-html.vim new file mode 100644 index 00000000..c0b243b1 --- /dev/null +++ b/syntax/svelte-html.vim @@ -0,0 +1,127 @@ +if polyglot#init#is_disabled(expand(':p'), 'svelte', 'syntax/svelte-html.vim') + finish +endif + +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" +" Config {{{ +" +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +let s:highlight_svelte_attr = svelte#GetConfig('highlight_svelte_attr', 0) +")}}} + +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" +" Syntax highlight {{{ +" +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +syntax match svelteComponentName containedin=htmlTagN '\v\C<[a-zA-Z0-9]+(\.[A-Z][a-zA-Z0-9]+)*>' + +syntax match svelteComponentName containedin=htmlTagN '\v\C<[a-z0-9]+(-[a-z0-9]+)+>' + +syntax match svelteComponentName containedin=htmlTagN '\vsvelte:\w*' + +" Syntax for vim-svelte-theme +syntax match htmlAttr '\v(\S|\<)@[:blank:]]+' containedin=htmlTag + \ contains=htmlString,svelteValue,htmlArg +syntax match htmlAttrEqual '\v\=' containedin=htmlAttr + +syntax match svelteAttr + \ '\v(\S)@[:blank:]]+(\=\"[^"]*\"|\=\{[^}]*\})?' + \ containedin=htmlTag + \ contains=svelteKey,svelteValue + +syntax match svelteKey contained '\v(on|bind|use|in|out|transition|animate|class):[^\=\>[:blank:]]+' +syntax match svelteValue contained '\v\{[^}]*\}' + +syntax region svelteExpression + \ containedin=htmlH.*,htmlItalic + \ matchgroup=svelteBrace + \ transparent + \ start="{" + \ end="}\(}\)\@!" + +syntax region svelteExpression + \ containedin=htmlSvelteTemplate,svelteValue,htmlString,htmlValue,htmlArg,htmlTag + \ contains=@simpleJavascriptExpression,svelteAtTags + \ matchgroup=svelteBrace + \ transparent + \ start="{" + \ end="}\(}\)\@!" + +syntax region svelteExpression + \ containedin=htmlTag + \ contains=@simpleJavascriptExpression,svelteAtTags,svelteShortProp + \ matchgroup=svelteBrace + \ transparent + \ start="{" + \ end="}\(}\)\@!" + +syntax match svelteAtTags '\v\@(html|debug)' +syntax match svelteShortProp '\v<\w+>' + +syntax region svelteBlockBody + \ containedin=htmlSvelteTemplate,htmlLink + \ contains=@simpleJavascriptExpression,svelteBlockKeyword + \ matchgroup=svelteBrace + \ start="{:" + \ end="}" + +syntax region svelteBlockStart + \ containedin=htmlSvelteTemplate,htmlLink + \ contains=@simpleJavascriptExpression,svelteBlockKeyword + \ matchgroup=svelteBrace + \ start="{#" + \ end="}" + +syntax region svelteBlockEnd + \ containedin=htmlSvelteTemplate,htmlLink + \ contains=@simpleJavascriptExpression,svelteBlockKeyword + \ matchgroup=svelteBrace + \ start="{\/" + \ end="}" + +syntax keyword svelteBlockKeyword if else each await then catch as + +syntax cluster simpleJavascriptExpression + \ contains=javaScriptStringS,javaScriptStringD,javaScriptTemplateString,javascriptNumber,javaScriptOperator + +" Redefine JavaScript syntax +syntax region javaScriptStringS + \ start=+'+ skip=+\\\\\|\\'+ end=+'\|$+ contained +syntax region javaScriptStringD + \ start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ contained +syntax region javaScriptTemplateString + \ start=+`+ skip=+\\`+ end=+`+ contained + \ contains=javaScriptTemplateExpression +syntax region javaScriptTemplateExpression + \ matchgroup=Type + \ start=+${+ end=+}+ keepend contained + +syntax match javaScriptNumber '\v<-?\d+L?>|0[xX][0-9a-fA-F]+>' contained +syntax match javaScriptOperator '[-!|&+<>=%*~^]' contained +syntax match javaScriptOperator '\v(*)@:p'), 'svelte', 'syntax/svelte.vim') finish endif +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Vim syntax file -" Language: Svelte 3 (HTML/JavaScript) -" Author: Evan Lecklider -" Maintainer: Evan Lecklide -" Depends: pangloss/vim-javascript -" URL: https://github.com/evanleck/vim-svelte " -" Like vim-jsx, this depends on the pangloss/vim-javascript syntax package (and -" is tested against it exclusively). If you're using vim-polyglot, then you're -" all set. - -if exists("b:current_syntax") +" Language: Svelte +" Maintainer: leaf +" +" CREDITS: Inspired by mxw/vim-jsx. +" +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +if exists("b:current_syntax") && b:current_syntax == 'svelte' finish endif -" Read HTML to begin with. -runtime! syntax/html.vim -unlet! b:current_syntax +" For advanced users, this variable can be used to avoid overload +let b:current_loading_main_syntax = 'svelte' +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" +" Config {{{ +" +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +let s:load_full_syntax = svelte#GetConfig('load_full_syntax', 0) +let s:use_pug = svelte#GetConfig('use_pug', 0) +let s:use_less = svelte#GetConfig('use_less', 0) +let s:use_sass = svelte#GetConfig('use_sass', 0) +let s:use_coffee = svelte#GetConfig('use_coffee', 0) +let s:use_typescript = svelte#GetConfig('use_typescript', 0) +"}}} -" Expand HTML tag names to include mixed case, periods, and colons. -syntax match htmlTagName contained "\<[a-zA-Z:\.]*\>" +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" +" Functions {{{ +" +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +function! s:LoadSyntax(group, type) + if s:load_full_syntax + call s:LoadFullSyntax(a:group, a:type) + else + call s:LoadDefaultSyntax(a:group, a:type) + endif +endfunction -" Special attributes that include some kind of binding e.g. "on:click", -" "bind:something", etc. -syntax match svelteKeyword "\<[a-z]\+:[a-zA-Z|]\+=" contained containedin=htmlTag +function! s:LoadDefaultSyntax(group, type) + unlet! b:current_syntax + let syntaxPaths = ['$VIMRUNTIME', '$VIM/vimfiles', '$HOME/.vim'] + for path in syntaxPaths + let file = expand(path).'/syntax/'.a:type.'.vim' + if filereadable(file) + execute 'syntax include '.a:group.' '.file + endif + endfor +endfunction -" The "slot" attribute has special meaning. -syntax keyword svelteKeyword slot contained containedin=htmlTag +function! s:LoadFullSyntax(group, type) + call s:SetCurrentSyntax(a:type) + exec 'syntax include '.a:group.' syntax/'.a:type.'.vim' +endfunction -" According to vim-jsx, you can let jsBlock take care of ending the region. -" https://github.com/mxw/vim-jsx/blob/master/after/syntax/jsx.vim -syntax region svelteExpression start="{" end="" contains=jsBlock,javascriptBlock containedin=htmlString,htmlTag,htmlArg,htmlValue,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,htmlHead,htmlTitle,htmlBoldItalicUnderline,htmlUnderlineBold,htmlUnderlineItalicBold,htmlUnderlineBoldItalic,htmlItalicUnderline,htmlItalicBold,htmlItalicBoldUnderline,htmlItalicUnderlineBold,htmlLink,htmlLeadingSpace,htmlBold,htmlBoldUnderline,htmlBoldItalic,htmlBoldUnderlineItalic,htmlUnderline,htmlUnderlineItalic,htmlItalic,htmlStrike,javaScript +" Settings to avoid syntax overload +function! s:SetCurrentSyntax(type) + if a:type == 'coffee' + syntax cluster coffeeJS contains=@htmlJavaScript -" Block conditionals. -syntax match svelteConditional "#if" contained containedin=jsBlock,javascriptBlock -syntax match svelteConditional "/if" contained containedin=jsBlock,javascriptBlock -syntax match svelteConditional ":else if" contained containedin=jsBlock,javascriptBlock -syntax match svelteConditional ":else" contained containedin=jsBlock,javascriptBlock + " Avoid overload of `javascript.vim` + let b:current_syntax = 'svelte' + else + unlet! b:current_syntax + endif +endfunction +"}}} -" Block keywords. -syntax match svelteKeyword "#await" contained containedin=jsBlock,javascriptBlock -syntax match svelteKeyword "/await" contained containedin=jsBlock,javascriptBlock -syntax match svelteKeyword ":catch" contained containedin=jsBlock,javascriptBlock -syntax match svelteKeyword ":then" contained containedin=jsBlock,javascriptBlock +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" +" Load main syntax {{{ +" +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Load syntax/html.vim to syntax group, which loads full JavaScript and CSS +" syntax. It defines group htmlJavaScript and htmlCss. +call s:LoadSyntax('@HTMLSyntax', 'html') -" Inline keywords. -syntax match svelteKeyword "@html" contained containedin=jsBlock,javascriptBlock -syntax match svelteKeyword "@debug" contained containedin=jsBlock,javascriptBlock +" Load svelte-html syntax +syntax include syntax/svelte-html.vim -" Repeat functions. -syntax match svelteRepeat "#each" contained containedin=jsBlock,javascriptBlock -syntax match svelteRepeat "/each" contained containedin=jsBlock,javascriptBlock +" Avoid overload +if !hlexists('cssTagName') + call s:LoadSyntax('@htmlCss', 'css') +endif -highlight def link svelteConditional Conditional -highlight def link svelteKeyword Keyword -highlight def link svelteRepeat Repeat +" Avoid overload +if !hlexists('javaScriptComment') + call s:LoadSyntax('@htmlJavaScript', 'javascript') +endif +"}}} -" Preprocessed languages that aren't supported out of the box by Svelte require -" additional syntax files to be pulled in and can slow Vim down a bit. For that -" reason, preprocessed languages must be enabled manually. Note that some may -" require additional plugins that contain the actual syntax definitions. +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " -" Heavily cribbed from https://github.com/posva/vim-vue and largely completed by -" @davidroeca (thank you!). - -" A syntax should be registered if there's a valid syntax definition known to -" Vim and it is enabled for the Svelte plugin. -function! s:enabled(language) - " Check whether a syntax file for {language} exists - let s:syntax_name = get(a:language, 'as', a:language.name) - if empty(globpath(&runtimepath, 'syntax/' . s:syntax_name . '.vim')) - return 0 - endif +" Load pre-processors syntax {{{ +" +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" If pug is enabled, load vim-pug syntax +if s:use_pug + call s:LoadFullSyntax('@PugSyntax', 'pug') +endif + +" If less is enabled, load less syntax +if s:use_less + call s:LoadSyntax('@LessSyntax', 'less') + runtime! after/syntax/less.vim +endif - " If g:svelte_preprocessors is set, check for it there, otherwise return 0. - if exists('g:svelte_preprocessors') && type(g:svelte_preprocessors) == v:t_list - return index(g:svelte_preprocessors, a:language.name) != -1 +" If sass is enabled, load sass syntax +if s:use_sass + call s:LoadSyntax('@SassSyntax', 'sass') + runtime! after/syntax/sass.vim +endif + +" If CoffeeScript is enabled, load the syntax. Keep name consistent with +" vim-coffee-script/after/html.vim +if s:use_coffee + call s:LoadFullSyntax('@htmlCoffeeScript', 'coffee') +endif + +" If TypeScript is enabled, load the syntax. +if s:use_typescript + call s:LoadFullSyntax('@TypeScript', 'typescript') +endif +"}}} + +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" +" Syntax highlight {{{ +" +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" All start with html/javascript/css for emmet-vim in-file type detection +" Normal tag template +syntax region htmlSvelteTemplate fold + \ start=+<[-:a-zA-Z0-9]\+[^>]*>$+ + \ end=+^+ + \ keepend contains=@HTMLSyntax +" Start tag across multiple lines or Empty tag across multiple lines +syntax region htmlSvelteTemplate fold + \ start=+<[-:a-zA-Z0-9]\+[^>]*$+ + \ end=+^\(<\/[-:a-zA-Z0-9]\+>\)\|^\([^<]*\/>\)+ + \ keepend contains=@HTMLSyntax +" Tag in one line +syntax match htmlSvelteTemplate fold + \ +<[-:a-zA-Z0-9]\+[^>]*>.*+ + \ contains=@HTMLSyntax +" Empty tag in one line +syntax match htmlSvelteTemplate fold + \ +<[-:a-zA-Z0-9]\+[^>]*/>+ + \ contains=@HTMLSyntax +" @html,@debug tag in one line +syntax match htmlSvelteTemplate fold + \ +{@\(html\|debug\)[^}]*}+ + \ contains=@HTMLSyntax +" Control blocks like {#if ...}, {#each ...} +syntax region htmlSvelteTemplate fold + \ start=+{#[-a-zA-Z0-9]\+[^}]*}+ + \ end=+^{/[-a-zA-Z0-9]\+}+ + \ keepend contains=@HTMLSyntax + +syntax region javascriptSvelteScript fold + \ start=+]*>+ + \ end=++ + \ keepend + \ contains=@htmlJavaScript,jsImport,jsExport,svelteTag,svelteKeyword + +syntax region cssSvelteStyle fold + \ start=+]*>+ + \ end=++ + \ keepend contains=@htmlCss,svelteTag + +" Preprocessors syntax +syntax region pugSvelteTemplate fold + \ start=+]*lang="pug"[^>]*>+ + \ end=++ + \ keepend contains=@PugSyntax,svelteTag + +syntax region coffeeSvelteScript fold + \ start=+]*lang="coffee"[^>]*>+ + \ end=++ + \ keepend contains=@htmlCoffeeScript,jsImport,jsExport,svelteTag + +syntax region typescriptSvelteScript fold + \ start=+]*lang="\(ts\|typescript\)"[^>]*>+ + \ end=++ + \ keepend contains=@TypeScript,svelteTag + +syntax region cssLessSvelteStyle fold + \ start=+]*lang="less"[^>]*>+ + \ end=++ + \ keepend contains=@LessSyntax,svelteTag +syntax region cssSassSvelteStyle fold + \ start=+]*lang="sass"[^>]*>+ + \ end=++ + \ keepend contains=@SassSyntax,svelteTag +syntax region cssScssSvelteStyle fold + \ start=+]*lang="scss"[^>]*>+ + \ end=++ + \ keepend contains=@SassSyntax,svelteTag + +syntax region svelteTag + \ start=+^<[^/]+ end=+>+ skip=+>+ + \ contained contains=htmlTagN,htmlString,htmlArg +syntax keyword svelteKeyword $ contained + +highlight default link svelteTag htmlTag +highlight default link svelteKeyword Keyword +highlight default link cssUnitDecorators2 Number +highlight default link cssKeyFrameProp2 Constant +"}}} + +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" +" Syntax patch {{{ +" +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Patch 7.4.1142 +if has("patch-7.4-1142") + if has("win32") + syn iskeyword @,48-57,_,128-167,224-235,$ else - return 0 + syn iskeyword @,48-57,_,192-255,$ endif -endfunction +endif -" Default tag definitions. -let s:languages = [ - \ { 'name': 'less', 'tag': 'style' }, - \ { 'name': 'scss', 'tag': 'style' }, - \ { 'name': 'sass', 'tag': 'style' }, - \ { 'name': 'stylus', 'tag': 'style' }, - \ { 'name': 'typescript', 'tag': 'script' }, - \ ] - -" Add global tag definitions to our defaults. -if exists('g:svelte_preprocessor_tags') && type(g:svelte_preprocessor_tags) == v:t_list - let s:languages += g:svelte_preprocessor_tags +" Style +" Redefine (less|sass)Definition to highlight