Skip to content

Fix duplicate identifier suggestion during new connection scenarios #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pasindufernando1 wants to merge 4 commits into
base: 1.6.x
Choose a base branch
from
Open

Fix duplicate identifier suggestion during new connection scenarios #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a08d0a1
Address duplicate connection name in nodeTemplate
pasindufernando1 Feb 12, 2026
b38645b
Reuse existing test package
pasindufernando1 Feb 16, 2026
2ac7a0d
Refactor duplicate name renaming logic
pasindufernando1 Feb 17, 2026
871e02e
Make minor refactoring
pasindufernando1 Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/FormBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public FormBuilder<T> data(Node node, String label, String doc, String templateN
public FormBuilder<T> data(String typeSignature, Set<String> names, String label) {
String varName = typeSignature.contains(RemoteActionCallBuilder.TARGET_TYPE_KEY)
? NameUtil.generateTypeName("var", names)
: NameUtil.generateVariableName(typeSignature, names);
: NameUtil.generateTypeName(NameUtil.toCamelCase(typeSignature), names);
propertyBuilder
.metadata()
.label(label)
Expand All @@ -146,7 +146,7 @@ public FormBuilder<T> data(String typeSignature, Set<String> names, String label
public FormBuilder<T> data(String typeSignature, Set<String> names, String label, String doc) {
String varName = typeSignature.contains(RemoteActionCallBuilder.TARGET_TYPE_KEY)
? NameUtil.generateTypeName("var", names)
: NameUtil.generateVariableName(typeSignature, names);
: NameUtil.generateTypeName(NameUtil.toCamelCase(typeSignature), names);
propertyBuilder
.metadata()
.label(label)
Expand Down
14 changes: 14 additions & 0 deletions ...-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/NodeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,5 +319,19 @@ public Set<String> getAllVisibleSymbolNames() {
return new HashSet<>();
}
}

public Set<String> getAllModuleSymbolNames() {
try {
workspaceManager.loadProject(filePath);
SemanticModel semanticModel =
workspaceManager.semanticModel(filePath).orElseThrow();
return semanticModel.moduleSymbols().parallelStream()
.filter(s -> s.getName().isPresent())
.map(s -> s.getName().get())
.collect(Collectors.toSet());
} catch (Throwable e) {
return new HashSet<>();
}
}
}
}
9 changes: 9 additions & 0 deletions ...e/src/main/java/io/ballerina/flowmodelgenerator/core/model/node/NewConnectionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,15 @@ public void setConcreteTemplateData(TemplateContext context) {
.checkError(true, CHECK_ERROR_DOC, false);
}

@Override
protected void setReturnTypeProperties(FunctionData functionData, TemplateContext context, String label, String doc,
boolean hidden) {
properties()
.type(functionData.returnType(), false, functionData.importStatements(), hidden,
Property.RESULT_TYPE_LABEL)
.data(functionData.returnType(), context.getAllModuleSymbolNames(), label, doc);
Copy link
Contributor

@nipunayf nipunayf Feb 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have two concerns regarding this:

  1. If we create a connection locally, then locally declared connections are not accounted for.
  2. Whatever you’re doing here should also be applied to other module-level artifacts, such as model providers.

}

protected void setParameterProperties(FunctionData function) {
boolean hasOnlyRestParams = function.parameters().size() == 1;

Expand Down
2 changes: 1 addition & 1 deletion ...rator-ls-extension/src/test/resources/node_template/config/function_call-json-toJson.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"selected": true
}
],
"value": "jsonResult",
"value": "json1",
"optional": false,
"editable": true,
"advanced": false,
Expand Down
2 changes: 1 addition & 1 deletion ...erator-ls-extension/src/test/resources/node_template/config/function_call-user-union.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
"selected": true
}
],
"value": "stringResult",
"value": "string1",
"optional": false,
"editable": true,
"advanced": false,
Expand Down
2 changes: 1 addition & 1 deletion ...el-generator-ls-extension/src/test/resources/node_template/config/function_call-user.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"selected": true
}
],
"value": "intResult",
"value": "int1",
"optional": false,
"editable": true,
"advanced": false,
Expand Down
2 changes: 1 addition & 1 deletion ...rator-ls-extension/src/test/resources/node_template/config/function_call-userEscaped.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
"selected": true
}
],
"value": "stringResult",
"value": "string1",
"optional": false,
"editable": true,
"advanced": false,
Expand Down
2 changes: 1 addition & 1 deletion ...erator-ls-extension/src/test/resources/node_template/config/function_call-workspace1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"selected": true
}
],
"value": "stringResult",
"value": "string1",
"optional": false,
"editable": true,
"advanced": false,
Expand Down
2 changes: 1 addition & 1 deletion ...erator-ls-extension/src/test/resources/node_template/config/function_call-workspace2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"selected": true
}
],
"value": "stringResult",
"value": "string1",
"optional": false,
"editable": true,
"advanced": false,
Expand Down
2 changes: 1 addition & 1 deletion ...ator-ls-extension/src/test/resources/node_template/config/lang_lib-array-lastIndexOf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
"selected": true
}
],
"value": "intResult",
"value": "int1",
"optional": false,
"editable": true,
"advanced": false,
Expand Down
2 changes: 1 addition & 1 deletion ...odel-generator-ls-extension/src/test/resources/node_template/config/method_call_user.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"selected": true
}
],
"value": "stringResult",
"value": "string1",
"optional": false,
"editable": true,
"advanced": false,
Expand Down
2 changes: 1 addition & 1 deletion ...l-generator-ls-extension/src/test/resources/node_template/config/new_connection-http.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@
"selected": true
}
],
"value": "httpClientOut",
"value": "httpClient1",
"optional": false,
"editable": true,
"advanced": false,
Expand Down
Loading
Loading