Revert "Show problems from other files for gobuild and gometalinter"

This reverts commit e721f851b41b8f6f31067ae2a137019e1cb5546c.

5 files changed, 16 insertions, 15 deletions

diff --git a/ale_linters/go/gobuild.vim b/ale_linters/go/gobuild.vim
index 783b9e0a..143c2fd0 100644
--- a/ale_linters/go/gobuild.vim
+++ b/ale_linters/go/gobuild.vim
@@ -1,5 +1,4 @@
-" Author: Joshua Rubin <joshua@rubixconsulting.com>, Ben Reedy <https://github.com/breed808>,
-" Jeff Willette <jrwillette88@gmail.com>
+" Author: Joshua Rubin <joshua@rubixconsulting.com>, Ben Reedy <https://github.com/breed808>
 " Description: go build for Go files
 
 " inspired by work from dzhou121 <dzhou121@gmail.com>
@@ -40,12 +39,15 @@ function! ale_linters#go#gobuild#GetMatches(lines) abort
 endfunction
 
 function! ale_linters#go#gobuild#Handler(buffer, lines) abort
-    let l:dir = expand('#' . a:buffer . ':p:h')
     let l:output = []
 
     for l:match in ale_linters#go#gobuild#GetMatches(a:lines)
+        " Omit errors from imported go packages
+        if !ale#path#IsBufferPath(a:buffer, l:match[1])
+            continue
+        endif
+
         call add(l:output, {
-        \   'filename': ale#path#GetAbsPath(l:dir, l:match[1]),
         \   'lnum': l:match[2] + 0,
         \   'col': l:match[3] + 0,
         \   'text': l:match[4],
diff --git a/ale_linters/go/gometalinter.vim b/ale_linters/go/gometalinter.vim
index 7f75c44e..f1abfc83 100644
--- a/ale_linters/go/gometalinter.vim
+++ b/ale_linters/go/gometalinter.vim
@@ -1,4 +1,4 @@
-" Author: Ben Reedy <https://github.com/breed808>, Jeff Willette <jrwillette88@gmail.com>
+" Author: Ben Reedy <https://github.com/breed808>
 " Description: Adds support for the gometalinter suite for Go files
 
 call ale#Set('go_gometalinter_options', '')
@@ -14,6 +14,7 @@ function! ale_linters#go#gometalinter#GetCommand(buffer) abort
     let l:options = ale#Var(a:buffer, 'go_gometalinter_options')
 
     return ale#Escape(l:executable)
+    \   . ' --include=' . ale#Escape('^' . ale#util#EscapePCRE(l:filename))
     \   . (!empty(l:options) ? ' ' . l:options : '')
     \   . ' ' . ale#Escape(fnamemodify(l:filename, ':h'))
 endfunction
@@ -25,12 +26,10 @@ function! ale_linters#go#gometalinter#GetMatches(lines) abort
 endfunction
 
 function! ale_linters#go#gometalinter#Handler(buffer, lines) abort
-    let l:dir = expand('#' . a:buffer . ':p:h')
     let l:output = []
 
     for l:match in ale_linters#go#gometalinter#GetMatches(a:lines)
         call add(l:output, {
-        \   'filename': ale#path#GetAbsPath(l:dir, l:match[1]),
         \   'lnum': l:match[2] + 0,
         \   'col': l:match[3] + 0,
         \   'type': tolower(l:match[4]) is# 'warning' ? 'W' : 'E',
diff --git a/test/command_callback/test_gometalinter_command_callback.vader b/test/command_callback/test_gometalinter_command_callback.vader
index b45d8119..912396cb 100644
--- a/test/command_callback/test_gometalinter_command_callback.vader
+++ b/test/command_callback/test_gometalinter_command_callback.vader
@@ -22,6 +22,7 @@ Execute(The gometalinter callback should return the right defaults):
   \ ale_linters#go#gometalinter#GetExecutable(bufnr(''))
   AssertEqual
   \ ale#Escape('gometalinter')
+  \   . ' --include=' . ale#Escape('^' . ale#util#EscapePCRE(expand('%')))
   \   . ' ' . ale#Escape(getcwd()),
   \ ale_linters#go#gometalinter#GetCommand(bufnr(''))
 
@@ -33,6 +34,7 @@ Execute(The gometalinter callback should use a configured executable):
   \ ale_linters#go#gometalinter#GetExecutable(bufnr(''))
   AssertEqual
   \ ale#Escape('something else')
+  \   . ' --include=' . ale#Escape('^' . ale#util#EscapePCRE(expand('%')))
   \   . ' ' . ale#Escape(getcwd()),
   \ ale_linters#go#gometalinter#GetCommand(bufnr(''))
 
@@ -41,6 +43,7 @@ Execute(The gometalinter callback should use configured options):
 
   AssertEqual
   \ ale#Escape('gometalinter')
+  \   . ' --include=' . ale#Escape('^' . ale#util#EscapePCRE(expand('%')))
   \   . ' --foobar'
   \   . ' ' . ale#Escape(getcwd()),
   \ ale_linters#go#gometalinter#GetCommand(bufnr(''))
diff --git a/test/handler/test_gobuild_handler.vader b/test/handler/test_gobuild_handler.vader
index ec77f9c4..ce2119cd 100644
--- a/test/handler/test_gobuild_handler.vader
+++ b/test/handler/test_gobuild_handler.vader
@@ -28,7 +28,7 @@ Execute (The gobuild handler should handle names with spaces):
   \ ]), 'v:val[1:4]')
 
 Execute (The gobuild handler should handle relative paths correctly):
-  call ale#test#SetFilename('app/test.go')
+  silent file! /foo/bar/baz.go
 
   AssertEqual
   \ [
@@ -37,9 +37,8 @@ Execute (The gobuild handler should handle relative paths correctly):
   \     'col': 0,
   \     'text': 'missing argument for Printf("%s"): format reads arg 2, have only 1 args',
   \     'type': 'E',
-  \     'filename': ale#path#Winify(expand('%:p:h') . '/test.go'),
   \   },
   \ ],
   \ ale_linters#go#gobuild#Handler(bufnr(''), [
