Bug 575349: [R-Project] Fix creation of multiple tasks in Roxygen
comments
Change-Id: I48de3b2608ebfd97e27cf93c604fa84422e0c9f8
diff --git a/r/org.eclipse.statet.r.core/src/org/eclipse/statet/internal/r/core/rmodel/RTaskTagReporter.java b/r/org.eclipse.statet.r.core/src/org/eclipse/statet/internal/r/core/rmodel/RTaskTagReporter.java
index 9fdd723..94623dc 100644
--- a/r/org.eclipse.statet.r.core/src/org/eclipse/statet/internal/r/core/rmodel/RTaskTagReporter.java
+++ b/r/org.eclipse.statet.r.core/src/org/eclipse/statet/internal/r/core/rmodel/RTaskTagReporter.java
@@ -27,6 +27,7 @@
import org.eclipse.statet.r.core.project.RProject;
import org.eclipse.statet.r.core.rmodel.RSourceUnit;
import org.eclipse.statet.r.core.rmodel.RSourceUnitModelInfo;
+import org.eclipse.statet.r.core.rsource.ast.NodeType;
import org.eclipse.statet.r.core.rsource.ast.RAstNode;
import org.eclipse.statet.r.core.rsource.ast.SourceComponent;
@@ -55,7 +56,16 @@
if (rootNode instanceof SourceComponent) {
final var comments= nonNullAssert(((SourceComponent)rootNode).getComments());
for (final RAstNode comment : comments) {
- checkForTasks(comment.getStartOffset() + 1, comment.getEndOffset());
+ if (comment.getNodeType() == NodeType.DOCU_AGGREGATION) {
+ final int childCount= comment.getChildCount();
+ for (int childIndex= 0; childIndex < childCount; childIndex++) {
+ final RAstNode commentLine= comment.getChild(childIndex);
+ checkForTasks(commentLine.getStartOffset() + 2, commentLine.getEndOffset());
+ }
+ }
+ else {
+ checkForTasks(comment.getStartOffset() + 1, comment.getEndOffset());
+ }
}
}
}
