Garmelon/asciiprooftree
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add --use-scala-docstring-regexes option

Browse source
This commit is contained in:
Joscha 2025-02-06 22:27:53 +01:00
parent fac0f3605d
commit fca156e1cc
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/main/scala/de/plugh/asciiprooftree/Main.scala
View file

@ -7,13 +7,16 @@ import java.nio.file.{Files, Path}
import scala.jdk.StreamConverters.* import scala.jdk.StreamConverters.*
import scala.util.matching.Regex import scala.util.matching.Regex
val blockRe = "(?m)^(?<block>(\\s*)§.*\\n(?:\\2§.*\\n)*)".r val markerBlockRe = "(?m)^(?<block>(\\s*)§.*\\n(?:\\2§.*\\n)*)".r
val lineRe = "^\\s*§(?<block>.*)$".r val markerLineRe = "^\\s*§(?<block>.*)$".r
val scalaDocstringBlockRe = "(?m)^(\\s*)\\* \\{\\{\\{\\n(?<block>(\\1\\*.*\\n)+?)\\1\\* }}}\\n".r
val scalaDocstringLineRe = "^\\s*\\*(?<block>.*)$".r
class Conf(args: Seq[String]) extends ScallopConf(args): class Conf(args: Seq[String]) extends ScallopConf(args):
val path: ScallopOption[Path] = trailArg[Path]() val path: ScallopOption[Path] = trailArg[Path]()
val blockRegex: ScallopOption[String] = opt[String](default = Some(blockRe.regex)) val blockRegex: ScallopOption[String] = opt[String]()
val lineRegex: ScallopOption[String] = opt[String](default = Some(lineRe.regex)) val lineRegex: ScallopOption[String] = opt[String]()
val useScalaDocstringRegexes: ScallopOption[Boolean] = opt[Boolean]()
val indent: ScallopOption[Int] = opt[Int](default = Some(2)) val indent: ScallopOption[Int] = opt[Int](default = Some(2))
val noHeuristics: ScallopOption[Boolean] = opt[Boolean]() val noHeuristics: ScallopOption[Boolean] = opt[Boolean]()
verify() verify()
@ -21,12 +24,18 @@ class Conf(args: Seq[String]) extends ScallopConf(args):
@main @main
def main(args: String*): Unit = def main(args: String*): Unit =
val conf = new Conf(args) val conf = new Conf(args)
val (defaultBlockRe, defaultLineRe) =
if conf.useScalaDocstringRegexes() then (scalaDocstringBlockRe, scalaDocstringLineRe)
else (markerBlockRe, markerLineRe)
val formatter = Formatter( val formatter = Formatter(
blockRe = Regex(conf.blockRegex()), blockRe = conf.blockRegex.map(Regex(_)).getOrElse(defaultBlockRe),
lineRe = Regex(conf.lineRegex()), lineRe = conf.lineRegex.map(Regex(_)).getOrElse(defaultLineRe),
indent = conf.indent(), indent = conf.indent(),
heuristics = !conf.noHeuristics(), heuristics = !conf.noHeuristics(),
) )
reformat(conf.path(), formatter) reformat(conf.path(), formatter)
def reformat(path: Path, formatter: Formatter): Unit = def reformat(path: Path, formatter: Formatter): Unit =