Handle setting of position of the new nodes

ballerina-platform · Sep 13, 2024 · 2b10e02 · 2b10e02
1 parent da8d92b
commit 2b10e02
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/...ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java b/...ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java
@@ -4450,9 +4450,9 @@ public BLangNode transform(XMLStepExpressionNode xmlStepExpressionNode) {
         }
 
         BLangExpression expr = createExpression(xmlStepExpressionNode.expression());
-        BLangXMLNavigationAccess xmlNavigationAccess =
-                new BLangXMLNavigationAccess(getPosition(xmlStepExpressionNode), expr, filters,
-                        XMLNavigationAccess.NavAccessType.fromInt(starCount));
+        BLangXMLNavigationAccess xmlNavigationAccess = new BLangXMLNavigationAccess(
+                getPosition(xmlStepExpressionNode.expression(), xmlStepExpressionNode.xmlStepStart()), expr, filters,
+                XMLNavigationAccess.NavAccessType.fromInt(starCount));
         if (xmlStepExpressionNode.xmlStepExtend().size() > 0) {
             List<BLangXMLStepExtend> extensions =
                     createBLangXMLStepExtends(xmlStepExpressionNode.xmlStepExtend(), xmlNavigationAccess);
@@ -7089,24 +7089,26 @@ private List<BLangXMLStepExtend> createBLangXMLStepExtends(NodeList<Node> nodes,
         List<BLangXMLStepExtend> extensions = new ArrayList<>();
         BLangXMLStepExtend curExpr = null;
         for (Node node : nodes) {
+            Location pos = getPosition(node);
             SyntaxKind kind = node.kind();
             if (kind == SyntaxKind.XML_STEP_INDEXED_EXTEND) {
                 curExpr =
-                        new BLangXMLIndexedStepExtend(createExpression(((XMLStepIndexedExtendNode) node).expression()));
+                        new BLangXMLIndexedStepExtend(pos,
+                                createExpression(((XMLStepIndexedExtendNode) node).expression()));
             } else if (kind == SyntaxKind.XML_STEP_METHOD_CALL_EXTEND) {
                 XMLStepMethodCallExtendNode xmlStepMethodCallExtendNode = (XMLStepMethodCallExtendNode) node;
                 SimpleNameReferenceNode methodName = xmlStepMethodCallExtendNode.methodName();
                 BLangInvocation bLangInvocation = createBLangInvocation(methodName,
                         xmlStepMethodCallExtendNode.parenthesizedArgList().arguments(), methodName.location(), false);
                 bLangInvocation.expr = curExpr == null ? expr : curExpr;
-                curExpr = new BLangXMLMethodCallStepExtend(bLangInvocation);
+                curExpr = new BLangXMLMethodCallStepExtend(pos, bLangInvocation);
             } else {
                 XMLNamePatternChainingNode xmlNamePatternChainingNode = (XMLNamePatternChainingNode) node;
                 List<BLangXMLElementFilter> filters = new ArrayList<>();
                 for (Node namePattern : xmlNamePatternChainingNode.xmlNamePattern()) {
                     filters.add(createXMLElementFilter(namePattern));
                 }
-                curExpr = new BLangXMLFilterStepExtend(filters);
+                curExpr = new BLangXMLFilterStepExtend(pos, filters);
             }
             extensions.add(curExpr);
         }

diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/NodeCloner.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/NodeCloner.java
@@ -2316,19 +2316,19 @@ public void visit(BLangXMLElementFilter source) {
 
     @Override
     public void visit(BLangXMLIndexedStepExtend source) {
-        BLangXMLIndexedStepExtend clone = new BLangXMLIndexedStepExtend(source.indexExpr);
+        BLangXMLIndexedStepExtend clone = new BLangXMLIndexedStepExtend(source.pos, source.indexExpr);
         source.cloneRef = clone;
     }
 
     @Override
     public void visit(BLangXMLFilterStepExtend source) {
-        BLangXMLFilterStepExtend clone = new BLangXMLFilterStepExtend(cloneList(source.filters));
+        BLangXMLFilterStepExtend clone = new BLangXMLFilterStepExtend(source.pos, cloneList(source.filters));
         source.cloneRef = clone;
     }
 
     @Override
     public void visit(BLangXMLMethodCallStepExtend source) {
-        BLangXMLMethodCallStepExtend clone = new BLangXMLMethodCallStepExtend(clone(source.invocation));
+        BLangXMLMethodCallStepExtend clone = new BLangXMLMethodCallStepExtend(source.pos, clone(source.invocation));
         source.cloneRef = clone;
     }
 

diff --git a/.../main/java/org/wso2/ballerinalang/compiler/tree/expressions/BLangXMLFilterStepExtend.java b/.../main/java/org/wso2/ballerinalang/compiler/tree/expressions/BLangXMLFilterStepExtend.java
@@ -18,6 +18,7 @@
 
 package org.wso2.ballerinalang.compiler.tree.expressions;
 
+import io.ballerina.tools.diagnostics.Location;
 import org.ballerinalang.model.tree.NodeKind;
 import org.wso2.ballerinalang.compiler.tree.BLangNodeAnalyzer;
 import org.wso2.ballerinalang.compiler.tree.BLangNodeTransformer;
@@ -35,7 +36,8 @@ public class BLangXMLFilterStepExtend extends BLangXMLStepExtend {
 
     public final List<BLangXMLElementFilter> filters;
 
-    public BLangXMLFilterStepExtend(List<BLangXMLElementFilter> filters) {
+    public BLangXMLFilterStepExtend(Location pos, List<BLangXMLElementFilter> filters) {
+        this.pos = pos;
         this.filters = filters;
     }
 

diff --git a/...main/java/org/wso2/ballerinalang/compiler/tree/expressions/BLangXMLIndexedStepExtend.java b/...main/java/org/wso2/ballerinalang/compiler/tree/expressions/BLangXMLIndexedStepExtend.java
@@ -18,6 +18,7 @@
 
 package org.wso2.ballerinalang.compiler.tree.expressions;
 
+import io.ballerina.tools.diagnostics.Location;
 import org.ballerinalang.model.tree.NodeKind;
 import org.wso2.ballerinalang.compiler.tree.BLangNodeAnalyzer;
 import org.wso2.ballerinalang.compiler.tree.BLangNodeTransformer;
@@ -31,7 +32,8 @@
 public class BLangXMLIndexedStepExtend extends BLangXMLStepExtend {
     public BLangExpression indexExpr;
 
-    public BLangXMLIndexedStepExtend(BLangExpression indexExpr) {
+    public BLangXMLIndexedStepExtend(Location pos, BLangExpression indexExpr) {
+        this.pos = pos;
         this.indexExpr = indexExpr;
     }
 

diff --git a/...n/java/org/wso2/ballerinalang/compiler/tree/expressions/BLangXMLMethodCallStepExtend.java b/...n/java/org/wso2/ballerinalang/compiler/tree/expressions/BLangXMLMethodCallStepExtend.java
@@ -18,6 +18,7 @@
 
 package org.wso2.ballerinalang.compiler.tree.expressions;
 
+import io.ballerina.tools.diagnostics.Location;
 import org.ballerinalang.model.tree.NodeKind;
 import org.wso2.ballerinalang.compiler.tree.BLangNodeAnalyzer;
 import org.wso2.ballerinalang.compiler.tree.BLangNodeTransformer;
@@ -32,7 +33,8 @@ public class BLangXMLMethodCallStepExtend extends BLangXMLStepExtend {
 
     public BLangInvocation invocation;
 
-    public BLangXMLMethodCallStepExtend(BLangInvocation invocation) {
+    public BLangXMLMethodCallStepExtend(Location pos, BLangInvocation invocation) {
+        this.pos = pos;
         this.invocation = invocation;
         this.invocation.parent = this;
     }