diff options
| -rw-r--r-- | after/indent/javascript-1.vim | 9 | ||||
| -rw-r--r-- | after/indent/javascript-2.vim | 47 | ||||
| -rw-r--r-- | after/indent/javascript.vim | 12 | ||||
| -rw-r--r-- | after/indent/typescript.vim | 47 | ||||
| -rw-r--r-- | packages.yaml | 4 |
5 files changed, 106 insertions, 13 deletions
diff --git a/after/indent/javascript-1.vim b/after/indent/javascript-1.vim new file mode 100644 index 00000000..2992e942 --- /dev/null +++ b/after/indent/javascript-1.vim @@ -0,0 +1,9 @@ +if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1) + +if get(g:, 'vim_jsx_pretty_disable_js', 0) + finish +endif + +source <sfile>:h/jsx.vim + +endif diff --git a/after/indent/javascript-2.vim b/after/indent/javascript-2.vim new file mode 100644 index 00000000..4e066e6f --- /dev/null +++ b/after/indent/javascript-2.vim @@ -0,0 +1,47 @@ +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1 + +" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org> +" +" Permission is hereby granted, free of charge, to any person obtaining a copy +" of this software and associated documentation files (the "Software"), to +" deal in the Software without restriction, including without limitation the +" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +" sell copies of the Software, and to permit persons to whom the Software is +" furnished to do so, subject to the following conditions: +" +" The above copyright notice and this permission notice shall be included in +" all copies or substantial portions of the Software. +" +" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +" IN THE SOFTWARE. +" +" Language: GraphQL +" Maintainer: Jon Parise <jon@indelible.org> + +runtime! indent/graphql.vim + +" Don't redefine our function and also require the standard Javascript indent +" function to exist. +if exists('*GetJavascriptGraphQLIndent') || !exists('*GetJavascriptIndent') + finish +endif + +" Set the indentexpr with our own version that will call GetGraphQLIndent when +" we're inside of a GraphQL string and otherwise defer to GetJavascriptIndent. +setlocal indentexpr=GetJavascriptGraphQLIndent() + +function GetJavascriptGraphQLIndent() + let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val,'name')") + if !empty(l:stack) && l:stack[0] ==# 'graphqlTemplateString' + return GetGraphQLIndent() + endif + + return GetJavascriptIndent() +endfunction + +endif diff --git a/after/indent/javascript.vim b/after/indent/javascript.vim index 2992e942..e3d355fc 100644 --- a/after/indent/javascript.vim +++ b/after/indent/javascript.vim @@ -1,9 +1,3 @@ -if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1) - -if get(g:, 'vim_jsx_pretty_disable_js', 0) - finish -endif - -source <sfile>:h/jsx.vim - -endif +" Polyglot metafile +source <sfile>:h/javascript-1.vim +source <sfile>:h/javascript-2.vim diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim new file mode 100644 index 00000000..968517c8 --- /dev/null +++ b/after/indent/typescript.vim @@ -0,0 +1,47 @@ +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1 + +" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org> +" +" Permission is hereby granted, free of charge, to any person obtaining a copy +" of this software and associated documentation files (the "Software"), to +" deal in the Software without restriction, including without limitation the +" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +" sell copies of the Software, and to permit persons to whom the Software is +" furnished to do so, subject to the following conditions: +" +" The above copyright notice and this permission notice shall be included in +" all copies or substantial portions of the Software. +" +" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +" IN THE SOFTWARE. +" +" Language: GraphQL +" Maintainer: Jon Parise <jon@indelible.org> + +runtime! indent/graphql.vim + +" Don't redefine our function and also require the standard Typescript indent +" function to exist. +if exists('*GetTypescriptGraphQLIndent') || !exists('*GetTypescriptIndent') + finish +endif + +" Set the indentexpr with our own version that will call GetGraphQLIndent when +" we're inside of a GraphQL string and otherwise defer to GetTypescriptIndent. +setlocal indentexpr=GetTypescriptGraphQLIndent() + +function GetTypescriptGraphQLIndent() + let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val,'name')") + if !empty(l:stack) && l:stack[0] ==# 'graphqlTemplateString' + return GetGraphQLIndent() + endif + + return GetTypescriptIndent() +endfunction + +endif diff --git a/packages.yaml b/packages.yaml index 2baddea2..f5d42425 100644 --- a/packages.yaml +++ b/packages.yaml @@ -687,10 +687,6 @@ name: graphql remote: jparise/vim-graphql dependencies: javascript after: jsx -ignored_dirs: -# TODO: remove after bug is fixed: -# https://github.com/jparise/vim-graphql/issues/62 -- after/indent filetypes: - name: graphql linguist: GraphQL |