Merge pull request #41053 from LakshanWeerasinghe/fix-#40294

Fix fill record field code action and fill record filed completions
ballerina-platform · Aug 14, 2023 · 4381741 · 4381741
2 parents 006e427 + cc5e506
commit 4381741
Show file tree

Hide file tree

Showing 16 changed files with 443 additions and 9 deletions.
diff --git a/...llerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/TypeDefBuilderHelper.java b/...llerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/TypeDefBuilderHelper.java
@@ -331,12 +331,13 @@ public static void populateStructureFields(Types types, SymbolTable symTable,
                 fieldType = origField.type;
             }
 
-            Name origFieldName = origField.name;
+            Name origFieldName = origField.symbol.originalName;
+            Name fieldName = origField.name;
             BVarSymbol fieldSymbol;
             BType referredType = Types.getReferredType(fieldType);
             if (referredType.tag == TypeTags.INVOKABLE && referredType.tsymbol != null) {
                 fieldSymbol = new BInvokableSymbol(origField.symbol.tag, origField.symbol.flags | flag,
-                        origFieldName, pkgID, fieldType,
+                        fieldName, origFieldName, pkgID, fieldType,
                         structureSymbol, origField.symbol.pos, SOURCE);
                 BInvokableTypeSymbol tsymbol = (BInvokableTypeSymbol) referredType.tsymbol;
                 BInvokableSymbol invokableSymbol = (BInvokableSymbol) fieldSymbol;
@@ -347,16 +348,16 @@ public static void populateStructureFields(Types types, SymbolTable symTable,
             } else if (fieldType == symTable.semanticError) {
                 // Can only happen for records.
                 fieldSymbol = new BVarSymbol(origField.symbol.flags | flag | Flags.OPTIONAL,
-                        origFieldName, pkgID, symTable.neverType,
+                        fieldName, origFieldName, pkgID, symTable.neverType,
                         structureSymbol, origField.symbol.pos, SOURCE);
             } else {
-                fieldSymbol = new BVarSymbol(origField.symbol.flags | flag, origFieldName, pkgID,
+                fieldSymbol = new BVarSymbol(origField.symbol.flags | flag, fieldName, origFieldName, pkgID,
                         fieldType, structureSymbol,
                         origField.symbol.pos, SOURCE);
             }
-            String nameString = origFieldName.value;
-            fields.put(nameString, new BField(origFieldName, null, fieldSymbol));
-            structureSymbol.scope.define(origFieldName, fieldSymbol);
+            String nameString = fieldName.value;
+            fields.put(nameString, new BField(fieldName, null, fieldSymbol));
+            structureSymbol.scope.define(fieldName, fieldSymbol);
         }
         structureType.fields = fields;
 

diff --git a/...s/langserver-core/src/main/java/org/ballerinalang/langserver/common/utils/RecordUtil.java b/...s/langserver-core/src/main/java/org/ballerinalang/langserver/common/utils/RecordUtil.java
@@ -186,7 +186,7 @@ public static String getFillAllRecordFieldInsertText(Map<String, RecordFieldSymb
     public static Map<String, RecordFieldSymbol> getRecordFields(RawTypeSymbolWrapper<RecordTypeSymbol> wrapper,
                                                                  List<String> existingFields) {
         return wrapper.getRawType().fieldDescriptors().entrySet().stream()
-                .filter(e -> !existingFields.contains(e.getKey()))
+                .filter(e -> !existingFields.contains(e.getValue().getName().get()))
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
     }
 

diff --git a/...src/test/java/org/ballerinalang/langserver/codeaction/FillRecordFieldsCodeActionTest.java b/...src/test/java/org/ballerinalang/langserver/codeaction/FillRecordFieldsCodeActionTest.java
@@ -59,7 +59,12 @@ public Object[][] dataProvider() {
                 {"fill_record_fields_config15.json"},
                 {"fill_record_fields_config16.json"},
                 {"fill_record_fields_config17.json"},
-                {"fill_record_fields_config18.json"}
+                {"fill_record_fields_config18.json"},
+                {"fill_record_fields_config19.json"},
+                {"fill_record_fields_config20.json"},
+                {"fill_record_fields_config21.json"},
+                {"fill_record_fields_config22.json"},
+                {"fill_record_fields_config23.json"}
         };
     }
 }
