fixed IsObject implementation

retailcoder · retailcoder · commit 68e6b6b8c321 · 2018-12-09T21:24:23.000-05:00
diff --git a/Rubberduck.Parsing/Symbols/Declaration.cs b/Rubberduck.Parsing/Symbols/Declaration.cs
@@ -358,13 +358,13 @@ public virtual bool IsObject
                 {
                     return true;
                 }
-                
-                var result = !(AsTypeIsBaseType || 
-                         IsArray || 
-                         DeclarationType.HasFlag(DeclarationType.UserDefinedType) || 
-                         DeclarationType.HasFlag(DeclarationType.Enumeration));
 
-                return result;
+                var isIntrinsic = AsTypeIsBaseType
+                                  || IsArray
+                                  || (AsTypeDeclaration?.DeclarationType.HasFlag(DeclarationType.UserDefinedType) ?? false)
+                                  || (AsTypeDeclaration?.DeclarationType.HasFlag(DeclarationType.Enumeration) ?? false);
+
+                return !isIntrinsic;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -358,13 +358,13 @@ public virtual bool IsObject`
`358`	`358`	`{`
`359`	`359`	`return true;`
`360`	`360`	`}`
`361`		`-`
`362`		`- var result = !(AsTypeIsBaseType \|\|`
`363`		`- IsArray \|\|`
`364`		`- DeclarationType.HasFlag(DeclarationType.UserDefinedType) \|\|`
`365`		`- DeclarationType.HasFlag(DeclarationType.Enumeration));`
`366`	`361`
`367`		`- return result;`
	`362`	`+ var isIntrinsic = AsTypeIsBaseType`
	`363`	`+ \|\| IsArray`
	`364`	`+ \|\| (AsTypeDeclaration?.DeclarationType.HasFlag(DeclarationType.UserDefinedType) ?? false)`
	`365`	`+ \|\| (AsTypeDeclaration?.DeclarationType.HasFlag(DeclarationType.Enumeration) ?? false);`
	`366`	`+`
	`367`	`+ return !isIntrinsic;`
`368`	`368`	`}`
`369`	`369`	`}`
`370`	`370`