From 87cb7bf1a642960c1be7e08157cc15492e1b29fe Mon Sep 17 00:00:00 2001
From: Denis Isaev <denis@golangci.com>
Date: Sun, 28 Oct 2018 19:35:12 +0300
Subject: [PATCH] Fix skip-dirs options after support of go/packages

---
 pkg/packages/skip.go               | 21 ++++++++++++++++-----
 pkg/result/processors/skip_dirs.go | 28 ++++++++--------------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/pkg/packages/skip.go b/pkg/packages/skip.go
index d9f54eff..dfa20566 100644
--- a/pkg/packages/skip.go
+++ b/pkg/packages/skip.go
@@ -1,8 +1,19 @@
 package packages
 
-var StdExcludeDirRegexps = []string{
-	"^vendor$", "^third_party$",
-	"^testdata$", "^examples$",
-	"^Godeps$",
-	"^builtin$",
+import (
+	"fmt"
+	"path/filepath"
+)
+
+func pathElemRe(e string) string {
+	return fmt.Sprintf(`(^|%c)%s($|%c)`, filepath.Separator, e, filepath.Separator)
+}
+
+var StdExcludeDirRegexps = []string{
+	pathElemRe("vendor"),
+	pathElemRe("third_party"),
+	pathElemRe("testdata"),
+	pathElemRe("examples"),
+	pathElemRe("Godeps"),
+	pathElemRe("builtin"),
 }
diff --git a/pkg/result/processors/skip_dirs.go b/pkg/result/processors/skip_dirs.go
index b290f773..f4dad88f 100644
--- a/pkg/result/processors/skip_dirs.go
+++ b/pkg/result/processors/skip_dirs.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/golangci/golangci-lint/pkg/fsutils"
 	"github.com/golangci/golangci-lint/pkg/logutils"
 	"github.com/golangci/golangci-lint/pkg/result"
 )
@@ -75,11 +74,11 @@ func (p *SkipDirs) Process(issues []result.Issue) ([]result.Issue, error) {
 	return filterIssues(issues, p.shouldPassIssue), nil
 }
 
-func (p *SkipDirs) getLongestArgRelativeIssuePath(i *result.Issue) (string, string) {
+func (p *SkipDirs) getLongestArgRelativeIssuePath(i *result.Issue) string {
 	issueAbsPath, err := filepath.Abs(i.FilePath())
 	if err != nil {
 		p.log.Warnf("Can't abs-ify path %q: %s", i.FilePath(), err)
-		return "", ""
+		return ""
 	}
 
 	for _, arg := range p.sortedAbsArgs {
@@ -89,15 +88,15 @@ func (p *SkipDirs) getLongestArgRelativeIssuePath(i *result.Issue) (string, stri
 
 		relPath := strings.TrimPrefix(issueAbsPath, arg)
 		relPath = strings.TrimPrefix(relPath, string(filepath.Separator))
-		return relPath, arg
+		return relPath
 	}
 
 	p.log.Infof("Issue path %q isn't relative to any of run args", i.FilePath())
-	return "", ""
+	return ""
 }
 
 func (p *SkipDirs) shouldPassIssue(i *result.Issue) bool {
-	relIssuePath, issueArg := p.getLongestArgRelativeIssuePath(i)
+	relIssuePath := p.getLongestArgRelativeIssuePath(i)
 	if relIssuePath == "" {
 		return true
 	}
@@ -106,21 +105,10 @@ func (p *SkipDirs) shouldPassIssue(i *result.Issue) bool {
 		relIssuePath = filepath.Dir(relIssuePath)
 	}
 
-	relIssueDirParts := strings.Split(relIssuePath, string(filepath.Separator))
-
 	for _, pattern := range p.patterns {
-		skippedDir := issueArg
-		for _, part := range relIssueDirParts {
-			skippedDir = filepath.Join(skippedDir, part)
-			if pattern.MatchString(part) {
-				relSkippedDir, err := fsutils.ShortestRelPath(skippedDir, "")
-				if err != nil {
-					p.log.Warnf("Can't construct short relative path for %q: %s", skippedDir, err)
-					return true
-				}
-				p.skippedDirs[relSkippedDir] = true
-				return false
-			}
+		if pattern.MatchString(relIssuePath) {
+			p.skippedDirs[relIssuePath] = true
+			return false
 		}
 	}