Skip to content

Ability to customize tags #3

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 3 commits into
base: master
Choose a base branch
from
Open

Ability to customize tags #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
698ad18
Ability to customize tags
trsdln Nov 10, 2020
00028b0
Fix compatiblity issue with pangloss/vim-javascript
trsdln May 4, 2021
e5842ae
Improve highlighting based on gql plugin
trsdln May 6, 2021
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
7 changes: 7 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,10 @@ This plugin uses the generic SQL syntax by default. If you want to use a differe
```vim
let g:javascript_sql_dialect = 'pgsql'
```

List of tags can be overridden using:

```vim
let g:javascript_sql_tags = ['sql', 'customSql']
" default is ['SQL']
```
16 changes: 13 additions & 3 deletions after/syntax/javascript/sql.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,26 @@ if exists('b:current_syntax')
unlet b:current_syntax
endif

if !exists('g:javascript_sql_tags')
let g:javascript_sql_tags = ['SQL']
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'
let s:tags = '\%(' . join(g:javascript_sql_tags, '\|') . '\)'

" will work only with pangloss/vim-javascript
" inspired by https://github.com/jparise/vim-graphql/blob/master/after/syntax/javascript/graphql.vim
exec 'syntax region sqlTemplateString matchgroup=jsTemplateString start=+' . s:tags . '\@20<=`+ skip=+\\\\\|\\`+ end=+`+ contains=@SQLSyntax,jsTemplateExpression,jsSpecial extend'
exec 'syntax match sqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=sqlTemplateString'
syntax region sqlTemplateExpression start=+${+ end=+}+ contained contains=jsTemplateExpression keepend

hi def link sqlTemplateString jsTemplateString
hi def link sqlTaggedTemplate jsTaggedTemplate
hi def link sqlTemplateExpression jsTemplateExpression

syn cluster jsExpression add=sqlTaggedTemplate
syn cluster jsExpression add=sqlTemplateString,sqlTaggedTemplate
syn cluster sqlTaggedTemplate add=sqlTemplateString