Java: Account for non-source annotation on second field in multi-field declarations.

aschackmull · aschackmull · commit 3e5bbd96b1df · 2019-05-22T11:33:10.000+02:00
diff --git a/java/ql/src/semmle/code/java/Annotation.qll b/java/ql/src/semmle/code/java/Annotation.qll
@@ -27,7 +27,11 @@ class Annotation extends @annotation, Expr {
   Element getAnnotatedElement() {
     exists(Element e | e = this.getParent() |
       if e.(Field).getCompilationUnit().fromSource()
-      then result = e.(Field).getDeclaration().getAField()
+      then
+        exists(FieldDeclaration decl |
+          decl.getField(0) = e and
+          result = decl.getAField()
+        )
       else result = e
     )
   }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,11 @@ class Annotation extends @annotation, Expr {`
`27`	`27`	`Element getAnnotatedElement() {`
`28`	`28`	`exists(Element e \| e = this.getParent() \|`
`29`	`29`	`if e.(Field).getCompilationUnit().fromSource()`
`30`		`- then result = e.(Field).getDeclaration().getAField()`
	`30`	`+ then`
	`31`	`+ exists(FieldDeclaration decl \|`
	`32`	`+ decl.getField(0) = e and`
	`33`	`+ result = decl.getAField()`
	`34`	`+ )`
`31`	`35`	`else result = e`
`32`	`36`	`)`
`33`	`37`	`}`