Fixed access to

JetBrains · Jul 25, 2016 · ae74fbd · ae74fbd
1 parent 422dd1f
commit ae74fbd
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/org/jetbrains/plugins/scala/lang/psi/api/statements/ScAnnotationsHolder.scala b/src/org/jetbrains/plugins/scala/lang/psi/api/statements/ScAnnotationsHolder.scala
@@ -34,15 +34,14 @@ trait ScAnnotationsHolder extends ScalaPsiElement with PsiAnnotationOwner {
       case _ => None
     }
 
-    val maybeStubAnnotations = maybeStub.toSeq flatMap {
-      _.getChildrenByType(TokenSet.create(ScalaElementTypes.ANNOTATIONS),
-        JavaArrayFactoryUtil.ScAnnotationsFactory).toSeq
-    } headOption
+    val maybeStubAnnotations = maybeStub.toSeq.flatMap({
+          _.getChildrenByType(TokenSet.create(ScalaElementTypes.ANNOTATIONS),
+            JavaArrayFactoryUtil.ScAnnotationsFactory).toSeq
+        }).headOption
 
-    val maybeAnnotations = (maybeStubAnnotations ++
-      Option(findChildByClassScala(classOf[ScAnnotations]))) headOption
+    val maybeAnnotations = maybeStubAnnotations.orElse(Option(findChildByClassScala(classOf[ScAnnotations])))
 
-    maybeAnnotations.toSeq flatMap {
+    maybeAnnotations.toSeq.flatMap {
       _.getAnnotations.toSeq
     }
   }