Skip to content

Commit 107a61b

Browse files
committed
Missed Object and Any in ValueTypesUpper (also renamed back to BaseTypes)
1 parent 6f63ce5 commit 107a61b

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Rubberduck.Parsing/SymbolList.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static class SymbolList
2626
Tokens.Variant,
2727
};
2828

29-
public static readonly IReadOnlyList<string> ValueTypesUpper = new[]
29+
public static readonly IReadOnlyList<string> BaseTypes = new[]
3030
{
3131
Tokens.Boolean.ToUpper(),
3232
Tokens.Byte.ToUpper(),
@@ -40,7 +40,9 @@ public static class SymbolList
4040
Tokens.LongPtr.ToUpper(),
4141
Tokens.Single.ToUpper(),
4242
Tokens.String.ToUpper(),
43-
Tokens.Variant
43+
Tokens.Variant.ToUpper(),
44+
"OBJECT",
45+
"ANY"
4446
};
4547

4648
public static readonly IDictionary<string, string> TypeHintToTypeName = new Dictionary<string, string>

Rubberduck.Parsing/Symbols/Declaration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ public bool AsTypeIsBaseType
457457
{
458458
get
459459
{
460-
return string.IsNullOrWhiteSpace(AsTypeName) || SymbolList.ValueTypesUpper.Contains(_asTypeName.ToUpperInvariant());
460+
return string.IsNullOrWhiteSpace(AsTypeName) || SymbolList.BaseTypes.Contains(_asTypeName.ToUpperInvariant());
461461
}
462462
}
463463

Rubberduck.Parsing/Symbols/TypeAnnotationPass.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private void AnnotateType(Declaration declaration)
5252
var typeContext = declaration.AsTypeContext;
5353
typeExpression = typeContext.type().complexType().GetText();
5454
}
55-
else if (!string.IsNullOrWhiteSpace(declaration.AsTypeNameWithoutArrayDesignator) && !SymbolList.ValueTypesUpper.Contains(declaration.AsTypeNameWithoutArrayDesignator.ToUpperInvariant()))
55+
else if (!string.IsNullOrWhiteSpace(declaration.AsTypeNameWithoutArrayDesignator) && !SymbolList.BaseTypes.Contains(declaration.AsTypeNameWithoutArrayDesignator.ToUpperInvariant()))
5656
{
5757
typeExpression = declaration.AsTypeNameWithoutArrayDesignator;
5858
}

0 commit comments

Comments
 (0)