Add source offsets for fields, properties and bare ellipsis

#412
groovy · Mar 16, 2018 · 0882873 · 0882873
1 parent 46030d8
commit 0882873
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/base/org.codehaus.groovy26/src/org/apache/groovy/parser/antlr4/AstBuilder.java b/base/org.codehaus.groovy26/src/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -2151,6 +2151,12 @@ private void declareProperty(VariableDeclarationContext ctx, ModifierManager mod
             configureAST(fieldNode, variableExpression, initialValue);
             configureAST(propertyNode, variableExpression, initialValue);
         }
+        // GRECLIPSE add
+        fieldNode.setNameStart(variableExpression.getStart());
+        fieldNode.setNameEnd(variableExpression.getEnd() - 1);
+        propertyNode.setNameStart(variableExpression.getStart());
+        propertyNode.setNameEnd(variableExpression.getEnd() - 1);
+        // GRECLIPSE end
     }
 
     private void declareField(VariableDeclarationContext ctx, ModifierManager modifierManager, ClassNode variableType, ClassNode classNode, int i, VariableExpression variableExpression, String fieldName, int modifiers, Expression initialValue) {
@@ -2184,6 +2190,10 @@ private void declareField(VariableDeclarationContext ctx, ModifierManager modifi
         } else {
             configureAST(fieldNode, variableExpression, initialValue);
         }
+        // GRECLIPSE add
+        fieldNode.setNameStart(variableExpression.getStart());
+        fieldNode.setNameEnd(variableExpression.getEnd() - 1);
+        // GRECLIPSE end
     }
 
     private boolean isFieldDeclaration(ModifierManager modifierManager, ClassNode classNode) {
@@ -4608,7 +4618,11 @@ private Parameter processFormalParameter(GroovyParserRuleContext ctx,
         if (asBoolean(ellipsis)) {
             // GRECLIPSE edit
             //classNode = configureAST(classNode.makeArray(), classNode);
-            classNode = configureAST(classNode.makeArray(), typeContext);
+            if (asBoolean(typeContext)) {
+                classNode = configureAST(classNode.makeArray(), typeContext);
+            } else {
+                classNode = configureAST(classNode.makeArray(), ellipsis);
+            }
             // GRECLIPSE end
         }