fix: Fix null refs when mapping syntax in JS

sboulema · Oct 21, 2021 · 40ff717 · 40ff717
1 parent 4d04dbc
commit 40ff717
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CodeNav.Shared/Helpers/FindHelper.cs b/CodeNav.Shared/Helpers/FindHelper.cs
@@ -8,7 +8,8 @@ public static class FindHelper
     {
         public static CodeItem FindCodeItem(IEnumerable<CodeItem> items, string id)
         {
-            if (items == null || !items.Any() || string.IsNullOrEmpty(id))
+            if (items?.Any() != true ||
+                string.IsNullOrEmpty(id))
             {
                 return null;
             }
@@ -23,6 +24,7 @@ public static CodeItem FindCodeItem(IEnumerable<CodeItem> items, string id)
                 if (item is IMembers hasMembersItem && hasMembersItem.Members.Any())
                 {
                     var found = FindCodeItem(hasMembersItem.Members, id);
+
                     if (found != null)
                     {
                         return found;

diff --git a/CodeNav.Shared/Mappers/JavaScript/SyntaxMapperJS.cs b/CodeNav.Shared/Mappers/JavaScript/SyntaxMapperJS.cs
@@ -78,9 +78,7 @@ public static List<CodeItem> MapMember(Node member)
 
         private static List<CodeItem> MapMembers(TypeScriptAST ast)
         {
-            if (ast == null ||
-                ast.RootNode == null ||
-                ast.RootNode.Children == null)
+            if (ast?.RootNode?.Children?.Any() != true)
             {
                 return new List<CodeItem>();
             }