This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new c10a0ee [NETBEANS-4299] find endPos for synthetic annotation attribute
new a372537 Merge pull request #2126 from errael/endPosAnnotationAttribute
c10a0ee is described below
commit c10a0ee7dd362e8b1740d2c5e8ab75f7c89d7caa
Author: Ernie Rael <[email protected]>
AuthorDate: Sat May 2 23:28:51 2020 +0100
[NETBEANS-4299] find endPos for synthetic annotation attribute
---
.../src/org/netbeans/modules/java/source/save/CasualDiff.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java
b/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java
index d9c0c8c..06a6b13 100644
---
a/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java
+++
b/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java
@@ -535,8 +535,14 @@ public class CasualDiff {
VariableTree vt = fgt.getVariables().get(fgt.getVariables().size()
- 1);
return TreeInfo.getEndPos((JCTree)vt, oldTopLevel.endPositions);
}
- return TreeInfo.getEndPos(t, oldTopLevel.endPositions);
+ int endPos = TreeInfo.getEndPos(t, oldTopLevel.endPositions);
+
+ // [NETBEANS-4299], might be a synthetic annotation attribute, try rhs
+ if (endPos == Position.NOPOS && t instanceof JCAssign) {
+ endPos = TreeInfo.getEndPos(((JCAssign)t).rhs,
oldTopLevel.endPositions);
}
+ return endPos;
+ }
private int endPos(com.sun.tools.javac.util.List<? extends JCTree> trees) {
int result = -1;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
