Skip to content

Make it possible to also use SQL "magic comments" to signify SQL template literals #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make it possible to also use SQL "magic comments" to signify SQL template literals #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions after/syntax/javascript/sql.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ if exists('b:current_syntax')
endif

exec 'syntax include @SQLSyntax syntax/' . g:javascript_sql_dialect . '.vim'

if exists('s:current_syntax')
let b:current_syntax = s:current_syntax
endif

syntax region sqlTemplateString start=+`+ skip=+\\\(`\|$\)+ end=+`+ contains=@SQLSyntax,jsTemplateExpression,jsSpecial extend
exec 'syntax match sqlTaggedTemplate +\%(SQL\)\%(`\)\@=+ nextgroup=sqlTemplateString'

hi def link sqlTemplateString jsTemplateString
exec 'syntax match sqlTaggedTemplate +\<sql\>\s*\ze`+ nextgroup=sqlTemplateString'
exec 'syntax match sqlTaggedTemplate +\/\*\s*sql\s*\*\/\s*\ze`+ nextgroup=sqlTemplateString'

hi def link sqlTaggedTemplate jsTaggedTemplate

syn cluster jsExpression add=sqlTaggedTemplate
Expand Down