Merge branch 'idea162.x-cleanup'

JetBrains · Jul 26, 2016 · 42c4ce1 · 42c4ce1
2 parents 2618457 + ae74fbd
commit 42c4ce1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 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
     }
   }

diff --git a/src/org/jetbrains/plugins/scala/worksheet/WorksheetFoldingBuilder.scala b/src/org/jetbrains/plugins/scala/worksheet/WorksheetFoldingBuilder.scala
@@ -55,9 +55,9 @@ class WorksheetFoldingBuilder extends FoldingBuilder {
       (node.getText.startsWith(WorksheetFoldingBuilder.FIRST_LINE_PREFIX) ||
         node.getText.startsWith(WorksheetFoldingBuilder.LINE_PREFIX))) {
       val length = Math.max(WorksheetFoldingBuilder.FIRST_LINE_PREFIX.length, WorksheetFoldingBuilder.LINE_PREFIX.length)
-      descriptors += (new FoldingDescriptor(node,
+      descriptors += new FoldingDescriptor(node,
         new TextRange(node.getPsi.asInstanceOf[PsiComment].getTextRange.getStartOffset,
-          node.getPsi.asInstanceOf[PsiComment].getTextRange.getStartOffset + length), null, Collections.emptySet[AnyRef], true))
+          node.getPsi.asInstanceOf[PsiComment].getTextRange.getStartOffset + length), null, Collections.emptySet[AnyRef], true)
     }
 
     for (child <- node.getChildren(null)) {