Allow for numbers in value descriptors

They generate valid Go so no need to include them in the camel case
einride · Jul 10, 2020 · d5c93bd · d5c93bd
1 parent 7fca08f
commit d5c93bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/internal/identifiers/case.go b/internal/identifiers/case.go
@@ -3,10 +3,15 @@ package identifiers
 import "unicode"
 
 func IsCamelCase(s string) bool {
-	for i, r := range s {
+	i := 0
+	for _, r := range s {
+		if unicode.IsDigit(r) {
+			continue
+		}
 		if i == 0 && !unicode.IsUpper(r) || !IsAlphaChar(r) && !IsNumChar(r) {
 			return false
 		}
+		i++
 	}
 	return true
 }
diff --git a/internal/identifiers/case_test.go b/internal/identifiers/case_test.go
@@ -10,7 +10,9 @@ func TestIsCamelCase(t *testing.T) {
 	assert.Assert(t, IsCamelCase("SOC"))
 	assert.Assert(t, IsCamelCase("Camel"))
 	assert.Assert(t, IsCamelCase("CamelCase"))
+	assert.Assert(t, IsCamelCase("111CamelCaseNr"))
 	assert.Assert(t, !IsCamelCase("camelCase"))
 	assert.Assert(t, !IsCamelCase("snake_case"))
 	assert.Assert(t, !IsCamelCase("kebab-case"))
+	assert.Assert(t, !IsCamelCase("111camelCaseNr"))
 }