add offset in MethodDeclarationAttribute for @AJ in AJDT

3 files changed, 15 insertions, 11 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java
index 504631c9c..13212dfdd 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java
@@ -53,6 +53,6 @@ public class AjConstructorDeclaration extends ConstructorDeclaration {
 		}
 		
 		extraAttributeList.add(
-				new EclipseAttributeAdapter(new AjAttribute.MethodDeclarationLineNumberAttribute(declarationStartLine)));
+				new EclipseAttributeAdapter(new AjAttribute.MethodDeclarationLineNumberAttribute(declarationStartLine, this.sourceStart())));
 	}
 }
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java
index ae91da894..21e009f67 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java
@@ -69,6 +69,6 @@ public class AjMethodDeclaration extends MethodDeclaration {
 		}
 		
 		extraAttributeList.add(
-				new EclipseAttributeAdapter(new AjAttribute.MethodDeclarationLineNumberAttribute(declarationStartLine)));
+				new EclipseAttributeAdapter(new AjAttribute.MethodDeclarationLineNumberAttribute(declarationStartLine, this.sourceStart())));
 	}
 }
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java
index b3fc473b4..8cdaa333b 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java
@@ -50,18 +50,22 @@ public class EclipseSourceContext implements ISourceContext {
 		return new EclipseSourceLocation(result, position.getStart(), position.getEnd());
 	}
 
-    public ISourceLocation makeSourceLocation(int line) {
+    public ISourceLocation makeSourceLocation(int line, int offset) {
 		SourceLocation sl = new SourceLocation(getSourceFile(), line);
 
-        // compute the offset
-        //TODO AV - should we do it lazily?
-        int[] offsets = result.lineSeparatorPositions;
-        int likelyOffset = 0;
-        if (line > 0 && line < offsets.length) {
-            //1st char of given line is next char after previous end of line
-            likelyOffset = offsets[line-1];
+        if (offset > 0) {
+            sl.setOffset(offset);
+        } else {
+            // compute the offset
+            //TODO AV - should we do it lazily?
+            int[] offsets = result.lineSeparatorPositions;
+            int likelyOffset = 0;
+            if (line > 0 && line < offsets.length) {
+                //1st char of given line is next char after previous end of line
+                likelyOffset = offsets[line-1];//FIXME may be need -2
+            }
+            sl.setOffset(likelyOffset);
         }
-        sl.setOffset(likelyOffset);
         return sl;
 	}