Support create function code action for var type decleration and sele…

…ct expr
ballerina-platform · Aug 7, 2023 · da1883c · da1883c
1 parent 6172ad5
commit da1883c
Show file tree

Hide file tree

Showing 14 changed files with 391 additions and 6 deletions.
diff --git a/.../java/org/ballerinalang/langserver/command/visitors/FunctionCallExpressionTypeFinder.java b/.../java/org/ballerinalang/langserver/command/visitors/FunctionCallExpressionTypeFinder.java
@@ -20,6 +20,7 @@
 import io.ballerina.compiler.api.SemanticModel;
 import io.ballerina.compiler.api.TypeBuilder;
 import io.ballerina.compiler.api.Types;
+import io.ballerina.compiler.api.symbols.ArrayTypeSymbol;
 import io.ballerina.compiler.api.symbols.ClassSymbol;
 import io.ballerina.compiler.api.symbols.ErrorTypeSymbol;
 import io.ballerina.compiler.api.symbols.FunctionTypeSymbol;
@@ -63,11 +64,13 @@
 import io.ballerina.compiler.syntax.tree.RecordFieldWithDefaultValueNode;
 import io.ballerina.compiler.syntax.tree.RemoteMethodCallActionNode;
 import io.ballerina.compiler.syntax.tree.ReturnStatementNode;
+import io.ballerina.compiler.syntax.tree.SelectClauseNode;
 import io.ballerina.compiler.syntax.tree.SeparatedNodeList;
 import io.ballerina.compiler.syntax.tree.SimpleNameReferenceNode;
 import io.ballerina.compiler.syntax.tree.SpecificFieldNode;
 import io.ballerina.compiler.syntax.tree.StartActionNode;
 import io.ballerina.compiler.syntax.tree.SyntaxKind;
+import io.ballerina.compiler.syntax.tree.TypedBindingPatternNode;
 import io.ballerina.compiler.syntax.tree.UnaryExpressionNode;
 import io.ballerina.compiler.syntax.tree.VariableDeclarationNode;
 import io.ballerina.compiler.syntax.tree.WhileStatementNode;
