summaryrefslogtreecommitdiff
path: root/src/reflect/scala/reflect/internal/Positions.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-09-24 14:27:58 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-09-24 16:56:18 +1000
commitfb299f80f3f85e935695d5b7cb7f2c712b150e3c (patch)
tree4d95bc66e8354e0eb9135aaf1fa102761fb59dff /src/reflect/scala/reflect/internal/Positions.scala
parent2c9e506bc32248f9ae4929790a0cb7484a53a66e (diff)
downloadscala-fb299f80f3f85e935695d5b7cb7f2c712b150e3c.tar.gz
scala-fb299f80f3f85e935695d5b7cb7f2c712b150e3c.tar.bz2
scala-fb299f80f3f85e935695d5b7cb7f2c712b150e3c.zip
Improve presentation compilation of annotations
A trio of problems were hampering autocompletion of annotations. First, given that that annotation is written before the annotated member, it is very common to end parse incomplete code that has a floating annotation without an anotatee. The parser was discarding the annotations (ie, the modifiers) and emitting an `EmptyTree`. Second, the presetation compiler was only looking for annotations in the Modifiers of a member def, but after typechecking annotations are moved into the symbol. Third, if an annotation failed to typecheck, it was being discarded in place of `ErroneousAnnotation`. This commit: - modifies the parser to uses a dummy class- or type-def tree, instead of EmptyTree, which can carry the annotations. - updates the locator to look in the symbol annotations of the modifiers contains no annotations. - uses a separate instance of `ErroneousAnnotation` for each erroneous annotation, and stores the original tree in its `original` tree.
Diffstat (limited to 'src/reflect/scala/reflect/internal/Positions.scala')
-rw-r--r--src/reflect/scala/reflect/internal/Positions.scala9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/Positions.scala b/src/reflect/scala/reflect/internal/Positions.scala
index 4d0e31b037..15d68bcdfe 100644
--- a/src/reflect/scala/reflect/internal/Positions.scala
+++ b/src/reflect/scala/reflect/internal/Positions.scala
@@ -252,7 +252,14 @@ trait Positions extends api.Positions { self: SymbolTable =>
super.traverse(t)
} else t match {
case mdef: MemberDef =>
- traverseTrees(mdef.mods.annotations)
+ val annTrees = mdef.mods.annotations match {
+ case Nil if mdef.symbol != null =>
+ // After typechecking, annotations are mvoed from the modifiers
+ // to the annotation on the symbol of the anotatee.
+ mdef.symbol.annotations.map(_.original)
+ case anns => anns
+ }
+ traverseTrees(annTrees)
case _ =>
}
}