Skip to content

Commit c0b866a

Browse files
sheerunsheerun
committed
Add graphql indentation again, thanks @jparise!
1 parent b4868c7 commit c0b866a

File tree

5 files changed

+106
-13
lines changed

5 files changed

+106
-13
lines changed

‎after/indent/javascript-1.vim‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
2+
3+
if get(g:, 'vim_jsx_pretty_disable_js', 0)
4+
finish
5+
endif
6+
7+
source <sfile>:h/jsx.vim
8+
9+
endif

‎after/indent/javascript-2.vim‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
2+
3+
" Copyright (c) 2016-2020 Jon Parise <[email protected]>
4+
"
5+
" Permission is hereby granted, free of charge, to any person obtaining a copy
6+
" of this software and associated documentation files (the "Software"), to
7+
" deal in the Software without restriction, including without limitation the
8+
" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
9+
" sell copies of the Software, and to permit persons to whom the Software is
10+
" furnished to do so, subject to the following conditions:
11+
"
12+
" The above copyright notice and this permission notice shall be included in
13+
" all copies or substantial portions of the Software.
14+
"
15+
" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
20+
" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
21+
" IN THE SOFTWARE.
22+
"
23+
" Language: GraphQL
24+
" Maintainer: Jon Parise <[email protected]>
25+
26+
runtime! indent/graphql.vim
27+
28+
" Don't redefine our function and also require the standard Javascript indent
29+
" function to exist.
30+
if exists('*GetJavascriptGraphQLIndent') || !exists('*GetJavascriptIndent')
31+
finish
32+
endif
33+
34+
" Set the indentexpr with our own version that will call GetGraphQLIndent when
35+
" we're inside of a GraphQL string and otherwise defer to GetJavascriptIndent.
36+
setlocal indentexpr=GetJavascriptGraphQLIndent()
37+
38+
function GetJavascriptGraphQLIndent()
39+
let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val,'name')")
40+
if !empty(l:stack) && l:stack[0] ==# 'graphqlTemplateString'
41+
return GetGraphQLIndent()
42+
endif
43+
44+
return GetJavascriptIndent()
45+
endfunction
46+
47+
endif

‎after/indent/javascript.vim‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
2-
3-
if get(g:, 'vim_jsx_pretty_disable_js', 0)
4-
finish
5-
endif
6-
7-
source <sfile>:h/jsx.vim
8-
9-
endif
1+
" Polyglot metafile
2+
source <sfile>:h/javascript-1.vim
3+
source <sfile>:h/javascript-2.vim

‎after/indent/typescript.vim‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
2+
3+
" Copyright (c) 2016-2020 Jon Parise <[email protected]>
4+
"
5+
" Permission is hereby granted, free of charge, to any person obtaining a copy
6+
" of this software and associated documentation files (the "Software"), to
7+
" deal in the Software without restriction, including without limitation the
8+
" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
9+
" sell copies of the Software, and to permit persons to whom the Software is
10+
" furnished to do so, subject to the following conditions:
11+
"
12+
" The above copyright notice and this permission notice shall be included in
13+
" all copies or substantial portions of the Software.
14+
"
15+
" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
20+
" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
21+
" IN THE SOFTWARE.
22+
"
23+
" Language: GraphQL
24+
" Maintainer: Jon Parise <[email protected]>
25+
26+
runtime! indent/graphql.vim
27+
28+
" Don't redefine our function and also require the standard Typescript indent
29+
" function to exist.
30+
if exists('*GetTypescriptGraphQLIndent') || !exists('*GetTypescriptIndent')
31+
finish
32+
endif
33+
34+
" Set the indentexpr with our own version that will call GetGraphQLIndent when
35+
" we're inside of a GraphQL string and otherwise defer to GetTypescriptIndent.
36+
setlocal indentexpr=GetTypescriptGraphQLIndent()
37+
38+
function GetTypescriptGraphQLIndent()
39+
let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val,'name')")
40+
if !empty(l:stack) && l:stack[0] ==# 'graphqlTemplateString'
41+
return GetGraphQLIndent()
42+
endif
43+
44+
return GetTypescriptIndent()
45+
endfunction
46+
47+
endif

‎packages.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -687,10 +687,6 @@ name: graphql
687687
remote: jparise/vim-graphql
688688
dependencies: javascript
689689
after: jsx
690-
ignored_dirs:
691-
# TODO: remove after bug is fixed:
692-
# https://github.com/jparise/vim-graphql/issues/62
693-
- after/indent
694690
filetypes:
695691
- name: graphql
696692
linguist: GraphQL

0 commit comments

Comments
 (0)