Skip to content

Commit 4f53883

Browse files
sheerunsheerun
committed
Update
1 parent 4899585 commit 4f53883

File tree

21 files changed

+77
-43
lines changed

21 files changed

+77
-43
lines changed

‎autoload/clojurecomplete.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ endif
44

55
" Vim completion script
66
" Language: Clojure
7-
" Maintainer: Alex Vear <[email protected]>
7+
" Maintainer: Alex Vear <[email protected]>
88
" Former Maintainers: Sung Pae <[email protected]>
99
" URL: https://github.com/clojure-vim/clojure.vim
1010
" License: Vim (see :h license)

‎autoload/elixir/indent.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ endfunction
108108
" Returns 0 or 1 based on whether or not the given line number and column
109109
" number pair is a string or comment
110110
function! s:is_string_or_comment(line, col)
111-
return s:syntax_name(a:line, a:col) =~ '\%(String\|Comment\)'
111+
return s:syntax_name(a:line, a:col) =~ '\%(String\|Comment\|CharList\)'
112112
endfunction
113113

114114
function! s:syntax_name(line, col)
@@ -149,7 +149,7 @@ function! s:find_last_pos(lnum, text, match)
149149
let peek_match = match(peek, a:match)
150150
if peek_match == ss_match + 1
151151
let syng = synIDattr(synID(a:lnum, c + ss_match, 1), 'name')
152-
if syng !~ '\%(String\|Comment\)'
152+
if syng !~ '\%(String\|Comment\|CharList\)'
153153
return c + ss_match
154154
end
155155
end
@@ -169,7 +169,7 @@ function! elixir#indent#handle_top_of_file(context)
169169
endfunction
170170

171171
function! elixir#indent#handle_starts_with_string_continuation(context)
172-
if s:syntax_name(a:context.lnum, a:context.first_nb_char_idx) =~ '\(String\|Comment\)$'
172+
if s:syntax_name(a:context.lnum, a:context.first_nb_char_idx) =~ '\(String\|Comment\|CharList\)$'
173173
return -2
174174
else
175175
return -1

‎autoload/go/config.vim

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ endfunction
275275
function! go#config#MetalinterAutosaveEnabled() abort
276276
let l:default = []
277277
if get(g:, 'go_metalinter_command', s:default_metalinter) == 'golangci-lint'
278-
let l:default = ['govet', 'golint']
278+
let l:default = ['govet', 'revive']
279279
endif
280280

281281
return get(g:, 'go_metalinter_autosave_enabled', l:default)
@@ -284,14 +284,14 @@ endfunction
284284
function! go#config#MetalinterEnabled() abort
285285
let l:default = []
286286
if get(g:, 'go_metalinter_command', s:default_metalinter) == 'golangci-lint'
287-
let l:default = ['vet', 'golint', 'errcheck']
287+
let l:default = ['vet', 'revive', 'errcheck']
288288
endif
289289

290290
return get(g:, 'go_metalinter_enabled', l:default)
291291
endfunction
292292

293293
function! go#config#GolintBin() abort
294-
return get(g:, "go_golint_bin", "golint")
294+
return get(g:, "go_golint_bin", "revive")
295295
endfunction
296296

297297
function! go#config#ErrcheckBin() abort
@@ -615,6 +615,10 @@ function! go#config#DebugMappings() abort
615615
return extend(l:user, l:default, 'keep')
616616
endfunction
617617

618+
function! go#config#DocBalloon() abort
619+
return get(g:, 'go_doc_balloon', 0)
620+
endfunction
621+
618622
" Set the default value. A value of "1" is a shortcut for this, for
619623
" compatibility reasons.
620624
if exists("g:go_gorename_prefill") && g:go_gorename_prefill == 1

‎autoload/org.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ endif
44

55
" Helper functions for org.vim
66
"
7-
" Maintainer: Alex Vear <[email protected]>
7+
" Maintainer: Alex Vear <[email protected]>
88
" License: Vim (see `:help license`)
99
" Location: autoload/org.vim
1010
" Website: https://github.com/axvr/org.vim

‎autoload/polyglot/ft.vim

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,17 @@ func polyglot#ft#FTent()
172172
setf dtd
173173
endfunc
174174

175+
func polyglot#ft#ExCheck()
176+
let lines = getline(1, min([line("$"), 100]))
177+
if exists('g:filetype_euphoria')
178+
exe 'setf ' . g:filetype_euphoria
179+
elseif match(lines, '^--\|^ifdef\>\|^include\>') > -1
180+
setf euphoria3
181+
else
182+
setf elixir
183+
endif
184+
endfunc
185+
175186
func polyglot#ft#EuphoriaCheck()
176187
if exists('g:filetype_euphoria')
177188
exe 'setf ' . g:filetype_euphoria

