Merge pull request #15 from scalacenter/private-lazy-val

Fix bug for lazy vals with other modifiers
scalacenter · Oct 20, 2016 · 4479aaf · 4479aaf
2 parents 2b0d358 + c947bde
commit 4479aaf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/src/main/scala/scalafix/rewrite/VolatileLazyVal.scala b/core/src/main/scala/scalafix/rewrite/VolatileLazyVal.scala
@@ -10,13 +10,13 @@ case object VolatileLazyVal extends Rewrite {
         case x if x.syntax == "@volatile" =>
           None
         case x if x.syntax == "lazy" =>
-          Some(x.tokens.head)
+          Some(defn.mods.head.tokens.head)
       }
     }.flatten
   }
   override def rewrite(ast: Tree, ctx: RewriteCtx): Seq[Patch] = {
     ast.collect {
-      case NonVolatileLazyVal(tok) => Patch(tok, tok, "@volatile lazy")
+      case NonVolatileLazyVal(tok) => Patch(tok, tok, s"@volatile ${tok.syntax}")
     }
   }
 }
diff --git a/core/src/test/scala/scalafix/rewrite/LazyValSuite.scala b/core/src/test/scala/scalafix/rewrite/LazyValSuite.scala
@@ -12,6 +12,7 @@ class LazyValSuite extends RewriteSuite(VolatileLazyVal) {
        |
        |  lazy val x = 2
        |  @volatile lazy val dontChangeMe = 2
+       |  private lazy val x = 2
        |
        |  class foo {
        |    lazy val z = {
@@ -26,6 +27,7 @@ class LazyValSuite extends RewriteSuite(VolatileLazyVal) {
        |
        |  @volatile lazy val x = 2
        |  @volatile lazy val dontChangeMe = 2
+       |  @volatile private lazy val x = 2
        |
        |  class foo {
        |    @volatile lazy val z = {