Skip to content

Commit

Permalink
Merge pull request #378 from abeln/add-left
Browse files Browse the repository at this point in the history
Fix #373: addLeft's implementation doesn't match its specification
  • Loading branch information
olafurpg authored Sep 29, 2017
2 parents d511c19 + 53df5c0 commit 621fa77
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ case class RuleCtxImpl(tree: Tree, config: ScalafixConfig) extends RuleCtx {
toks(tree).lastOption.fold(Patch.empty)(addRight(_, toAdd))
def addLeft(tok: Token, toAdd: String): Patch = Add(tok, toAdd, "")
def addLeft(tree: Tree, toAdd: String): Patch =
toks(tree).lastOption.fold(Patch.empty)(addLeft(_, toAdd))
toks(tree).headOption.fold(Patch.empty)(addLeft(_, toAdd))

// Semantic patch ops.
def removeGlobalImport(symbol: Symbol)(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,18 @@ import scalafix.syntax._

import org.scalatest.FunSuiteLike

class SyntacticRuleSuite(rule: Rule) extends FunSuiteLike with DiffAssertions {
class SyntacticRuleSuite(defaultRule: Rule = Rule.empty)
extends FunSuiteLike
with DiffAssertions {
def check(name: String, original: String, expected: String): Unit = {
check(defaultRule, name, original, expected)
}

def check(
rule: Rule,
name: String,
original: String,
expected: String): Unit = {
test(name) {
import scala.meta._
val obtained = rule.apply(Input.String(original))
Expand All @@ -18,6 +28,10 @@ class SyntacticRuleSuite(rule: Rule) extends FunSuiteLike with DiffAssertions {
}

def checkDiff(original: Input, expected: String): Unit = {
checkDiff(defaultRule, original, expected)
}

def checkDiff(rule: Rule, original: Input, expected: String): Unit = {
test(original.label) {
val ctx = RuleCtx(original.parse[Source].get, ScalafixConfig.default)
val obtained = rule.diff(ctx)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,27 @@ import java.nio.file.Files
import java.nio.file.Paths
import scalafix.internal.rule.ProcedureSyntax

class ErrorSuite extends SyntacticRuleSuite(ProcedureSyntax) {
class ErrorSuite extends SyntacticRuleSuite {
test("on parse error") {
intercept[ParseException] {
ProcedureSyntax.apply(Input.String("object A {"))
}
}
}
class PatchSuite
extends SyntacticRuleSuite(Rule.syntactic("PatchSuite")(ctx =>
ctx.addRight(ctx.tree.tokens.find(_.is[Ident]).get, "bba"))) {
class PatchSuite extends SyntacticRuleSuite {

val original =
val original: String =
"""// Foobar
|object a {
| val x = 2
|}""".stripMargin

val addRightRule: Rule = Rule.syntactic("addRight") { (ctx) =>
ctx.addRight(ctx.tree.tokens.find(_.is[Ident]).get, "bba")
}

checkDiff(
addRightRule,
Input.String(original),
"""--- Input.String('<// Foobar...>')
|+++ Input.String('<// Foobar...>')
Expand All @@ -39,6 +42,7 @@ class PatchSuite
)

checkDiff(
addRightRule,
Input.VirtualFile("/label", original),
"""--- /label
|+++ /label
Expand All @@ -53,6 +57,7 @@ class PatchSuite
val file = File.createTempFile("foo", ".scala")
Files.write(Paths.get(file.toURI), original.getBytes)
checkDiff(
addRightRule,
Input.File(file),
s"""--- ${file.getAbsolutePath}
|+++ ${file.getAbsolutePath}
Expand All @@ -63,4 +68,19 @@ class PatchSuite
| val x = 2
| }""".stripMargin
)

val addLeftRule: Rule = Rule.syntactic("addLeft") { (ctx) =>
ctx.addLeft(ctx.tree, "object Foo {}\n")
}

check(
addLeftRule,
"addLeft adds the string before the first tree token",
original,
"""object Foo {}
|// Foobar
|object a {
| val x = 2
|}""".stripMargin
)
}

0 comments on commit 621fa77

Please sign in to comment.