fix: a bunch of styles did not correctly fallback to parent styles

Fixes #1076

Author: alecthomas

tokentype_enumer.go

@@ -62,15 +62,11 @@ const (
 const (
 	Name TokenType = 2000 + iota
 	NameAttribute
-	NameBuiltin
-	NameBuiltinPseudo
 	NameClass
 	NameConstant
 	NameDecorator
 	NameEntity
 	NameException
-	NameFunction
-	NameFunctionMagic
 	NameKeyword
 	NameLabel
 	NameNamespace
@@ -79,14 +75,30 @@ const (
 	NamePseudo
 	NameProperty
 	NameTag
-	NameVariable
+)
+
+// Builtin names.
+const (
+	NameBuiltin TokenType = 2100 + iota
+	NameBuiltinPseudo
+)
+
+// Variable names.
+const (
+	NameVariable TokenType = 2200 + iota
 	NameVariableAnonymous
 	NameVariableClass
 	NameVariableGlobal
 	NameVariableInstance
 	NameVariableMagic
 )
 
+// Function names.
+const (
+	NameFunction TokenType = 2300 + iota
+	NameFunctionMagic
+)
+
 // Literals.
 const (
 	Literal TokenType = 3000 + iota