Merge pull request #56 from dwijnand/tweak-prof-command

retronym · web-flow · commit 0666a9400e2d · 2017-12-18T13:11:07.000+10:00
Use Command.arb
diff --git a/build.sbt b/build.sbt
@@ -102,7 +102,7 @@ def profParser(s: State): Parser[String] = {
   token("prof" ~> OptSpace) flatMap { _ => matched(s.combinedParser)} map (_.trim)
 }
 
-commands += Command.custom((s: State) => Command.applyEffect(profParser(s))((line: String) => {
+commands += Command.arb(profParser)((s: State, line: String) => {
   val flameGraphOpts = s"--minwidth,1,--colors,java,--cp,--width,1800"
   abstract class Profiler(val name: String) {
     def command(outDir: File): String
@@ -129,7 +129,7 @@ commands += Command.custom((s: State) => Command.applyEffect(profParser(s))((lin
     List(line + " -jvmArgs -Dsun.reflect.inflationThreshold=0 " + prof.command(outDir) + s" -o ${(outDir / "jmh.log").getAbsolutePath} -rf json -rff ${(outDir / "result.json").getAbsolutePath}", BasicCommandStrings.FailureWall)
   }
   s.copy(remainingCommands = BasicCommandStrings.ClearOnFailure :: commands ++ s.remainingCommands)
-}))
+})
 
 
 def addJmh(project: Project): Project = {

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ def profParser(s: State): Parser[String] = {`
`102`	`102`	`token("prof" ~> OptSpace) flatMap { _ => matched(s.combinedParser)} map (_.trim)`
`103`	`103`	`}`
`104`	`104`
`105`		`-commands += Command.custom((s: State) => Command.applyEffect(profParser(s))((line: String) => {`
	`105`	`+commands += Command.arb(profParser)((s: State, line: String) => {`
`106`	`106`	`val flameGraphOpts = s"--minwidth,1,--colors,java,--cp,--width,1800"`
`107`	`107`	`abstract class Profiler(val name: String) {`
`108`	`108`	`def command(outDir: File): String`
`@@ -129,7 +129,7 @@ commands += Command.custom((s: State) => Command.applyEffect(profParser(s))((lin`
`129`	`129`	`List(line + " -jvmArgs -Dsun.reflect.inflationThreshold=0 " + prof.command(outDir) + s" -o ${(outDir / "jmh.log").getAbsolutePath} -rf json -rff ${(outDir / "result.json").getAbsolutePath}", BasicCommandStrings.FailureWall)`
`130`	`130`	`}`
`131`	`131`	`s.copy(remainingCommands = BasicCommandStrings.ClearOnFailure :: commands ++ s.remainingCommands)`
`132`		`-}))`
	`132`	`+})`
`133`	`133`
`134`	`134`
`135`	`135`	`def addJmh(project: Project): Project = {`