@@ -114,9 +117,7 @@ public void visit(RecordFieldWithDefaultValueNode recordFieldWithDefaultValueNod
 
     @Override
     public void visit(ModuleVariableDeclarationNode moduleVariableDeclarationNode) {
-        Symbol symbol = semanticModel.symbol(moduleVariableDeclarationNode).orElse(null);
-        TypeSymbol typeDescriptor = SymbolUtil.getTypeDescriptor(symbol).orElse(null);
-        checkAndSetTypeResult(typeDescriptor);
+        visitVariableDeclaration(moduleVariableDeclarationNode, moduleVariableDeclarationNode.typedBindingPattern());
     }
 
     @Override
@@ -134,9 +135,7 @@ public void visit(AssignmentStatementNode assignmentStatementNode) {
 
     @Override
     public void visit(VariableDeclarationNode variableDeclarationNode) {
-        Symbol symbol = semanticModel.symbol(variableDeclarationNode).orElse(null);
-        TypeSymbol typeDescriptor = SymbolUtil.getTypeDescriptor(symbol).orElse(null);
-        checkAndSetTypeResult(typeDescriptor);
+        visitVariableDeclaration(variableDeclarationNode, variableDeclarationNode.typedBindingPattern());
     }
 
     @Override
@@ -486,6 +485,16 @@ public void visit(GroupingKeyVarDeclarationNode groupingKeyVarDeclarationNode) {
         TypeSymbol typeDescriptor = SymbolUtil.getTypeDescriptor(symbol).orElse(null);
         checkAndSetTypeResult(typeDescriptor);
     }
+
+    @Override
+    public void visit(SelectClauseNode selectClauseNode) {
+        selectClauseNode.parent().parent().accept(this);
+        if (resultFound) {
+            if (this.returnTypeSymbol.typeKind() == TypeDescKind.ARRAY) {
+                checkAndSetTypeResult(((ArrayTypeSymbol) returnTypeSymbol).memberTypeDescriptor());
+            }
+        }
+    }
 
     @Override
     public void visit(PanicStatementNode panicStatementNode) {
@@ -522,4 +531,19 @@ private void resetResult() {
     public Optional<TypeSymbol> getReturnTypeSymbol() {
         return Optional.ofNullable(returnTypeSymbol);
     }
+
+    private void visitVariableDeclaration(Node variableDeclarationNode, TypedBindingPatternNode typedBindingNode) {
+        Symbol symbol = semanticModel.symbol(variableDeclarationNode).orElse(null);
+        Optional<TypeSymbol> typeDescriptor = SymbolUtil.getTypeDescriptor(symbol);
+        TypeSymbol ts = null;
+        if (typeDescriptor.isPresent()) {
+            ts = typeDescriptor.get();
+            if (ts.typeKind() == TypeDescKind.COMPILATION_ERROR && 
+                    typedBindingNode.typeDescriptor().kind() == SyntaxKind.VAR_TYPE_DESC) {
+                Types types = semanticModel.types();
+                ts = types.builder().UNION_TYPE.withMemberTypes(types.ANY, types.ERROR).build();
+            }
+        }
+        checkAndSetTypeResult(ts);        
+    }
 }
diff --git a/...server-core/src/test/java/org/ballerinalang/langserver/codeaction/CreateFunctionTest.java b/...server-core/src/test/java/org/ballerinalang/langserver/codeaction/CreateFunctionTest.java
@@ -175,6 +175,13 @@ public Object[][] dataProvider() {
                 {"create_function_in_local_var1.json"},
                 {"create_function_in_local_var2.json"},
                 {"create_function_in_start_action1.json"},
+
+                {"undefinedFunctionCodeAction25.json"},
+                {"undefinedFunctionCodeAction26.json"},
+                {"undefinedFunctionCodeAction27.json"},
+                {"undefinedFunctionCodeAction28.json"},
+                {"undefinedFunctionCodeAction29.json"},
+                {"undefinedFunctionCodeAction30.json"},
         };
     }
 

diff --git a/...e/src/test/resources/codeaction/create-function/config/undefinedFunctionCodeAction25.json b/...e/src/test/resources/codeaction/create-function/config/undefinedFunctionCodeAction25.json
@@ -0,0 +1,57 @@
+{
+  "position": {
+    "line": 1,
+    "character": 52
+  },
+  "source": "createUndefinedFunction14.bal",
+  "expected": [
+    {
+      "title": "Create function 'toUpperCase(...)'",
+      "kind": "quickfix",
+      "edits": [
+        {
+          "range": {
+            "start": {
+              "line": 2,
+              "character": 1
+            },
+            "end": {
+              "line": 2,
+              "character": 1
+            }
+          },
+          "newText": "\n\nfunction toUpperCase(string letter) returns any|error {\n    return ;\n}"
+        }
+      ],
+      "resolvable": true,
+      "data": {
+        "extName": "org.ballerinalang.langserver.codeaction.BallerinaCodeActionExtension",
+        "codeActionName": "Create Function",
+        "fileUri": "createUndefinedFunction14.bal",
+        "range": {
+          "start": {
+            "line": 1,
+            "character": 46
+          },
+          "end": {
+            "line": 1,
+            "character": 65
+          }
+        },
+        "actionData": {
+          "key": "node.range",
+          "value": {
+            "start": {
+              "line": 1.0,
+              "character": 46.0
+            },
+            "end": {
+              "line": 1.0,
+              "character": 65.0
+            }
+          }
+        }
+      }
+    }
+  ]
+}
diff --git a/...e/src/test/resources/codeaction/create-function/config/undefinedFunctionCodeAction26.json b/...e/src/test/resources/codeaction/create-function/config/undefinedFunctionCodeAction26.json
@@ -0,0 +1,57 @@
+{
+  "position": {
+    "line": 1,
+    "character": 54
+  },
+  "source": "createUndefinedFunction15.bal",
+  "expected": [
+    {
+      "title": "Create function 'toUpperCase(...)'",
+      "kind": "quickfix",
+      "edits": [
+        {
+          "range": {
+            "start": {
+              "line": 2,
+              "character": 1
+            },
+            "end": {
+              "line": 2,
+              "character": 1
+            }
+          },
+          "newText": "\n\nfunction toUpperCase(string letter) returns int {\n    return 0;\n}"
+        }
+      ],
+      "resolvable": true,
+      "data": {
+        "extName": "org.ballerinalang.langserver.codeaction.BallerinaCodeActionExtension",
+        "codeActionName": "Create Function",
+        "fileUri": "createUndefinedFunction15.bal",
+        "range": {
+          "start": {
+            "line": 1,
+            "character": 48
+          },
+          "end": {
+            "line": 1,
+            "character": 67
+          }
+        },
+        "actionData": {
+          "key": "node.range",
+          "value": {
+            "start": {
+              "line": 1.0,
+              "character": 48.0
+            },
+            "end": {
+              "line": 1.0,
+              "character": 67.0
+            }
+          }
+        }
+      }
+    }
+  ]
+}
diff --git a/...e/src/test/resources/codeaction/create-function/config/undefinedFunctionCodeAction27.json b/...e/src/test/resources/codeaction/create-function/config/undefinedFunctionCodeAction27.json
@@ -0,0 +1,57 @@
+{
+  "position": {
+    "line": 1,
+    "character": 18
+  },
+  "source": "createUndefinedFunction16.bal",
+  "expected": [
+    {
+      "title": "Create function 'toUpperCase(...)'",
+      "kind": "quickfix",
+      "edits": [
+        {
+          "range": {
+            "start": {
+              "line": 2,
+              "character": 1
+            },
+            "end": {
+              "line": 2,
+              "character": 1
+            }
+          },
+          "newText": "\n\nfunction toUpperCase(any a) returns any|error {\n    return ;\n}"
+        }
+      ],
+      "resolvable": true,
+      "data": {
+        "extName": "org.ballerinalang.langserver.codeaction.BallerinaCodeActionExtension",
+        "codeActionName": "Create Function",
+        "fileUri": "createUndefinedFunction16.bal",
+        "range": {
+          "start": {
+            "line": 1,
+            "character": 11
+          },
+          "end": {
+            "line": 1,
+            "character": 30
+          }
+        },
+        "actionData": {
+          "key": "node.range",
+          "value": {
+            "start": {
+              "line": 1.0,
+              "character": 11.0
+            },
+            "end": {
+              "line": 1.0,
+              "character": 30.0
+            }
+          }
+        }
+      }
+    }
+  ]
+}
diff --git a/...e/src/test/resources/codeaction/create-function/config/undefinedFunctionCodeAction28.json b/...e/src/test/resources/codeaction/create-function/config/undefinedFunctionCodeAction28.json
@@ -0,0 +1,57 @@
+{
+  "position": {
+    "line": 0,
+    "character": 16
+  },
+  "source": "createUndefinedFunction17.bal",
+  "expected": [
+    {
+      "title": "Create function 'toUpperCase(...)'",
+      "kind": "quickfix",
+      "edits": [
+        {
+          "range": {
+            "start": {
+              "line": 0,
+              "character": 28
+            },
+            "end": {
+              "line": 0,
+              "character": 28
+            }
+          },
+          "newText": "\n\nfunction toUpperCase(any a) returns any|error {\n    return ;\n}"
+        }
+      ],
+      "resolvable": true,
+      "data": {
+        "extName": "org.ballerinalang.langserver.codeaction.BallerinaCodeActionExtension",
+        "codeActionName": "Create Function",
+        "fileUri": "createUndefinedFunction17.bal",
+        "range": {
+          "start": {
+            "line": 0,
+            "character": 8
+          },
+          "end": {
+            "line": 0,
+            "character": 27
+          }
+        },
+        "actionData": {
+          "key": "node.range",
+          "value": {
+            "start": {
+              "line": 0.0,
+              "character": 8.0
+            },
+            "end": {
+              "line": 0.0,
+              "character": 27.0
+            }
+          }
+        }
+      }
+    }
+  ]
+}
diff --git a/...e/src/test/resources/codeaction/create-function/config/undefinedFunctionCodeAction29.json b/...e/src/test/resources/codeaction/create-function/config/undefinedFunctionCodeAction29.json
@@ -0,0 +1,57 @@
+{
+  "position": {
+    "line": 0,
+    "character": 50
+  },
+  "source": "createUndefinedFunction18.bal",
+  "expected": [
+    {
+      "title": "Create function 'toUpperCase(...)'",
+      "kind": "quickfix",
+      "edits": [
+        {
+          "range": {
+            "start": {
+              "line": 0,
+              "character": 64
+            },
+            "end": {
+              "line": 0,
+              "character": 64
+            }
+          },
+          "newText": "\n\nfunction toUpperCase(string letter) returns int {\n    return 0;\n}"
+        }
+      ],
+      "resolvable": true,
+      "data": {
+        "extName": "org.ballerinalang.langserver.codeaction.BallerinaCodeActionExtension",
+        "codeActionName": "Create Function",
+        "fileUri": "createUndefinedFunction18.bal",
+        "range": {
+          "start": {
+            "line": 0,
+            "character": 44
+          },
+          "end": {
+            "line": 0,
+            "character": 63
+          }
+        },
+        "actionData": {
+          "key": "node.range",
+          "value": {
+            "start": {
+              "line": 0.0,
+              "character": 44.0
+            },
+            "end": {
+              "line": 0.0,
+              "character": 63.0
+            }
+          }
+        }
+      }
+    }
+  ]
+}