Skip to content
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

[2201.11.0 stage] Fix Resource access that are not ambiguous are reported as ambiguous access #43683

Merged
merged 4 commits into from
Dec 4, 2024
Merged

[2201.11.0 stage] Fix Resource access that are not ambiguous are reported as ambiguous access #43683

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
f2ccd24
Fix #40606
gimantha Nov 17, 2024
9852424
Fix checkstyle issue
gimantha Nov 17, 2024
b860e50
Fix test failure
gimantha Nov 17, 2024
4dd1896
Check specifically the singleton path segments
gimantha Dec 2, 2024
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
29 changes: 20 additions & 9 deletions ...na-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4085,17 +4085,28 @@ public void visit(BLangInvocation.BLangResourceAccessInvocation resourceAccessIn
handleResourceAccessError(resourceAccessInvocation.resourceAccessPathSegments,
resourceAccessInvocation.name.pos, DiagnosticErrorCode.UNDEFINED_RESOURCE_METHOD, data,
resourceAccessInvocation.name, lhsExprType);
return;
} else if (targetResourceFuncCount > 1) {
handleResourceAccessError(resourceAccessInvocation.resourceAccessPathSegments, resourceAccessInvocation.pos,
DiagnosticErrorCode.AMBIGUOUS_RESOURCE_ACCESS_NOT_YET_SUPPORTED, data, lhsExprType);
} else {
BResourceFunction targetResourceFunc = resourceFunctions.get(0);
checkExpr(resourceAccessInvocation.resourceAccessPathSegments,
getResourcePathType(targetResourceFunc.pathSegmentSymbols), data);
resourceAccessInvocation.symbol = targetResourceFunc.symbol;
resourceAccessInvocation.targetResourceFunc = targetResourceFunc;
checkResourceAccessParamAndReturnType(resourceAccessInvocation, targetResourceFunc, data);
//Filter the resource function with identifier segment
Optional<BResourceFunction> first = resourceFunctions
.stream().filter(func -> func.pathSegmentSymbols.stream()
.allMatch(segment -> segment.kind == SymbolKind.RESOURCE_PATH_IDENTIFIER_SEGMENT))
.findFirst();
if (first.isPresent()) {
resourceFunctions = new ArrayList<>(List.of(first.get()));
} else {
handleResourceAccessError(resourceAccessInvocation.resourceAccessPathSegments,
resourceAccessInvocation.pos, DiagnosticErrorCode.AMBIGUOUS_RESOURCE_ACCESS_NOT_YET_SUPPORTED,
data, lhsExprType);
return;
}
}
BResourceFunction targetResourceFunc = resourceFunctions.get(0);
checkExpr(resourceAccessInvocation.resourceAccessPathSegments,
getResourcePathType(targetResourceFunc.pathSegmentSymbols), data);
resourceAccessInvocation.symbol = targetResourceFunc.symbol;
resourceAccessInvocation.targetResourceFunc = targetResourceFunc;
checkResourceAccessParamAndReturnType(resourceAccessInvocation, targetResourceFunc, data);
}

private void handleResourceAccessError(BLangListConstructorExpr resourceAccessPathSegments,
Expand Down
2 changes: 1 addition & 1 deletion ...c/test/java/io/ballerina/semantic/api/test/actions/SymbolsInResourceAccessActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public Object[][] getResourceAccessActionPathPos() {
@Test
public void testPathSegmentOfAmbiguousResourceFunction() {
Optional<Symbol> symbol = model.symbol(srcFile, LinePosition.from(91, 9));
assertTrue(symbol.isEmpty()); // Resource method is ambiguous
assertTrue(symbol.isPresent()); // Resource method is ambiguous
}

// Utils
Expand Down
8 changes: 0 additions & 8 deletions ...t/src/test/java/org/ballerinalang/test/action/ClientResourceAccessActionNegativeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,10 @@ public void testClientResourceCallNegative() {
"too many arguments in call to 'post()'", 90, 13);
validateError(clientResourceAccessNegative, index++,
"too many arguments in call to 'post()'", 91, 13);
validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
"supported when the corresponding resource method is ambiguous", 145, 13);
validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
"supported when the corresponding resource method is ambiguous", 146, 13);
validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
"supported when the corresponding resource method is ambiguous", 147, 13);
validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
"supported when the corresponding resource method is ambiguous", 148, 13);
validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
"supported when the corresponding resource method is ambiguous", 149, 13);
validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
"supported when the corresponding resource method is ambiguous", 150, 13);
validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
"supported when the corresponding resource method is ambiguous", 151, 13);
validateError(clientResourceAccessNegative, index++, "client resource access action is not yet " +
Expand Down
Loading