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

Jump to bottom

Fix/folding evaluate #2225

Merged
merged 1 commit into from
Feb 12, 2024
Merged

Fix/folding evaluate #2225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 22 additions & 13 deletions server/engine/src/main/java/org/eclipse/lsp/cobol/service/DocumentServiceHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.IntSummaryStatistics;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.NonNull;
Expand Down Expand Up @@ -102,19 +100,30 @@ private static List<FoldingRange> getFoldingRange(IfNode node, String uri) {
}

private static List<FoldingRange> getFoldingRange(EvaluateNode node, String uri) {
Map<Node, List<Node>> accumulator = new HashMap<>();
Node lastEvaluateNode = null;
for (Node child : node.getChildren()) {
if (child instanceof EvaluateWhenNode || child instanceof EvaluateWhenOtherNode) {
lastEvaluateNode = child;
accumulator.putIfAbsent(lastEvaluateNode, new ArrayList<>());
List<Node> evaluateDirectChildNodes =
node.getChildren().stream()
.filter(child -> child.getLocality().getUri().equals(uri))
.filter(
child ->
child instanceof EvaluateWhenNode || child instanceof EvaluateWhenOtherNode)
.collect(toList());
List<FoldingRange> rangeBetweenWhenClause = new ArrayList<>();
for (int i = 0; i < evaluateDirectChildNodes.size(); i++) {
Node whenNode = evaluateDirectChildNodes.get(i);
if (evaluateDirectChildNodes.size() == 1 || (i == evaluateDirectChildNodes.size() - 1)) {
rangeBetweenWhenClause.add(
new FoldingRange(
whenNode.getLocality().getRange().getStart().getLine(),
node.getLocality().getRange().getEnd().getLine() - 1));
} else {
Node nextNode = evaluateDirectChildNodes.get(i + 1);
rangeBetweenWhenClause.add(
new FoldingRange(
whenNode.getLocality().getRange().getStart().getLine(),
nextNode.getLocality().getRange().getStart().getLine() - 1));
}
if (lastEvaluateNode == null) continue;
if (child.getLocality().getUri().equals(uri)) accumulator.get(lastEvaluateNode).add(child);
}
return accumulator.values().stream()
.map(DocumentServiceHelper::getFoldingRange)
.collect(toList());
return rangeBetweenWhenClause;
}

private static List<FoldingRange> getFoldingRanges(Node node, String uri) {
Expand Down
44 changes: 43 additions & 1 deletion server/engine/src/test/java/org/eclipse/lsp/cobol/service/DocumentServiceHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@
*/
package org.eclipse.lsp.cobol.service;

import static org.eclipse.lsp.cobol.common.model.NodeType.STATEMENT;
import static org.junit.jupiter.api.Assertions.*;

import java.util.Set;
import org.eclipse.lsp.cobol.common.model.Locality;
import org.eclipse.lsp.cobol.common.model.tree.*;
import org.eclipse.lsp.cobol.common.model.tree.variable.QualifiedReferenceNode;
import org.eclipse.lsp.cobol.implicitDialects.cics.CICSDialect;
import org.eclipse.lsp.cobol.implicitDialects.cics.nodes.ExecCicsNode;
import org.eclipse.lsp4j.FoldingRange;
import org.eclipse.lsp4j.Location;
import org.eclipse.lsp4j.Position;
Expand Down Expand Up @@ -108,12 +111,51 @@ void getFoldingRange_whenEvaluateStatementIsPresent() {
rootNode.addChild(evaluateNode);
Set<FoldingRange> foldingRange = DocumentServiceHelper.getFoldingRange(rootNode, DOCUMENT_URI);
assertEquals(4, foldingRange.size());
assertTrue(foldingRange.contains(new FoldingRange(5, 6))); // evaluateWhenNode2
assertTrue(foldingRange.contains(new FoldingRange(5, 9))); // evaluateWhenNode2
assertTrue(foldingRange.contains(new FoldingRange(0, 10))); // evaluateNode
assertTrue(foldingRange.contains(new FoldingRange(3, 5))); // if node
assertTrue(foldingRange.contains(new FoldingRange(2, 4))); // evaluateWhenNode
}

@Test
void getFoldingRange_whenEvaluateStatementHasADialectNode() {
RootNode rootNode = new RootNode(LOCALITY);
EvaluateNode evaluateNode = new EvaluateNode(Locality.builder()
.range(new Range(new Position(0, 0), new Position(10, 10)))
.uri(DOCUMENT_URI).build());
EvaluateWhenNode evaluateWhenNode = new EvaluateWhenNode(Locality.builder()
.range(new Range(new Position(2, 0), new Position(2, 10)))
.uri(DOCUMENT_URI).build());
EvaluateWhenNode evaluateWhenNode2 = new EvaluateWhenNode(Locality.builder()
.range(new Range(new Position(5, 0), new Position(5, 10)))
.uri(DOCUMENT_URI).build());
EvaluateWhenOtherNode evaluateWhenOtherNode = new EvaluateWhenOtherNode(Locality.builder()
.range(new Range(new Position(7, 0), new Position(7, 10)))
.uri(DOCUMENT_URI).build());
IfNode ifNode = new IfNode(Locality.builder()
.range(new Range(new Position(3, 0), new Position(4, 10)))
.uri(DOCUMENT_URI).build());
ifNode.addChild(new QualifiedReferenceNode(Locality.builder()
.range(new Range(new Position(3, 0), new Position(4, 10)))
.uri(DOCUMENT_URI).build()));
ExecCicsNode execCicsNode = new ExecCicsNode(Locality.builder()
.range(new Range(new Position(6, 0), new Position(6, 10)))
.uri(DOCUMENT_URI).build(), STATEMENT, CICSDialect.DIALECT_NAME);
evaluateWhenNode.addChild(ifNode);
evaluateNode.addChild(evaluateWhenNode);
evaluateNode.addChild(evaluateWhenNode2);
evaluateNode.addChild(evaluateWhenOtherNode);
evaluateNode.addChild(execCicsNode);
rootNode.addChild(evaluateNode);
Set<FoldingRange> foldingRange = DocumentServiceHelper.getFoldingRange(rootNode, DOCUMENT_URI);
assertEquals(5, foldingRange.size());
assertTrue(foldingRange.contains(new FoldingRange(3, 4))); // if node -> 3,4
assertTrue(foldingRange.contains(new FoldingRange(0, 10))); // evaluate -> 0, 10
assertTrue(foldingRange.contains(new FoldingRange(2, 4))); // 1st when node -> 2, 4
assertTrue(foldingRange.contains(new FoldingRange(5, 6))); // 2nd when node -> 5, 6
assertTrue(foldingRange.contains(new FoldingRange(7, 9))); // when other -> 7, 9
}

private static Node getRootNode() {
Node rootNode = new RootNode(LOCALITY);
Node ifNode =
Expand Down
Loading