Skip to content

Use main_syntax variable to detect embedded syntax #108

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

Merged
merged 1 commit into from
Aug 3, 2024
Merged

Use main_syntax variable to detect embedded syntax #108

Show file tree
Hide file tree
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
13 changes: 1 addition & 12 deletions after/syntax/javascript/graphql.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,7 @@
" Language: GraphQL
" Maintainer: Jon Parise <[email protected]>

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

let b:graphql_nested_syntax = 1
syn include @GraphQLSyntax syntax/graphql.vim
unlet b:graphql_nested_syntax

if exists('s:current_syntax')
let b:current_syntax = s:current_syntax
endif
call graphql#embed_syntax('GraphQLSyntax')

let s:tags = '\%(' . join(graphql#javascript_tags(), '\|') . '\)'

Expand Down
13 changes: 1 addition & 12 deletions after/syntax/php/graphql.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,7 @@
" Language: GraphQL
" Maintainer: Jon Parise <[email protected]>

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

let b:graphql_nested_syntax = 1
syn include @GraphQLSyntax syntax/graphql.vim
unlet b:graphql_nested_syntax

if exists('s:current_syntax')
let b:current_syntax = s:current_syntax
endif
call graphql#embed_syntax('GraphQLSyntax')

syn region phpHereDoc matchgroup=Delimiter start="\(<<<\)\@<=\(\"\=\)\z(\(\I\i*\)\=\(gql\)\c\(\i*\)\)\2$" end="^\s*\z1\>" contained contains=@GraphQLSyntax,phpIdentifier,phpIdentifierSimply,phpIdentifierComplex,phpBackslashSequences,phpMethodsVar,@Spell keepend extend
syntax region phpNowDoc matchgroup=Delimiter start="\(<<<\)\@<='\z(\(\I\i*\)\=\(gql\)\c\(\i*\)\)'$" end="^\s*\z1\>" contained contains=@GraphQLSyntax,@Spell keepend extend
13 changes: 1 addition & 12 deletions after/syntax/reason/graphql.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,7 @@
" Language: GraphQL
" Maintainer: Jon Parise <[email protected]>

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

let b:graphql_nested_syntax = 1
syn include @GraphQLSyntax syntax/graphql.vim
unlet b:graphql_nested_syntax

if exists('s:current_syntax')
let b:current_syntax = s:current_syntax
endif
call graphql#embed_syntax('GraphQLSyntax')

syntax region graphqlExtensionPoint start=+\[%\(graphql\|relay\)+ end=+\]+ contains=graphqlExtensionPointS
syntax region graphqlExtensionPointS matchgroup=String start=+{|+ end=+|}+ contains=@GraphQLSyntax contained
13 changes: 1 addition & 12 deletions after/syntax/rescript/graphql.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,7 @@
" Language: GraphQL
" Maintainer: Jon Parise <[email protected]>

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

let b:graphql_nested_syntax = 1
syn include @GraphQLSyntax syntax/graphql.vim
unlet b:graphql_nested_syntax

if exists('s:current_syntax')
let b:current_syntax = s:current_syntax
endif
call graphql#embed_syntax('GraphQLSyntax')

syntax region graphqlExtensionPoint start=+%\(graphql\|relay\)(+ end=+)+ contains=graphqlExtensionPointS
syntax region graphqlExtensionPointS matchgroup=String start=+`+ end=+`+ contains=@GraphQLSyntax contained
13 changes: 1 addition & 12 deletions after/syntax/typescript/graphql.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,7 @@
" Language: GraphQL
" Maintainer: Jon Parise <[email protected]>

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

let b:graphql_nested_syntax = 1
syn include @GraphQLSyntax syntax/graphql.vim
unlet b:graphql_nested_syntax

if exists('s:current_syntax')
let b:current_syntax = s:current_syntax
endif
call graphql#embed_syntax('GraphQLSyntax')

let s:tags = '\%(' . join(graphql#javascript_tags(), '\|') . '\)'

Expand Down
24 changes: 24 additions & 0 deletions autoload/graphql.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,30 @@ function! graphql#var(name, default) abort
return get(b:, a:name, get(g:, a:name, a:default))
endfunction

" Embed our GraphQL syntax and make the result available as a group.
function! graphql#embed_syntax(group) abort
let l:saved_current_syntax = get(b:, 'current_syntax', '')
let l:saved_main_syntax = get(g:, 'main_syntax', '')

" Temporarily promote the current (outer) syntax to the "main" syntax.
" Our syntax file uses this information to know when it's being embedded.
let main_syntax = l:saved_current_syntax
unlet! b:current_syntax

" Include our syntax file and make its top-level items available as `@group`.
exec 'syn include @' . a:group . ' syntax/graphql.vim'

" Restore the previous syntax state.
if l:saved_current_syntax !=# ''
let b:current_syntax = l:saved_current_syntax
endif
if l:saved_main_syntax !=# ''
let main_syntax = l:saved_main_syntax
else
unlet! main_syntax
endif
endfunction

function! graphql#has_syntax_group(group) abort
try
silent execute 'silent highlight ' . a:group
Expand Down
19 changes: 13 additions & 6 deletions syntax/graphql.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,11 @@
" Language: GraphQL
" Maintainer: Jon Parise <[email protected]>

if exists('b:current_syntax')
finish
if !exists('main_syntax')
if exists('b:current_syntax')
finish
endif
let main_syntax = 'graphql'
endif

syn case match
Expand Down Expand Up @@ -72,6 +75,10 @@ syn keyword graphqlMetaFields __schema __type __typename
syn region graphqlFold matchgroup=graphqlBraces start="{" end="}" transparent fold contains=ALLBUT,graphqlStructure
syn region graphqlList matchgroup=graphqlBraces start="\[" end="]" transparent contains=ALLBUT,graphqlDirective,graphqlStructure

if main_syntax ==# 'graphql'
syn sync minlines=500
endif

hi def link graphqlComment Comment
hi def link graphqlOperator Operator

Expand All @@ -91,8 +98,8 @@ hi def link graphqlStructure Structure
hi def link graphqlType Type
hi def link graphqlVariable Identifier

if !get(b:, 'graphql_nested_syntax')
syn sync minlines=500
endif

let b:current_syntax = 'graphql'

if main_syntax ==# 'graphql'
unlet main_syntax
endif
3 changes: 3 additions & 0 deletions test/javascript/default.vader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Given javascript (Template):
`;

Execute (Syntax assertions):
AssertEqual 'javascript', b:current_syntax
AssertEqual 'graphqlTaggedTemplate', SyntaxOf('gql')
AssertEqual 'graphqlTemplateExpression', SyntaxOf('${uid}')
AssertEqual 'graphqlName', SyntaxOf('user')
Expand Down Expand Up @@ -51,6 +52,7 @@ Given javascript (Template literal with `# gql` comment):
`;

Execute (Syntax assertions):
AssertEqual 'javascript', b:current_syntax
AssertEqual 'graphqlName', SyntaxOf('user')

Given javascript (Template literal with `# graphql` comment):
Expand All @@ -64,6 +66,7 @@ Given javascript (Template literal with `# graphql` comment):
`;

Execute (Syntax assertions):
AssertEqual 'javascript', b:current_syntax
AssertEqual 'graphqlName', SyntaxOf('user')

Given javascript (Template literal):
Expand Down
2 changes: 2 additions & 0 deletions test/javascript/react.vader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ Given javascriptreact (Template):
const query = gql`{}`;

Execute (Syntax assertions):
AssertEqual 'javascript', b:current_syntax
AssertEqual 'graphqlTaggedTemplate', SyntaxOf('gql')
AssertEqual 'graphqlBraces', SyntaxOf('{}')

Given javascript.jsx (Template):
const query = gql`{}`;

Execute (Syntax assertions):
AssertEqual 'javascript', b:current_syntax
AssertEqual 'graphqlTaggedTemplate', SyntaxOf('gql')
AssertEqual 'graphqlBraces', SyntaxOf('{}')

Expand Down
1 change: 1 addition & 0 deletions test/javascript/vue.vader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Given vue (Template):
</script>

Execute (Syntax assertions):
AssertEqual 'html', b:current_syntax
AssertEqual 'graphqlTaggedTemplate', SyntaxOf('gql')
AssertEqual 'graphqlStructure', SyntaxOf('query')

Expand Down
7 changes: 2 additions & 5 deletions test/php/default.vader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Given php (Heredoc):
GQL;

Execute (Syntax assertions):
AssertEqual 'php', b:current_syntax
AssertEqual 'Delimiter', SyntaxOf('GQL')
AssertEqual 'graphqlName', SyntaxOf('user')

Expand Down Expand Up @@ -43,10 +44,6 @@ Given php (Nowdoc):
GQL;

Execute (Syntax assertions):
AssertEqual 'php', b:current_syntax
AssertEqual 'Delimiter', SyntaxOf('GQL')
AssertEqual 'graphqlName', SyntaxOf('user')

Execute (Settings assertions):
redir @a | syntax sync | redir END
let match = match(@a, 'syncing starts 500 lines before top line') >= 0
Assert !match, "'syntax sync minlines' was changed in outer syntax"
1 change: 1 addition & 0 deletions test/syntax.vader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ Given graphql (Schema):
}

Execute (Schema assertions):
AssertEqual 'graphql', b:current_syntax
AssertEqual 'graphqlStructure', SyntaxOf('schema')
AssertEqual 'graphqlName', SyntaxOf('query')
AssertEqual 'graphqlType', SyntaxOf('QueryType')
Expand Down
2 changes: 2 additions & 0 deletions test/typescript/default.vader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Given typescript (Template):
`;

Execute (Syntax assertions):
AssertEqual 'typescript', b:current_syntax
AssertEqual 'graphqlTaggedTemplate', SyntaxOf('gql')
AssertEqual 'typescriptTemplateSB', SyntaxOf('${uid}')
AssertEqual 'graphqlName', SyntaxOf('user')
Expand Down Expand Up @@ -82,4 +83,5 @@ Given typescript (Template literal with `# graphql` comment):
`;

Execute (Syntax assertions):
AssertEqual 'typescript', b:current_syntax
AssertEqual 'graphqlName', SyntaxOf('user')