diff --git a/.../src/test/resources/codeaction/fill-record-fields/config/fill_record_fields_config19.json b/.../src/test/resources/codeaction/fill-record-fields/config/fill_record_fields_config19.json
@@ -0,0 +1,30 @@
+{
+  "position": {
+    "line": 16,
+    "character": 27
+  },
+  "source": "fill_record_fields_source16.bal",
+  "description": "Fill record fields in object field",
+  "expected": [
+    {
+      "title": "Fill 'Foo' required fields",
+      "kind": "quickfix",
+      "edits": [
+        {
+          "range": {
+            "start": {
+              "line": 16,
+              "character": 27
+            },
+            "end": {
+              "line": 16,
+              "character": 27
+            }
+          },
+          "newText": ",id: 0"
+        }
+      ],
+      "resolvable": false
+    }
+  ]
+}
diff --git a/.../src/test/resources/codeaction/fill-record-fields/config/fill_record_fields_config20.json b/.../src/test/resources/codeaction/fill-record-fields/config/fill_record_fields_config20.json
@@ -0,0 +1,30 @@
+{
+  "position": {
+    "line": 18,
+    "character": 27
+  },
+  "source": "fill_record_fields_source16.bal",
+  "description": "Fill record fields in object field",
+  "expected": [
+    {
+      "title": "Fill 'Bar' required fields",
+      "kind": "quickfix",
+      "edits": [
+        {
+          "range": {
+            "start": {
+              "line": 18,
+              "character": 27
+            },
+            "end": {
+              "line": 18,
+              "character": 27
+            }
+          },
+          "newText": ",id: 0"
+        }
+      ],
+      "resolvable": false
+    }
+  ]
+}
diff --git a/.../src/test/resources/codeaction/fill-record-fields/config/fill_record_fields_config21.json b/.../src/test/resources/codeaction/fill-record-fields/config/fill_record_fields_config21.json
@@ -0,0 +1,30 @@
+{
+  "position": {
+    "line": 20,
+    "character": 27
+  },
+  "source": "fill_record_fields_source16.bal",
+  "description": "Fill record fields in object field",
+  "expected": [
+    {
+      "title": "Fill 'Baz' required fields",
+      "kind": "quickfix",
+      "edits": [
+        {
+          "range": {
+            "start": {
+              "line": 20,
+              "character": 27
+            },
+            "end": {
+              "line": 20,
+              "character": 27
+            }
+          },
+          "newText": ",id: 0"
+        }
+      ],
+      "resolvable": false
+    }
+  ]
+}
diff --git a/.../src/test/resources/codeaction/fill-record-fields/config/fill_record_fields_config22.json b/.../src/test/resources/codeaction/fill-record-fields/config/fill_record_fields_config22.json
@@ -0,0 +1,30 @@
+{
+  "position": {
+    "line": 22,
+    "character": 46
+  },
+  "source": "fill_record_fields_source16.bal",
+  "description": "Fill record fields in object field",
+  "expected": [
+    {
+      "title": "Fill 'record {|readonly string 'type; readonly int id; anydata & readonly...;|}' required fields",
+      "kind": "quickfix",
+      "edits": [
+        {
+          "range": {
+            "start": {
+              "line": 22,
+              "character": 46
+            },
+            "end": {
+              "line": 22,
+              "character": 46
+            }
+          },
+          "newText": ",id: 0"
+        }
+      ],
+      "resolvable": false
+    }
+  ]
+}
diff --git a/.../src/test/resources/codeaction/fill-record-fields/config/fill_record_fields_config23.json b/.../src/test/resources/codeaction/fill-record-fields/config/fill_record_fields_config23.json
@@ -0,0 +1,30 @@
+{
+  "position": {
+    "line": 27,
+    "character": 45
+  },
+  "source": "fill_record_fields_source16.bal",
+  "description": "Fill record fields in object field",
+  "expected": [
+    {
+      "title": "Fill 'record {|readonly string 'type; readonly int id; anydata & readonly...;|}' required fields",
+      "kind": "quickfix",
+      "edits": [
+        {
+          "range": {
+            "start": {
+              "line": 27,
+              "character": 45
+            },
+            "end": {
+              "line": 27,
+              "character": 45
+            }
+          },
+          "newText": ",id: 0"
+        }
+      ],
+      "resolvable": false
+    }
+  ]
+}
diff --git a/...e/src/test/resources/codeaction/fill-record-fields/source/fill_record_fields_source16.bal b/...e/src/test/resources/codeaction/fill-record-fields/source/fill_record_fields_source16.bal
@@ -0,0 +1,29 @@
+type Foo record {
+    string 'type;
+    int id;
+};
+
+type Bar readonly & record {
+    string 'type;
+    int id;
+};
+
+type Baz record {
+    readonly string 'type; 
+    int id; 
+};
+
+function testFillRecordFields() {
+    Foo foo = {'type: "foo"};
+
+    Bar bar = {'type: "bar"};
+
+    Baz baz = {'type: "baz"};
+
+    Foo & readonly fooReadonly = {'type: "foo"};
+
+    record {
+        string 'type;
+        int id;
+    } & readonly fooReadonly2 = {'type: "foo"};
+}
diff --git a/...resources/completion/expression_context/config/mapping_constructor_expr_ctx_config10.json b/...resources/completion/expression_context/config/mapping_constructor_expr_ctx_config10.json
@@ -0,0 +1,36 @@
+{
+  "position": {
+    "line": 20,
+    "character": 28
+  },
+  "source": "expression_context/source/mapping_constructor_expr_ctx_source8.bal",
+  "description": "",
+  "items": [
+    {
+      "label": "readonly",
+      "kind": "Keyword",
+      "detail": "Keyword",
+      "sortText": "U",
+      "filterText": "readonly",
+      "insertText": "readonly ",
+      "insertTextFormat": "Snippet"
+    },
+    {
+      "label": "Fill Bar Required Fields",
+      "kind": "Property",
+      "detail": "Bar",
+      "sortText": "R",
+      "filterText": "fill",
+      "insertText": "id: ${1:0}",
+      "insertTextFormat": "Snippet"
+    },
+    {
+      "label": "id",
+      "kind": "Field",
+      "detail": "Bar.id",
+      "sortText": "K",
+      "insertText": "id: ${1:0}",
+      "insertTextFormat": "Snippet"
+    }
+  ]
+}
diff --git a/...resources/completion/expression_context/config/mapping_constructor_expr_ctx_config11.json b/...resources/completion/expression_context/config/mapping_constructor_expr_ctx_config11.json
@@ -0,0 +1,36 @@
+{
+  "position": {
+    "line": 22,
+    "character": 28
+  },
+  "source": "expression_context/source/mapping_constructor_expr_ctx_source8.bal",
+  "description": "",
+  "items": [
+    {
+      "label": "readonly",
+      "kind": "Keyword",
+      "detail": "Keyword",
+      "sortText": "U",
+      "filterText": "readonly",
+      "insertText": "readonly ",
+      "insertTextFormat": "Snippet"
+    },
+    {
+      "label": "Fill Baz Required Fields",
+      "kind": "Property",
+      "detail": "Baz",
+      "sortText": "R",
+      "filterText": "fill",
+      "insertText": "id: ${1:0}",
+      "insertTextFormat": "Snippet"
+    },
+    {
+      "label": "id",
+      "kind": "Field",
+      "detail": "Baz.id",
+      "sortText": "K",
+      "insertText": "id: ${1:0}",
+      "insertTextFormat": "Snippet"
+    }
+  ]
+}
diff --git a/...resources/completion/expression_context/config/mapping_constructor_expr_ctx_config12.json b/...resources/completion/expression_context/config/mapping_constructor_expr_ctx_config12.json
@@ -0,0 +1,36 @@
+{
+  "position": {
+    "line": 24,
+    "character": 47
+  },
+  "source": "expression_context/source/mapping_constructor_expr_ctx_source8.bal",
+  "description": "",
+  "items": [
+    {
+      "label": "readonly",
+      "kind": "Keyword",
+      "detail": "Keyword",
+      "sortText": "U",
+      "filterText": "readonly",
+      "insertText": "readonly ",
+      "insertTextFormat": "Snippet"
+    },
+    {
+      "label": "Fill record {|readonly string 'type; readonly int id; anydata & readonly...;|} Required Fields",
+      "kind": "Property",
+      "detail": "record {|readonly string 'type; readonly int id; anydata & readonly...;|}",
+      "sortText": "R",
+      "filterText": "fill",
+      "insertText": "id: ${1:0}",
+      "insertTextFormat": "Snippet"
+    },
+    {
+      "label": "id",
+      "kind": "Field",
+      "detail": "(record {|readonly string 'type; readonly int id; anydata & readonly...;|}).id",
+      "sortText": "K",
+      "insertText": "id: ${1:0}",
+      "insertTextFormat": "Snippet"
+    }
+  ]
+}
diff --git a/...resources/completion/expression_context/config/mapping_constructor_expr_ctx_config13.json b/...resources/completion/expression_context/config/mapping_constructor_expr_ctx_config13.json
@@ -0,0 +1,36 @@
+{
+  "position": {
+    "line": 29,
+    "character": 46
+  },
+  "source": "expression_context/source/mapping_constructor_expr_ctx_source8.bal",
+  "description": "",
+  "items": [
+    {
+      "label": "readonly",
+      "kind": "Keyword",
+      "detail": "Keyword",
+      "sortText": "U",
+      "filterText": "readonly",
+      "insertText": "readonly ",
+      "insertTextFormat": "Snippet"
+    },
+    {
+      "label": "Fill record {|readonly string 'type; readonly int id; anydata & readonly...;|} Required Fields",
+      "kind": "Property",
+      "detail": "record {|readonly string 'type; readonly int id; anydata & readonly...;|}",
+      "sortText": "R",
+      "filterText": "fill",
+      "insertText": "id: ${1:0}",
+      "insertTextFormat": "Snippet"
+    },
+    {
+      "label": "id",
+      "kind": "Field",
+      "detail": "(record {|readonly string 'type; readonly int id; anydata & readonly...;|}).id",
+      "sortText": "K",
+      "insertText": "id: ${1:0}",
+      "insertTextFormat": "Snippet"
+    }
+  ]
+}