‎autoload/polyglot/sleuth.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ let s:globs = {
257257
\ 'jam': '*.jpl,*.jpr,Prl*.*,JAM*.*',
258258
\ 'java': '*.java,*.jav',
259259
\ 'javacc': '*.jj,*.jjt',
260-
\ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,*.javascript,Jakefile',
260+
\ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile',
261261
\ 'javascriptreact': '*.jsx',
262262
\ 'jess': '*.clp',
263263
\ 'jgraph': '*.jgr',

‎autoload/zig/fmt.vim

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function! zig#fmt#Format() abort
1717
return
1818
endif
1919

20-
let cmdline = 'zig fmt --stdin'
20+
let cmdline = 'zig fmt --stdin --ast-check'
2121
let current_buf = bufnr('')
2222

2323
" The formatted code is output on stdout, the errors go on stderr.
@@ -26,8 +26,19 @@ function! zig#fmt#Format() abort
2626
else
2727
silent let out = split(system(cmdline, current_buf))
2828
endif
29+
if len(out) == 1
30+
if out[0] == "error: unrecognized parameter: '--ast-check'"
31+
let cmdline = 'zig fmt --stdin'
32+
if exists('*systemlist')
33+
silent let out = systemlist(cmdline, current_buf)
34+
else
35+
silent let out = split(system(cmdline, current_buf))
36+
endif
37+
endif
38+
endif
2939
let err = v:shell_error
3040

41+
3142
if err == 0
3243
" remove undo point caused via BufWritePre.
3344
try | silent undojoin | catch | endtry

‎extras/filetype.vim

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim support file to detect file types
22
"
33
" Maintainer: Bram Moolenaar <[email protected]>
4-
" Last Change: 2021 Apr 17
4+
" Last Change: 2021 Jun 13
55

66
" Listen very carefully, I will say this only once
77
if exists("did_load_filetypes")
@@ -393,7 +393,7 @@ au BufNewFile,BufRead *.cfm,*.cfi,*.cfc setf cf
393393
" Configure scripts
394394
au BufNewFile,BufRead configure.in,configure.ac setf config
395395

396-
" CUDA Cumpute Unified Device Architecture
396+
" CUDA Compute Unified Device Architecture
397397
au BufNewFile,BufRead *.cu,*.cuh setf cuda
398398

399399
" Dockerfile; Podman uses the same syntax with name Containerfile
@@ -408,8 +408,15 @@ au BufNewFile,BufRead *enlightenment/*.cfg setf c
408408
" Eterm
409409
au BufNewFile,BufRead *Eterm/*.cfg setf eterm
410410

411+
" Elixir or Euphoria
412+
au BufNewFile,BufRead *.ex call polyglot#ft#ExCheck()
413+
414+
" Elixir
415+
au BufRead,BufNewFile mix.lock,*.exs setf elixir
416+
au BufRead,BufNewFile *.eex,*.leex setf eelixir
417+
411418
" Euphoria 3 or 4
412-
au BufNewFile,BufRead *.eu,*.ew,*.ex,*.exu,*.exw call polyglot#ft#EuphoriaCheck()
419+
au BufNewFile,BufRead *.eu,*.ew,*.exu,*.exw call polyglot#ft#EuphoriaCheck()
413420
if has("fname_case")
414421
au BufNewFile,BufRead *.EU,*.EW,*.EX,*.EXU,*.EXW call polyglot#ft#EuphoriaCheck()
415422
endif
@@ -855,6 +862,12 @@ au BufNewFile,BufRead *.jov,*.j73,*.jovial setf jovial
855862
" JSON
856863
au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest setf json
857864

865+
" JSON Patch (RFC 6902)
866+
au BufNewFile,BufRead *.json-patch setf json
867+
868+
" Jupyter Notebook is also json
869+
au BufNewFile,BufRead *.ipynb setf json
870+
858871
" Kixtart
859872
au BufNewFile,BufRead *.kix setf kix
860873

‎ftplugin/clojure.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ endif
44

55
" Vim filetype plugin file
66
" Language: Clojure
7-
" Maintainer: Alex Vear <[email protected]>
7+
" Maintainer: Alex Vear <[email protected]>
88
" Former Maintainers: Sung Pae <[email protected]>
99
" Meikel Brandmeyer <[email protected]>
1010
" URL: https://github.com/clojure-vim/clojure.vim

‎ftplugin/org.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ endif
44

55
" Vim filetype plugin for GNU Emacs' Org mode
66
"
7-
" Maintainer: Alex Vear <[email protected]>
7+
" Maintainer: Alex Vear <[email protected]>
88
" License: Vim (see `:help license`)
99
" Location: ftplugin/org.vim
1010
" Website: https://github.com/axvr/org.vim
11-
" Last Change: 2020-01-04
11+
" Last Change: 2020-02-15
1212
"
1313
" Reference Specification: Org mode manual
1414
" GNU Info: `$ info Org`

0 commit comments

Comments
 (0)