-  \   'test.go:27: missing argument for Printf("%s"): format reads arg 2, have only 1 args',
+  \   'baz.go:27: missing argument for Printf("%s"): format reads arg 2, have only 1 args',
   \ ])
diff --git a/test/handler/test_gometalinter_handler.vader b/test/handler/test_gometalinter_handler.vader
index 127d093e..603ba22d 100644
--- a/test/handler/test_gometalinter_handler.vader
+++ b/test/handler/test_gometalinter_handler.vader
@@ -30,7 +30,7 @@ Execute (The gometalinter handler should handle names with spaces):
   \ ]), 'v:val[1:5]')
 
 Execute (The gometalinter handler should handle relative paths correctly):
-  call ale#test#SetFilename('app/test.go')
+  silent file /foo/bar/baz.go
 
   AssertEqual
   \ [
@@ -39,17 +39,15 @@ Execute (The gometalinter handler should handle relative paths correctly):
   \     'col': 3,
   \     'text': 'expected ''package'', found ''IDENT'' gibberish (staticcheck)',
   \     'type': 'W',
-  \     'filename': ale#path#Winify(expand('%:p:h') . '/test.go'),
   \   },
   \   {
   \     'lnum': 37,
   \     'col': 5,
   \     'text': 'expected ''package'', found ''IDENT'' gibberish (golint)',
   \     'type': 'E',
-  \     'filename': ale#path#Winify(expand('%:p:h') . '/test.go'),
   \   },
   \ ],
   \ ale_linters#go#gometalinter#Handler(bufnr(''), [
-  \   'test.go:12:3:warning: expected ''package'', found ''IDENT'' gibberish (staticcheck)',
-  \   'test.go:37:5:error: expected ''package'', found ''IDENT'' gibberish (golint)',
+  \   'baz.go:12:3:warning: expected ''package'', found ''IDENT'' gibberish (staticcheck)',
+  \   'baz.go:37:5:error: expected ''package'', found ''IDENT'' gibberish (golint)',
   \ ])