fix: Fix support for EXEC SQL node for CCF

eclipse-che4z · Jul 8, 2024 · 044586d · 044586d
1 parent 832dd5e
commit 044586d
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 3 deletions.
diff --git a/server/engine/src/main/java/org/eclipse/lsp/cobol/implicitDialects/sql/Db2SqlVisitor.java b/server/engine/src/main/java/org/eclipse/lsp/cobol/implicitDialects/sql/Db2SqlVisitor.java
@@ -232,8 +232,25 @@ public Range constructRange(ParserRuleContext ctx) {
  public List<Node> visitSqlCode(Db2SqlParser.SqlCodeContext ctx) {
  // String intervalText = VisitorHelper.getIntervalText(ctx);
  String sqlCode = preProcessSqlComment(ctx);
+
  List<Node> nodes = this.visitStartSqlRule(parseSQL(sqlCode, ctx));
  Db2SqlVisitorHelper.adjustNodeLocations(ctx, context, nodes);
+
+ Locality locality =
+ VisitorHelper.buildNameRangeLocality(
+ ctx.getParent(), VisitorHelper.getName(ctx.getParent()), context.getProgramDocumentUri());
+ Location location = context.getExtendedDocument().mapLocation(locality.getRange());
+ locality = Locality.builder().range(location.getRange()).uri(location.getUri()).build();
+
+ boolean isWhenever = nodes.stream().anyMatch(n ->
+ n.getDepthFirstStream().anyMatch(nd -> nd instanceof ExecSqlWheneverNode));
+
+ if (!isWhenever) {
+ Node sqlNode = new ExecSqlNode(locality);
+ nodes = new LinkedList<>(nodes);
+ nodes.add(0, sqlNode);
+ }
+
  return nodes;
  }
 

diff --git a/server/engine/src/test/resources/cfast/case_execSqlWhenever.cbl b/server/engine/src/test/resources/cfast/case_execSqlWhenever.cbl
@@ -17,5 +17,9 @@
  EXEC SQL WHENEVER SQLERROR GO TO HANDLER END-EXEC.
  EXEC SQL WHENEVER SQLERROR CONTINUE END-EXEC.
 
+ EXEC SQL
+ SELECT ABC FROM XYZ;
+ END-EXEC.
+
  HANDLER.
  DISPLAY "HANDLER".
diff --git a/server/engine/src/test/resources/cfast/case_execSqlWhenever.result.json b/server/engine/src/test/resources/cfast/case_execSqlWhenever.result.json
@@ -9,7 +9,7 @@
  "character": 9
  },
  "end": {
- "line": 21,
+ "line": 25,
  "character": 31
  }
  },
@@ -106,18 +106,46 @@
  }
  }
  },
+ {
+ "type": "execsql",
+ "location": {
+ "uri": "fake/path",
+ "start": {
+ "line": 20,
+ "character": 12
+ },
+ "end": {
+ "line": 22,
+ "character": 45
+ }
+ }
+ },
+ {
+ "type": "endexec",
+ "location": {
+ "uri": "fake/path",
+ "start": {
+ "line": 20,
+ "character": 12
+ },
+ "end": {
+ "line": 22,
+ "character": 45
+ }
+ }
+ },
  {
  "snippet": "HANDLER.\r\n DISPLAY \"HANDLER\".",
  "name": "HANDLER",
  "type": "paragraph",
  "location": {
  "uri": "fake/path",
  "start": {
- "line": 20,
+ "line": 24,
  "character": 9
  },
  "end": {
- "line": 21,
+ "line": 25,
  "character": 31
  }
  }