GetSelectedItem checking for nulls

Olexandr88 · Feb 10, 2024 · 225c5a9 · 225c5a9
1 parent e787de1
commit 225c5a9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/server/parsedCodeModel/ParsedDocument.ts b/src/server/parsedCodeModel/ParsedDocument.ts
@@ -330,10 +330,12 @@ export class ParsedDocument extends ParsedCode implements IParsedExpressionConta
                                     .concat(this.imports)
                                     .concat(this.expressions);
 
-            for (const item of allItems) {
-                selectedItem = item.getSelectedItem(offset);
-                if (selectedItem !== null) { return selectedItem; }
-                }
+                    for (const item of allItems) {
+                        if(item === null) { continue; }
+                        selectedItem = item.getSelectedItem(offset);
+                        if (selectedItem !== null) { return selectedItem; }
+
+                    }
                 return this;
             }
             return selectedItem;

diff --git a/src/server/parsedCodeModel/ParsedFunction.ts b/src/server/parsedCodeModel/ParsedFunction.ts
@@ -50,6 +50,7 @@ export class ParsedFunction extends ParsedCode implements IParsedExpressionConta
                           .concat(this.variables)
                           .concat(this.modifiers);
        for (const item of allItems) {
+          if(item === null) { continue; }
           selectedItem = item.getSelectedItem(offset);
           if (selectedItem !== null) { return selectedItem; }
         }

diff --git a/src/server/parsedCodeModel/parsedContract.ts b/src/server/parsedCodeModel/parsedContract.ts
@@ -214,6 +214,7 @@ export class ParsedContract extends ParsedCode implements IParsedExpressionConta
                               .concat(this.receiveFunction);
 
             for (const item of allItems) {
+                if(item === null) { continue; }
                 selectedItem = item.getSelectedItem(offset);
                 if (selectedItem !== null) { return selectedItem; }
             }