summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2019-09-12 14:32:53 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2019-09-12 14:32:53 +0200
commit26790941f6d4ceedbf6324eb3712949eb614908f (patch)
treee6e3ba2a0a04fa07b3b462bda2c23a20ced13313
parentfbc2af9e820d85e17cd08023f4dcc66545735d58 (diff)
downloadvim-polyglot-26790941f6d4ceedbf6324eb3712949eb614908f.tar.gz
vim-polyglot-26790941f6d4ceedbf6324eb3712949eb614908f.zip
Update
Diffstat (limited to '')
-rw-r--r--autoload/go/config.vim4
-rw-r--r--autoload/jsx_pretty/comment.vim4
-rw-r--r--compiler/go.vim15
3 files changed, 11 insertions, 12 deletions
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index ed03d910..3815bb6a 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -225,7 +225,7 @@ function! go#config#DebugCommands() abort
endfunction
function! go#config#DebugLogOutput() abort
- return get(g:, 'go_debug_log_output', 'debugger, rpc')
+ return get(g:, 'go_debug_log_output', 'debugger,rpc')
endfunction
function! go#config#LspLog() abort
@@ -259,7 +259,7 @@ function! go#config#SetTemplateAutocreate(value) abort
endfunction
function! go#config#MetalinterCommand() abort
- return get(g:, "go_metalinter_command", "gometalinter")
+ return get(g:, "go_metalinter_command", "golangci-lint")
endfunction
function! go#config#MetalinterAutosaveEnabled() abort
diff --git a/autoload/jsx_pretty/comment.vim b/autoload/jsx_pretty/comment.vim
index 932d5535..4ce4e3a7 100644
--- a/autoload/jsx_pretty/comment.vim
+++ b/autoload/jsx_pretty/comment.vim
@@ -2,7 +2,7 @@ if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript')
function! jsx_pretty#comment#update_commentstring(original)
let syn_current = s:syn_name(line('.'), col('.'))
let syn_start = s:syn_name(line('.'), 1)
- let save_cursor = getcurpos()
+ let save_view = winsaveview()
if syn_start =~? '^jsx'
let line = getline(".")
@@ -23,7 +23,7 @@ function! jsx_pretty#comment#update_commentstring(original)
endif
" Restore the cursor position
- call setpos('.', save_cursor)
+ call winrestview(save_view)
endfunction
function! s:syn_name(lnum, cnum)
diff --git a/compiler/go.vim b/compiler/go.vim
index e5d1e061..2eb893fa 100644
--- a/compiler/go.vim
+++ b/compiler/go.vim
@@ -32,14 +32,13 @@ endif
" use a different output, for those we define them directly and modify the
" errorformat ourselves. More information at:
" http://vimdoc.sourceforge.net/htmldoc/quickfix.html#errorformat
-CompilerSet errorformat =%-G#\ %.%# " Ignore lines beginning with '#' ('# command-line-arguments' line sometimes appears?)
-CompilerSet errorformat+=%-G%.%#panic:\ %m " Ignore lines containing 'panic: message'
-CompilerSet errorformat+=%Ecan\'t\ load\ package:\ %m " Start of multiline error string is 'can\'t load package'
-CompilerSet errorformat+=%A%f:%l:%c:\ %m " Start of multiline unspecified string is 'filename:linenumber:columnnumber:'
-CompilerSet errorformat+=%A%f:%l:\ %m " Start of multiline unspecified string is 'filename:linenumber:'
-CompilerSet errorformat+=%C%*\\s%m " Continuation of multiline error message is indented
-CompilerSet errorformat+=%-G%.%# " All lines not matching any of the above patterns are ignored
-
+CompilerSet errorformat =%-G#\ %.%# " Ignore lines beginning with '#' ('# command-line-arguments' line sometimes appears?)
+CompilerSet errorformat+=%-G%.%#panic:\ %m " Ignore lines containing 'panic: message'
+CompilerSet errorformat+=%Ecan\'t\ load\ package:\ %m " Start of multiline error string is 'can\'t load package'
+CompilerSet errorformat+=%A%\\%%(%[%^:]%\\+:\ %\\)%\\?%f:%l:%c:\ %m " Start of multiline unspecified string is 'filename:linenumber:columnnumber:'
+CompilerSet errorformat+=%A%\\%%(%[%^:]%\\+:\ %\\)%\\?%f:%l:\ %m " Start of multiline unspecified string is 'filename:linenumber:'
+CompilerSet errorformat+=%C%*\\s%m " Continuation of multiline error message is indented
+CompilerSet errorformat+=%-G%.%# " All lines not matching any of the above patterns are ignored
let &cpo = s:save_cpo
unlet s:save_cpo