Skip to content

Commit

Permalink
Merge pull request #343 from nipunayf/fix-342
Browse files Browse the repository at this point in the history 
Fix sequence diagram build failure due to syntax change in ballerina-lang
  • Loading branch information
@nipunayf
nipunayf authored Apr 8, 2024
2 parents 8c38cdc + ef52fd5 commit bfe2ec2
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 28 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
org.gradle.caching=true
group=org.ballerinalang
version=1.3.1-SNAPSHOT
ballerinaLangVersion=2201.8.0-20230908-135700-74a59dff
ballerinaLangVersion=2201.9.0-20240405-165800-4b163f78

ballerinaGradlePluginVersion=2.0.1
checkStyleToolVersion=10.12.1
Expand Down
42 changes: 15 additions & 27 deletions ...r-core/src/main/java/io/ballerina/sequencemodelgenerator/core/visitors/ActionVisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import io.ballerina.compiler.syntax.tree.AssignmentStatementNode;
import io.ballerina.compiler.syntax.tree.BlockStatementNode;
import io.ballerina.compiler.syntax.tree.BreakStatementNode;
import io.ballerina.compiler.syntax.tree.CaptureBindingPatternNode;
import io.ballerina.compiler.syntax.tree.ClassDefinitionNode;
import io.ballerina.compiler.syntax.tree.ClientResourceAccessActionNode;
import io.ballerina.compiler.syntax.tree.CompoundAssignmentStatementNode;
Expand Down Expand Up @@ -774,13 +775,7 @@ public void visit(WhileStatementNode whileStatementNode) {
whileStatementNode.whileBody().accept(actionVisitor);

if (whileStatementNode.onFailClause().isPresent()) {
OnFailClauseNode onFailClauseNode = whileStatementNode.onFailClause().get();
OnFailClause onFailClause = new OnFailClause(
onFailClauseNode.typeDescriptor().isPresent() ?
onFailClauseNode.typeDescriptor().get().toString() : "",
onFailClauseNode.failErrorName().isPresent() ?
onFailClauseNode.failErrorName().get().toString() : "", isHidden,
whileStatementNode.onFailClause().get().lineRange());
OnFailClause onFailClause = generateOnFailClause(whileStatementNode.onFailClause().get(), isHidden);
VisitorContext visitorContext1 = new VisitorContext(
this.visitorContext.getRootParticipant(),
this.visitorContext.getCurrentParticipant(),
Expand Down Expand Up @@ -826,13 +821,7 @@ public void visit(ForEachStatementNode forEachStatementNode) {
forEachStatementNode.blockStatement().accept(actionVisitor);

if (forEachStatementNode.onFailClause().isPresent()) {
OnFailClauseNode onFailClauseNode = forEachStatementNode.onFailClause().get();
OnFailClause onFailClause = new OnFailClause(
onFailClauseNode.typeDescriptor().isPresent() ?
onFailClauseNode.typeDescriptor().get().toString() : "",
onFailClauseNode.failErrorName().isPresent() ?
onFailClauseNode.failErrorName().get().toString() : "", isHidden,
forEachStatementNode.onFailClause().get().lineRange());
OnFailClause onFailClause = generateOnFailClause(forEachStatementNode.onFailClause().get(), isHidden);
VisitorContext visitorContext1 = new VisitorContext(
this.visitorContext.getRootParticipant(),
this.visitorContext.getCurrentParticipant(),
Expand Down Expand Up @@ -872,13 +861,7 @@ public void visit(LockStatementNode lockStatementNode) {
lockStatementNode.blockStatement().accept(actionVisitor);

if (lockStatementNode.onFailClause().isPresent()) {
OnFailClauseNode onFailClauseNode = lockStatementNode.onFailClause().get();
OnFailClause onFailClause = new OnFailClause(
onFailClauseNode.typeDescriptor().isPresent() ?
onFailClauseNode.typeDescriptor().get().toString() : "",
onFailClauseNode.failErrorName().isPresent() ?
onFailClauseNode.failErrorName().get().toString() : "", isHidden,
lockStatementNode.onFailClause().get().lineRange());
OnFailClause onFailClause = generateOnFailClause(lockStatementNode.onFailClause().get(), isHidden);
VisitorContext visitorContext1 = new VisitorContext(
this.visitorContext.getRootParticipant(),
this.visitorContext.getCurrentParticipant(),
Expand Down Expand Up @@ -920,12 +903,7 @@ public void visit(DoStatementNode doStatementNode) {
doStatementNode.blockStatement().accept(actionVisitor);

if (doStatementNode.onFailClause().isPresent()) {
OnFailClause onFailClause = new OnFailClause(
doStatementNode.onFailClause().get().typeDescriptor().isPresent() ?
doStatementNode.onFailClause().get().typeDescriptor().get().toString() : "",
doStatementNode.onFailClause().get().failErrorName().isPresent() ?
doStatementNode.onFailClause().get().failErrorName().get().toString() : "",
isHidden, doStatementNode.onFailClause().get().lineRange());
OnFailClause onFailClause = generateOnFailClause(doStatementNode.onFailClause().get(), isHidden);
VisitorContext visitorContext1 = new VisitorContext(
this.visitorContext.getRootParticipant(),
this.visitorContext.getCurrentParticipant(),
Expand Down Expand Up @@ -1022,4 +1000,14 @@ private boolean isEndpointAbsentInParticipants(String clientID) {
}
return true;
}

private OnFailClause generateOnFailClause(OnFailClauseNode onFailClauseNode, boolean isHidden) {
return new OnFailClause(
onFailClauseNode.typedBindingPattern().isPresent() ?
onFailClauseNode.typedBindingPattern().get().typeDescriptor().toString() : "",
onFailClauseNode.typedBindingPattern().isPresent() &&
onFailClauseNode.typedBindingPattern().get().kind() == SyntaxKind.CAPTURE_BINDING_PATTERN ?
((CaptureBindingPatternNode) onFailClauseNode.typedBindingPattern().get()
.bindingPattern()).variableName().text() : "", isHidden, onFailClauseNode.lineRange());
}
}

0 comments on commit bfe2ec2

Please sign in to comment.