Merge pull request #60 from launchdarkly/victor/improve-flag-regex

Wrap flag keys in word boundary characters.

Author: vlymar

CHANGELOG.md

@@ -4,6 +4,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
 

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)