Merge pull request scala#882 from dotty-staging/fix/java-annots-pos

Set position on annotations parsed from Java
bigmarvin · Oct 30, 2015 · 201ce2f · 201ce2f
2 parents 68cc0b7 + 40d4935
commit 201ce2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/dotty/tools/dotc/parsing/JavaParsers.scala b/src/dotty/tools/dotc/parsing/JavaParsers.scala
@@ -356,7 +356,7 @@ object JavaParsers {
       // assumed true unless we see public/private/protected
       var isPackageAccess = true
       var annots: List[Tree] = Nil
-      def addAnnot(sym: ClassSymbol) = annots :+= New(TypeTree(sym.typeRef))
+      def addAnnot(sym: ClassSymbol) = annots :+= New(TypeTree(sym.typeRef)).withPos(Position(in.offset))
 
       while (true) {
         in.token match {

diff --git a/tests/pos/java-interop/volatile/volatile.java b/tests/pos/java-interop/volatile/volatile.java
@@ -0,0 +1,3 @@
+public class Foo {
+  volatile int x = 1;
+}