Merge branch 'master' into victor/publish-deb-rpm-packages

vlymar · vlymar · commit d77d46e4e8bf · 2019-02-01T15:06:19.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ All notable changes to the ld-find-code-refs program will be documented in this
 
 ### Changed
 - Automate Homebrew releases
+- Added word boundaries to flag key regexes.
+  - This should reduce false positives. E.g. for flag key `cool-feature` we will no longer match `verycool-features`.
 
 ## [0.4.0] - 2019-01-30
 
diff --git a/internal/command/command.go b/internal/command/command.go
@@ -95,11 +95,12 @@ func (c Client) SearchForFlags(flags []string, ctxLines int) ([][]string, error)
 		sb.WriteString(fmt.Sprintf(" -C%d", ctxLines))
 	}
 
-	escapedFlags := []string{}
+	flagRegexes := []string{}
 	for _, v := range flags {
-		escapedFlags = append(escapedFlags, regexp.QuoteMeta(v))
+		escapedFlag := regexp.QuoteMeta(v)
+		flagRegexes = append(flagRegexes, "\\b"+escapedFlag+"\\b")
 	}
-	sb.WriteString(" '" + strings.Join(escapedFlags, "|") + "' " + c.Workspace)
+	sb.WriteString(" '" + strings.Join(flagRegexes, "|") + "' " + c.Workspace)
 
 	cmd := sb.String()
 	sh := exec.Command("sh", "-c", cmd)

Original file line number	Diff line number	Diff line change
`@@ -95,11 +95,12 @@ func (c Client) SearchForFlags(flags []string, ctxLines int) ([][]string, error)`
`95`	`95`	`sb.WriteString(fmt.Sprintf(" -C%d", ctxLines))`
`96`	`96`	`}`
`97`	`97`
`98`		`- escapedFlags := []string{}`
	`98`	`+ flagRegexes := []string{}`
`99`	`99`	`for _, v := range flags {`
`100`		`- escapedFlags = append(escapedFlags, regexp.QuoteMeta(v))`
	`100`	`+ escapedFlag := regexp.QuoteMeta(v)`
	`101`	`+ flagRegexes = append(flagRegexes, "\\b"+escapedFlag+"\\b")`
`101`	`102`	`}`
`102`		`- sb.WriteString(" '" + strings.Join(escapedFlags, "\|") + "' " + c.Workspace)`
	`103`	`+ sb.WriteString(" '" + strings.Join(flagRegexes, "\|") + "' " + c.Workspace)`
`103`	`104`
`104`	`105`	`cmd := sb.String()`
`105`	`106`	`sh := exec.Command("sh", "-c", cmd)`