From 5c7b55edec8ff3c400d429436c1dc68037eebbb0 Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Tue, 11 Jul 2017 16:52:18 +0200 Subject: [PATCH] Make gometalinter work again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They changed their logic to use related paths instead of absoluut paths (see [here](https://github.com/alecthomas/gometalinter/commit/a04df08be5899be3c7ad69aa379858dcb660c709#diff-04424ed7c660c10495a54e8d11be89eaR253)) This fixes the linter by also using relative paths… --- ale_linters/go/gometalinter.vim | 4 ++-- .../test_gometalinter_command_callback.vader | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ale_linters/go/gometalinter.vim b/ale_linters/go/gometalinter.vim index db7f7c11..95251303 100644 --- a/ale_linters/go/gometalinter.vim +++ b/ale_linters/go/gometalinter.vim @@ -10,11 +10,11 @@ endfunction function! ale_linters#go#gometalinter#GetCommand(buffer) abort let l:executable = ale_linters#go#gometalinter#GetExecutable(a:buffer) - let l:filename = expand('#' . a:buffer . ':p') + let l:filename = expand('#' . a:buffer) let l:options = ale#Var(a:buffer, 'go_gometalinter_options') return ale#Escape(l:executable) - \ . ' --include=''^' . l:filename . '.*$''' + \ . ' --include=' . ale#Escape(l:filename) \ . (!empty(l:options) ? ' ' . l:options : '') \ . ' ' . ale#Escape(fnamemodify(l:filename, ':h')) endfunction diff --git a/test/command_callback/test_gometalinter_command_callback.vader b/test/command_callback/test_gometalinter_command_callback.vader index 24c85aba..f1b4e9f0 100644 --- a/test/command_callback/test_gometalinter_command_callback.vader +++ b/test/command_callback/test_gometalinter_command_callback.vader @@ -22,7 +22,7 @@ Execute(The gometalinter callback should return the right defaults): \ ale_linters#go#gometalinter#GetExecutable(bufnr('')) AssertEqual \ ale#Escape('gometalinter') - \ . ' --include=''^' . expand('%:p') . '.*$''' + \ . ' --include=' . ale#Escape(expand('%')) \ . ' ' . ale#Escape(getcwd()), \ ale_linters#go#gometalinter#GetCommand(bufnr('')) @@ -34,7 +34,7 @@ Execute(The gometalinter callback should use a configured executable): \ ale_linters#go#gometalinter#GetExecutable(bufnr('')) AssertEqual \ ale#Escape('something else') - \ . ' --include=''^' . expand('%:p') . '.*$''' + \ . ' --include=' . ale#Escape(expand('%')) \ . ' ' . ale#Escape(getcwd()), \ ale_linters#go#gometalinter#GetCommand(bufnr('')) @@ -43,7 +43,7 @@ Execute(The gometalinter callback should use configured options): AssertEqual \ ale#Escape('gometalinter') - \ . ' --include=''^' . expand('%:p') . '.*$''' + \ . ' --include=' . ale#Escape(expand('%')) \ . ' --foobar' \ . ' ' . ale#Escape(getcwd()), \ ale_linters#go#gometalinter#GetCommand(bufnr(''))