diff --git a/README.md b/README.md index 3ccfb00..e4f51f1 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,6 @@ Most importantly, vim-polyglot contains all runtime syntax files from upstream [ - [gmpl](https://github.com/maelvalais/gmpl.vim) (syntax) - [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting) (syntax) - [go](https://github.com/fatih/vim-go) (syntax, compiler, indent) -- [graphql](https://github.com/jparise/vim-graphql) (syntax, indent, ftplugin) - [groovy](https://github.com/vim-scripts/groovy.vim) (syntax) - [haml](https://github.com/sheerun/vim-haml) (syntax, indent, compiler, ftplugin) - [handlebars](https://github.com/mustache/vim-mustache-handlebars) (syntax, indent, ftplugin) diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim deleted file mode 100644 index 58c1de0..0000000 --- a/after/syntax/javascript/graphql.vim +++ /dev/null @@ -1,21 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1 - -if exists('b:current_syntax') - let s:current_syntax = b:current_syntax - unlet b:current_syntax -endif -syn include @GraphQLSyntax syntax/graphql.vim -if exists('s:current_syntax') - let b:current_syntax = s:current_syntax -endif - -syntax region graphqlTemplateString start=+`+ skip=+\\\(`\|$\)+ end=+`+ contains=@GraphQLSyntax,jsTemplateExpression,jsSpecial extend -exec 'syntax match graphqlTaggedTemplate +\%(' . join(g:graphql_javascript_tags, '\|') . '\)\%(`\)\@=+ nextgroup=graphqlTemplateString' - -hi def link graphqlTemplateString jsTemplateString -hi def link graphqlTaggedTemplate jsTaggedTemplate - -syn cluster jsExpression add=graphqlTaggedTemplate -syn cluster graphqlTaggedTemplate add=graphqlTemplateString - -endif diff --git a/build b/build index 81d0ddd..6eaa10a 100755 --- a/build +++ b/build @@ -141,7 +141,6 @@ PACKS=" glsl:tikhomirov/vim-glsl gnuplot:vim-scripts/gnuplot-syntax-highlighting go:fatih/vim-go:_BASIC - graphql:jparise/vim-graphql groovy:vim-scripts/groovy.vim haml:sheerun/vim-haml handlebars:mustache/vim-mustache-handlebars diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim index ba1a2d8..c30f7b7 100644 --- a/ftdetect/polyglot.vim +++ b/ftdetect/polyglot.vim @@ -356,11 +356,6 @@ au BufRead,BufNewFile *.tmpl set filetype=gohtmltmpl " vim: sw=2 ts=2 et augroup END -augroup filetypedetect -" graphql:jparise/vim-graphql -au BufRead,BufNewFile *.graphql,*.graphqls,*.gql setfiletype graphql -augroup END - augroup filetypedetect " groovy:vim-scripts/groovy.vim augroup END diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim deleted file mode 100644 index 42d96e6..0000000 --- a/ftplugin/graphql.vim +++ /dev/null @@ -1,17 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1 - -" Vim filetype plugin -" Language: GraphQL -" Maintainer: Jon Parise - -if (exists('b:did_ftplugin')) - finish -endif -let b:did_ftplugin = 1 - -setlocal comments=:# -setlocal commentstring=#\ %s -setlocal formatoptions-=t -setlocal iskeyword+=$,@-@ - -endif diff --git a/indent/graphql.vim b/indent/graphql.vim deleted file mode 100644 index ed9cfaa..0000000 --- a/indent/graphql.vim +++ /dev/null @@ -1,81 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1 - -" Vim indent file -" Language: GraphQL -" Maintainer: Jon Parise - -if exists('b:did_indent') - finish -endif -let b:did_indent = 1 - -setlocal autoindent -setlocal nocindent -setlocal nolisp -setlocal nosmartindent - -setlocal indentexpr=GetGraphQLIndent() -setlocal indentkeys=0{,0},0),0[,0],0#,!^F,o,O,e - -" If our indentation function already exists, we have nothing more to do. -if exists('*GetGraphQLIndent') - finish -endif - -let s:cpo_save = &cpoptions -set cpoptions&vim - -" Check if the character at lnum:col is inside a string. -function s:InString(lnum, col) - return synIDattr(synID(a:lnum, a:col, 1), 'name') is# 'graphqlString' -endfunction - -function GetGraphQLIndent() - " If this is the first non-blank line, we have nothing more to do because - " all of our indentation rules are based on matching against earlier lines. - let l:prevlnum = prevnonblank(v:lnum - 1) - if l:prevlnum == 0 - return 0 - endif - - let l:line = getline(v:lnum) - - " If this line contains just a closing bracket, find its matching opening - " bracket and indent the closing backet to match. - let l:col = matchend(l:line, '^\s*[]})]') - if l:col > 0 && !s:InString(v:lnum, l:col) - let l:bracket = l:line[l:col - 1] - call cursor(v:lnum, l:col) - - if l:bracket is# '}' - let l:matched = searchpair('{', '', '}', 'bW') - elseif l:bracket is# ']' - let l:matched = searchpair('\[', '', '\]', 'bW') - elseif l:bracket is# ')' - let l:matched = searchpair('(', '', ')', 'bW') - else - let l:matched = -1 - endif - - return l:matched > 0 ? indent(l:matched) : virtcol('.') - 1 - endif - - " If we're inside of a multiline string, continue with the same indentation. - if s:InString(v:lnum, matchend(l:line, '^\s*') + 1) - return indent(v:lnum) - endif - - " If the previous line contained an opening bracket, and we are still in it, - " add indent depending on the bracket type. - if getline(l:prevlnum) =~# '[[{(]\s*$' - return indent(l:prevlnum) + shiftwidth() - endif - - " Default to the existing indentation level. - return indent(l:prevlnum) -endfunction - -let &cpoptions = s:cpo_save -unlet s:cpo_save - -endif diff --git a/syntax/graphql.vim b/syntax/graphql.vim deleted file mode 100644 index 8a7f07c..0000000 --- a/syntax/graphql.vim +++ /dev/null @@ -1,67 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1 - -" Vim syntax file -" Language: GraphQL -" Maintainer: Jon Parise - -if exists('b:current_syntax') - finish -endif - -syn match graphqlComment "#.*$" contains=@Spell - -syn match graphqlOperator "=" -syn match graphqlOperator "!" -syn match graphqlOperator "|" -syn match graphqlOperator "\M..." - -syn keyword graphqlBoolean true false -syn keyword graphqlNull null -syn match graphqlNumber "-\=\<\%(0\|[1-9]\d*\)\%(\.\d\+\)\=\%([eE][-+]\=\d\+\)\=\>" -syn region graphqlString start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ - -syn keyword graphqlKeyword on nextgroup=graphqlType skipwhite - -syn keyword graphqlStructure enum scalar type union nextgroup=graphqlType skipwhite -syn keyword graphqlStructure input interface subscription nextgroup=graphqlType skipwhite -syn keyword graphqlStructure implements nextgroup=graphqlType skipwhite -syn keyword graphqlStructure query mutation fragment nextgroup=graphqlIdentifier skipwhite -syn keyword graphqlStructure directive nextgroup=graphqlDirective skipwhite -syn keyword graphqlStructure extend nextgroup=graphqlStructure skipwhite - -syn match graphqlDirective "\<@\h\w*\>" display -syn match graphqlVariable "\<\$\h\w*\>" display - -syn match graphqlIdentifier "\<\h\w*\>" display contained -syn match graphqlType "\<_*\u\w*\>" display contained -syn match graphqlConstant "\<[A-Z_]\+\>" display contained - -syn keyword graphqlMetaFields __schema __type __typename - -syn region graphqlFold matchgroup=graphqlBraces start="{" end=/}\(\_s\+\ze\("\|{\)\)\@!/ transparent fold contains=ALLBUT,graphqlStructure -syn region graphqlList matchgroup=graphqlBraces start="\[" end=/]\(\_s\+\ze"\)\@!/ transparent contains=ALLBUT,graphqlDirective,graphqlStructure - -hi def link graphqlComment Comment -hi def link graphqlOperator Operator - -hi def link graphqlBraces Delimiter - -hi def link graphqlBoolean Boolean -hi def link graphqlNull Keyword -hi def link graphqlNumber Number -hi def link graphqlString String - -hi def link graphqlConstant Constant -hi def link graphqlDirective PreProc -hi def link graphqlIdentifier Identifier -hi def link graphqlMetaFields Special -hi def link graphqlKeyword Keyword -hi def link graphqlStructure Structure -hi def link graphqlType Type -hi def link graphqlVariable Identifier - -syn sync minlines=500 - -let b:current_syntax = 'graphql' - -endif