Implementation of daniel-trinh#12.

Fix test formation glitches. Add test for class annotation.
bambuchaAdm · Mar 4, 2014 · 847e4dd · 847e4dd
1 parent 7c87416
commit 847e4dd
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 19 deletions.
diff --git a/scalariform/src/main/scala/scalariform/formatter/ExprFormatter.scala b/scalariform/src/main/scala/scalariform/formatter/ExprFormatter.scala
@@ -885,7 +885,10 @@ trait ExprFormatter { self: HasFormattingPreferences with AnnotationFormatter wi
       }
     }
     formatResult ++= format(defOrDcl)
-    formatResult
+    modifiers.headOption.fold(formatResult.before(defOrDcl.firstToken, formatterState.currentIndentLevelInstruction)){ modifier =>
+      formatResult.before(modifier.firstToken, formatterState.currentIndentLevelInstruction)
+    }
+
   }
 
   private def format(defOrDcl: DefOrDcl)(implicit formatterState: FormatterState): FormatResult = defOrDcl match {
@@ -971,8 +974,10 @@ trait ExprFormatter { self: HasFormattingPreferences with AnnotationFormatter wi
   protected def calculateParamSectionLengths(param: Param, first: Boolean)(implicit formatterState: FormatterState): Option[ParamSectionLengths] = {
     val Param(annotations, modifiers, valOrVarOpt, id, paramTypeOpt, defaultValueOpt) = param
 
+    val tokenIsOnNewline = hiddenPredecessors(param.firstToken).containsNewline
+
     val formattedParam = formattedAstNode(param) {
-      format(param)(formatterState)
+      format(param, tokenIsOnNewline)(formatterState)
     }
 
     def calculateLengths: ParamSectionLengths = {
@@ -1180,7 +1185,7 @@ trait ExprFormatter { self: HasFormattingPreferences with AnnotationFormatter wi
         case None ⇒
           alignFirstParam(firstParam)
       }
-      formatResult ++= format(firstParam)(paramFormatterState)
+      formatResult ++= format(firstParam, firstTokenIsOnNewline)(paramFormatterState)
     }
 
     otherGroupedParams.foreach {
@@ -1197,11 +1202,11 @@ trait ExprFormatter { self: HasFormattingPreferences with AnnotationFormatter wi
           // Indent Default
           indentDefault(param, maxSectionLengths)
 
-          formatResult ++= format(param)(paramFormatterState)
+          formatResult ++= format(param, firstTokenIsOnNewline)(paramFormatterState)
         }
       case Right(param) ⇒
         alignOtherParams(param.firstToken)
-        formatResult ++= format(param)(paramFormatterState)
+        formatResult ++= format(param, firstTokenIsOnNewline)(paramFormatterState)
     }
 
     def alignFirstParam(firstParam: Param) = {
@@ -1264,12 +1269,20 @@ trait ExprFormatter { self: HasFormattingPreferences with AnnotationFormatter wi
 
   }
 
-  private def format(param: Param)(implicit formatterState: FormatterState): FormatResult = {
-    val Param(annotations: List[Annotation], modifiers: List[Modifier], valOrVarOpt: Option[Token], id: Token, paramTypeOpt: Option[(Token, Type)], defaultValueOpt: Option[(Token, Expr)]) = param
+  private def format(param: Param, identAddnotation: Boolean)(implicit formatterState: FormatterState): FormatResult = {
+    val Param(annotations: List[Annotation], modifiers: List[Modifier], valVarOpt: Option[Token], id: Token, paramTypeOpt: Option[(Token, Type)], defaultValueOpt: Option[(Token, Expr)]) = param
     var formatResult: FormatResult = NoFormatResult
 
     for (annotation ← annotations) {
-      formatResult ++= format(annotation)
+      val result: FormatResult = format(annotation)
+      if(identAddnotation){
+        formatResult ++= result.before(annotation.at,formatterState.currentIndentLevelInstruction)
+      } else {
+        formatResult ++= result
+      }
+    }
+    if(identAddnotation){
+      formatResult = formatResult.before(id, formatterState.currentIndentLevelInstruction )
     }
     for ((colon, paramType) ← paramTypeOpt) {
       formatResult ++= format(paramType)

diff --git a/scalariform/src/test/scala/scalariform/formatter/AnnoatationFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/AnnoatationFormatterTest.scala
@@ -23,34 +23,35 @@ class AnnoatationFormatterTest extends AbstractFormatterTest {
     |    @annotation one: Int,
     |    @a @b(c) two: String
     |    ) = ???
-    |}
-  """.stripMargin ==>
-  """
-    |class X {
+    |}""".stripMargin ==>
+  """class X {
     |  def asdf(
     |    @annotation
     |    one: Int,
     |    @a
     |    @b(c)
     |    two: String
-    |  )
-    |}
-  """.stripMargin
+    |  ) = ???
+    |}""".stripMargin
 
   """class A extends B {
     |  @SomeImportantAnnotation(param = true) override val param: Int = 1
     |
     |  @NotSoImportantAnnotation(param = false) val description: String = "Not so important"
-    |}
-  """.stripMargin ==>
+    |}""".stripMargin ==>
   """class A extends B {
     |  @SomeImportantAnnotation(param = true)
     |  override val param: Int = 1
     |
     |  @NotSoImportantAnnotation(param = false)
     |  val description: String = "Not so important"
-    |}
-  """.stripMargin
+    |}""".stripMargin
+
+  """@foo class X {
+    |}""".stripMargin ==>
+  """@foo
+    |class X {
+    |}""".stripMargin
 
 
 }