Skip to content

Commit e47644f

Browse files
committed
Revert "Minor changes."
This reverts commit 23f280a.
1 parent 23f280a commit e47644f

File tree

3 files changed

+39
-9
lines changed

3 files changed

+39
-9
lines changed

src/UnityUxmlGenerator/Extensions/TypeSyntaxExtensions.cs

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,46 @@ namespace UnityUxmlGenerator.Extensions;
55

66
internal static class TypeSyntaxExtensions
77
{
8+
public static bool IsBoolType(this TypeSyntax typeSyntax)
9+
{
10+
if (typeSyntax is PredefinedTypeSyntax predefinedTypeSyntax)
11+
{
12+
return IsBoolType(predefinedTypeSyntax);
13+
}
14+
15+
return IsBoolKind(typeSyntax.RawKind);
16+
}
17+
818
public static bool IsBoolType(this PredefinedTypeSyntax typeSyntax)
919
{
1020
return IsBoolKind(typeSyntax.Keyword.RawKind);
1121
}
1222

23+
public static bool IsStringType(this TypeSyntax typeSyntax)
24+
{
25+
if (typeSyntax is PredefinedTypeSyntax predefinedTypeSyntax)
26+
{
27+
return IsStringType(predefinedTypeSyntax);
28+
}
29+
30+
return IsStringKind(typeSyntax.RawKind);
31+
}
32+
1333
public static bool IsStringType(this PredefinedTypeSyntax typeSyntax)
1434
{
1535
return IsStringKind(typeSyntax.Keyword.RawKind);
1636
}
1737

38+
public static bool IsNumericType(this TypeSyntax typeSyntax)
39+
{
40+
if (typeSyntax is PredefinedTypeSyntax predefinedTypeSyntax)
41+
{
42+
return IsNumericType(predefinedTypeSyntax);
43+
}
44+
45+
return IsNumericKind(typeSyntax.RawKind);
46+
}
47+
1848
public static bool IsNumericType(this PredefinedTypeSyntax typeSyntax)
1949
{
2050
return IsNumericKind(typeSyntax.Keyword.RawKind);

src/UnityUxmlGenerator/UxmlGenerator.Traits.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,32 +129,32 @@ private static UxmlAttributeInfo GetAttributeInfo(GeneratorExecutionContext cont
129129

130130
var info = new UxmlAttributeInfo
131131
{
132-
TypeIdentifier = GetPropertyTypeIdentifier(context, property, out var predefinedTypeSyntax),
132+
TypeIdentifier = GetPropertyTypeIdentifier(context, property, out var typeSyntax),
133133
PrivateFieldName = propertyName.ToPrivateFieldName(),
134134
AttributeUxmlName = propertyName.ToDashCase()
135135
};
136136

137-
if (uxmlAttributeDefaultValue is null || predefinedTypeSyntax is null)
137+
if (uxmlAttributeDefaultValue is null || typeSyntax is null)
138138
{
139139
info.DefaultValueAssignmentExpression =
140140
LiteralExpression(SyntaxKind.DefaultLiteralExpression, Token(SyntaxKind.DefaultKeyword));
141141
return info;
142142
}
143143

144-
if (predefinedTypeSyntax.IsBoolType())
144+
if (typeSyntax.IsBoolType())
145145
{
146146
info.DefaultValueAssignmentExpression = IdentifierName(uxmlAttributeDefaultValue);
147147
return info;
148148
}
149149

150-
if (predefinedTypeSyntax.IsStringType())
150+
if (typeSyntax.IsStringType())
151151
{
152152
info.DefaultValueAssignmentExpression = LiteralExpression(SyntaxKind.StringLiteralExpression,
153153
Literal(uxmlAttributeDefaultValue));
154154
return info;
155155
}
156156

157-
if (predefinedTypeSyntax.IsNumericType())
157+
if (typeSyntax.IsNumericType())
158158
{
159159
info.DefaultValueAssignmentExpression = LiteralExpression(SyntaxKind.NumericLiteralExpression,
160160
Literal(uxmlAttributeDefaultValue, uxmlAttributeDefaultValue));
@@ -172,15 +172,15 @@ private static UxmlAttributeInfo GetAttributeInfo(GeneratorExecutionContext cont
172172
}
173173

174174
private static string GetPropertyTypeIdentifier(GeneratorExecutionContext context,
175-
BasePropertyDeclarationSyntax property, out PredefinedTypeSyntax? predefinedTypeSyntax)
175+
BasePropertyDeclarationSyntax property, out TypeSyntax? typeSyntax)
176176
{
177177
switch (property.Type)
178178
{
179179
case PredefinedTypeSyntax predefinedType:
180180
{
181181
var propertyTypeIdentifier = predefinedType.Keyword.Text.FirstCharToUpper();
182182

183-
predefinedTypeSyntax = predefinedType;
183+
typeSyntax = predefinedType;
184184

185185
return $"Uxml{propertyTypeIdentifier}AttributeDescription";
186186
}
@@ -191,15 +191,15 @@ private static string GetPropertyTypeIdentifier(GeneratorExecutionContext contex
191191
var typeNamespace = customTypeSyntax.GetTypeNamespace(context);
192192
var propertyTypeText = $"global::{typeNamespace}.{type}";
193193

194-
predefinedTypeSyntax = default;
194+
typeSyntax = customTypeSyntax;
195195

196196
return propertyTypeText == UnityColorTypeFullName
197197
? UxmlColorAttributeDescription
198198
: $"UxmlEnumAttributeDescription<{propertyTypeText}>";
199199
}
200200

201201
default:
202-
predefinedTypeSyntax = default;
202+
typeSyntax = default;
203203
return property.Type.GetText().ToString().Trim();
204204
}
205205
}

0 commit comments

Comments
 (0)