Merge pull request #16 from buildkite/ps-215-treat-bare-dollar-sign-a…

…s-literal

Treat bare dollar sign as literal and dont interpolate

interpolate_test.go

@@ -114,22 +114,6 @@ func TestIgnoresParentheses(t *testing.T) {
 	}
 }
 
-func TestVariablesMustStartWithLetters(t *testing.T) {
-	t.Parallel()
-
-	for _, str := range []string{
-		`$1 burgers`,
-		`$99bottles`,
-	} {
-		_, err := interpolate.Interpolate(nil, str)
-		if err == nil {
-			t.Fatalf("Test %q should have resulted in an error", str)
-		} else {
-			t.Log(err)
-		}
-	}
-}
-
 func TestMissingParameterValuesReturnEmptyStrings(t *testing.T) {
 	t.Parallel()
 
@@ -342,6 +326,7 @@ func TestExtractingIdentifiers(t *testing.T) {
 		{`${LLAMAS:-${ROCK:-true}}`, []string{`LLAMAS`, `ROCK`}},
 		{`${BUILDKITE_COMMIT:0}`, []string{`BUILDKITE_COMMIT`}},
 		{`$BUILDKITE_COMMIT hello there $$DOUBLE_DOLLAR \$ESCAPED_DOLLAR`, []string{`BUILDKITE_COMMIT`, `$DOUBLE_DOLLAR`, `$ESCAPED_DOLLAR`}},
+		{`This $ is not a variable`, []string{}},
 	} {
 		id, err := interpolate.Identifiers(tc.Str)
 		if err != nil {

parser.go

@@ -100,11 +100,12 @@ func (p *Parser) parseExpression(stop ...rune) (Expression, error) {
 
 		// If we run into a dollar sign and it's not the last char, it's an expansion
 		if c == '$' && p.pos < (len(p.input)-1) {
-			expansion, err := p.parseExpansion()
+			expressionItem, err := p.parseExpansion()
 			if err != nil {
 				return nil, err
 			}
-			expr = append(expr, ExpressionItem{Expansion: expansion})
+
+			expr = append(expr, expressionItem)
 			continue
 		}
 
@@ -158,24 +159,38 @@ func (p *Parser) parseEscapedExpansion() (EscapedExpansion, error) {
 	}
 }
 
-func (p *Parser) parseExpansion() (Expansion, error) {
+func (p *Parser) parseExpansion() (ExpressionItem, error) {
+	var empty ExpressionItem
+
 	if c := p.nextRune(); c != '$' {
-		return nil, fmt.Errorf("Expected expansion to start with $, got %c", c)
+		return empty, fmt.Errorf("Expected expansion to start with $, got %c", c)
 	}
 
+	c := p.peekRune()
+
 	// if we have an open brace, this is a brace expansion
-	if c := p.peekRune(); c == '{' {
-		return p.parseBraceExpansion()
+	if c == '{' {
+		expansion, err := p.parseBraceExpansion()
+		if err != nil {
+			return empty, err
+		}
+		return ExpressionItem{Expansion: expansion}, nil
+	}
+
+	// if not a letter, it's a literal dollar sign
+	if !unicode.IsLetter(c) {
+		return ExpressionItem{Text: "$"}, nil
 	}
 
+	// otherwise, it's a variable expansion
 	identifier, err := p.scanIdentifier()
 	if err != nil {
-		return nil, err
+		return empty, err
 	}
 
-	return VariableExpansion{
+	return ExpressionItem{Expansion: VariableExpansion{
 		Identifier: identifier,
-	}, nil
+	}}, nil
 }
 
 func (p *Parser) parseBraceExpansion() (Expansion, error) {