Skip to content

Commit 239df69

Browse files
authored
feat: do not trim spaces for quoted string (#303)
1 parent 9b3b21d commit 239df69

2 files changed

Lines changed: 36 additions & 1 deletion

File tree

‎generator/generator.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ func (g *Generator) parseEnum(ts *ast.TypeSpec) (*Enum, error) {
331331
rawName := value
332332
valueStr := value
333333

334+
isQuoted := false
334335
if strings.Contains(value, `=`) {
335336
// Get the value specified and set the data to that value.
336337
equalIndex := strings.Index(value, `=`)
@@ -345,6 +346,7 @@ func (g *Generator) parseEnum(ts *ast.TypeSpec) (*Enum, error) {
345346
}
346347
if q := identifyQuoted(dataVal); q != "" {
347348
valueStr = trimQuotes(q, dataVal)
349+
isQuoted = true
348350
}
349351
} else if unsigned {
350352
newData, err := strconv.ParseUint(dataVal, 0, 64)
@@ -368,8 +370,11 @@ func (g *Generator) parseEnum(ts *ast.TypeSpec) (*Enum, error) {
368370
fmt.Printf("Ignoring enum with '=' but no value after: %s\n", rawName)
369371
}
370372
}
373+
371374
rawName = strings.TrimSpace(rawName)
372-
valueStr = strings.TrimSpace(valueStr)
375+
if !isQuoted {
376+
valueStr = strings.TrimSpace(valueStr)
377+
}
373378
name := cases.Title(language.Und, cases.NoLower).String(rawName)
374379
prefixedName := name
375380
if name != skipHolder {

‎generator/generator_test.go‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,3 +1012,33 @@ type Greek string
10121012
assert.Contains(t, outputStr, "var ErrInvalidGreek")
10131013
assert.Contains(t, outputStr, "lookupSqlIntGreek")
10141014
}
1015+
1016+
func TestStringDoubleQuotedWithWhitespaceOnly(t *testing.T) {
1017+
input := `package test
1018+
// ENUM(Empty=" ")
1019+
type Char string
1020+
`
1021+
1022+
g := NewGenerator()
1023+
f, err := parser.ParseFile(g.fileSet, "TestRequiredErrors", input, parser.ParseComments)
1024+
assert.Nil(t, err, "Error parsing no struct input")
1025+
1026+
output, err := g.Generate(f)
1027+
assert.Nil(t, err, "Error generating formatted code")
1028+
assert.Contains(t, string(output), "CharEmpty Char = \" \"")
1029+
}
1030+
1031+
func TestStringSingleQuotedWithWhitespaceOnly(t *testing.T) {
1032+
input := `package test
1033+
// ENUM(Empty=' ')
1034+
type Char string
1035+
`
1036+
1037+
g := NewGenerator()
1038+
f, err := parser.ParseFile(g.fileSet, "TestRequiredErrors", input, parser.ParseComments)
1039+
assert.Nil(t, err, "Error parsing no struct input")
1040+
1041+
output, err := g.Generate(f)
1042+
assert.Nil(t, err, "Error generating formatted code")
1043+
assert.Contains(t, string(output), "CharEmpty Char = \" \"")
1044+
}

0 commit comments

Comments
 (0)