summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw0rp <w0rp@users.noreply.github.com>2018-09-14 11:41:47 +0100
committerGitHub <noreply@github.com>2018-09-14 11:41:47 +0100
commitf380d8508e2e8c80bb1d1ed6f934b953f1c37bc2 (patch)
treeaf0bb8cc788c0d72a5dfb683fe82ff6524351343
parent78af99c2566ef8fed443ce253e0de9323b9e5043 (diff)
parentc48106f48450840c4d098e3d107c48102e219669 (diff)
downloadale-f380d8508e2e8c80bb1d1ed6f934b953f1c37bc2.zip
Merge pull request #1919 from saschagrunert/patch-1
Change PCRE escape to simple escape
-rw-r--r--ale_linters/go/golangci_lint.vim2
-rw-r--r--test/command_callback/test_golangci_lint_command_callback.vader6
2 files changed, 4 insertions, 4 deletions
diff --git a/ale_linters/go/golangci_lint.vim b/ale_linters/go/golangci_lint.vim
index b44a6239..dd9a3c64 100644
--- a/ale_linters/go/golangci_lint.vim
+++ b/ale_linters/go/golangci_lint.vim
@@ -18,7 +18,7 @@ function! ale_linters#go#golangci_lint#GetCommand(buffer) abort
return ale#path#BufferCdString(a:buffer)
\ . '%e run '
- \ . ale#util#EscapePCRE(l:filename)
+ \ . ale#Escape(l:filename)
\ . ' ' . l:options
endfunction
diff --git a/test/command_callback/test_golangci_lint_command_callback.vader b/test/command_callback/test_golangci_lint_command_callback.vader
index 6cb73246..b3805f3a 100644
--- a/test/command_callback/test_golangci_lint_command_callback.vader
+++ b/test/command_callback/test_golangci_lint_command_callback.vader
@@ -9,7 +9,7 @@ Execute(The golangci-lint defaults should be correct):
AssertLinter 'golangci-lint',
\ 'cd ' . ale#Escape(expand('%:p:h')) . ' && '
\ . ale#Escape('golangci-lint')
- \ . ' run ' . ale#util#EscapePCRE(expand('%' . ':t'))
+ \ . ' run ' . ale#Escape(expand('%' . ':t'))
\ . ' --enable-all'
Execute(The golangci-lint callback should use a configured executable):
@@ -18,7 +18,7 @@ Execute(The golangci-lint callback should use a configured executable):
AssertLinter 'something else',
\ 'cd ' . ale#Escape(expand('%:p:h')) . ' && '
\ . ale#Escape('something else')
- \ . ' run ' . ale#util#EscapePCRE(expand('%' . ':t'))
+ \ . ' run ' . ale#Escape(expand('%' . ':t'))
\ . ' --enable-all'
Execute(The golangci-lint callback should use configured options):
@@ -27,7 +27,7 @@ Execute(The golangci-lint callback should use configured options):
AssertLinter 'golangci-lint',
\ 'cd ' . ale#Escape(expand('%:p:h')) . ' && '
\ . ale#Escape('golangci-lint')
- \ . ' run ' . ale#util#EscapePCRE(expand('%' . ':t'))
+ \ . ' run ' . ale#Escape(expand('%' . ':t'))
\ . ' --foobar'
Execute(The golangci-lint `lint_package` option should use the correct command):