goimports fails when proj symlinked in GOPATH

autoload/go/fmt.vim

@@ -193,7 +193,9 @@ function! s:fmt_cmd(bin_name, source, target)
     if exists('b:goimports_vendor_compatible') && b:goimports_vendor_compatible
       let ssl_save = &shellslash
       set noshellslash
-      call extend(cmd, ["-srcdir", shellescape(fnamemodify(a:target, ":p"))])
+      " use the filename without the fully qualified name if the tree is
+      " symlinked into the GOPATH, goimports won't work properly.
+      call extend(cmd, ["-srcdir", shellescape(a:target)])
       let &shellslash = ssl_save
     endif
   endif

autoload/go/fmt_test.vim

@@ -29,3 +29,19 @@ func Test_update_file()
 
   call assert_equal(expected, actual)
 endfunc
+
+func Test_goimports()
+  let $GOPATH = 'test-fixtures/fmt/'
+  let actual_file = tempname()
+  call writefile(readfile("test-fixtures/fmt/src/imports/goimports.go"), actual_file)
+
+  let expected = join(readfile("test-fixtures/fmt/src/imports/goimports_golden.go"), "\n")
+
+  " run our code
+  call go#fmt#run("goimports", actual_file, "test-fixtures/fmt/src/imports/goimports.go")
+
+  " this should now contain the formatted code
+  let actual = join(readfile(actual_file), "\n")
+
+  call assert_equal(expected, actual)
+endfunc

autoload/go/test-fixtures/fmt/imports/goimports.go

@@ -0,0 +1,13 @@
+package main
+
+import (
+	"fmt"
+)
+
+func Foo(log *logging.TestLogger) {
+log.Debug("vim-go")
+}
+
+func main() {
+		fmt.Println("vim-go")
+}

autoload/go/test-fixtures/fmt/imports/goimports_golden.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"fmt"
+
+	logging "gh.com/gi/foo-logging"
+)
+
+func Foo(log *logging.TestLogger) {
+	log.Debug("vim-go")
+}
+
+func main() {
+	fmt.Println("vim-go")
+}

autoload/go/test-fixtures/fmt/src/imports

@@ -0,0 +1 @@
+../imports/

scripts/test.sh

@@ -6,6 +6,7 @@ cd $(dirname $0)
 
 # install dependencies
 go get github.com/fatih/gomodifytags
+go get golang.org/x/tools/cmd/goimports
 
 # cleanup test.log
 if [ -f "test.log" ]; then