Only raw closing brace finishes command body

2 files changed, 9 insertions, 2 deletions

diff --git a/cmd/grv/config_parse.go b/cmd/grv/config_parse.go
index 4ec0cd5..78cc507 100644
--- a/cmd/grv/config_parse.go
+++ b/cmd/grv/config_parse.go
@@ -524,7 +524,7 @@ func parseDefCommand(parser *ConfigParser) (tokens []*ConfigToken, err error) {
 		return
 	} else if err = openingBraceToken.err; err != nil {
 		return
-	} else if openingBraceToken.tokenType != CtkWord || openingBraceToken.value != openingBrace {
+	} else if openingBraceToken.tokenType != CtkWord || openingBraceToken.rawValue != openingBrace {
 		return tokens, parser.generateParseError(openingBraceToken, "Expected %v but found %v", openingBrace, openingBraceToken.value)
 	}
 
@@ -549,7 +549,7 @@ func parseDefCommand(parser *ConfigParser) (tokens []*ConfigToken, err error) {
 		case CtkWord:
 			if token.value == defCommand && wordsSinceTerminator == 0 {
 				closingBracesRemaining++
-			} else if token.value == closingBrace {
+			} else if token.rawValue == closingBrace {
 				closingBracesRemaining--
 			}
 
diff --git a/cmd/grv/config_parse_test.go b/cmd/grv/config_parse_test.go
index 629a1cb..50bbd6e 100644
--- a/cmd/grv/config_parse_test.go
+++ b/cmd/grv/config_parse_test.go
@@ -432,6 +432,13 @@ func TestParseSingleCommand(t *testing.T) {
 				functionBody: " addtab Main ",
 			},
 		},
+		{
+			input: "def\n myFunc \n{ addtab \"}\" }",
+			expectedCommand: &DefCommandValues{
+				commandName:  "myFunc",
+				functionBody: " addtab \"}\" ",
+			},
+		},
 	}
 
 	for _, singleCommandTest := range singleCommandTests {