Skip to content

Tweak using syntax #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 14, 2021
Merged

Tweak using syntax #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39ddd53
NIT
alexarchambault Sep 14, 2021
5ae7e35
Accept comma-separated using directives
alexarchambault Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions modules/build/src/main/scala/scala/build/preprocessing/TemporaryDirectivesParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@ object TemporaryDirectivesParser {
P(usingTpe | requireTpe)
}

def simpleElem = P(CharPred(c => !c.isWhitespace && c != '"').rep(1).!)
def simpleElemChar = P(
CharPred(c => !c.isWhitespace && c != '"' && c != ',') |
P("\\\\").map(_ => "\\") |
P("\\\"").map(_ => "\"") |
P("\\,").map(_ => ",")
)
def simpleElem = P(simpleElemChar.rep(1).!)
def charInQuote = P(
CharPred(c => c != '"' && c != '\\').! |
P("\\\\").map(_ => "\\") |
Expand All @@ -26,9 +32,16 @@ object TemporaryDirectivesParser {
def quotedElem = P("\"" ~ charInQuote.rep ~ "\"").map(_.mkString)
def elem = P(simpleElem | quotedElem)

P(tpe ~ ws ~ elem ~ (ws ~ elem).rep(0) ~ nl.? ~ sc.? ~ nl.?).map {
case (tpe0, firstElem, otherElems) =>
Directive(tpe0, firstElem +: otherElems)
def parser = P(
tpe ~ ws ~
elem.rep(1, sep = P(ws)).rep(1, sep = P(ws.? ~ "," ~ ws.?)) ~
nl.? ~ sc.? ~
nl.?
)

parser.map {
case (tpe0, allElems) =>
allElems.map(elems => Directive(tpe0, elems))
}
}

Expand All @@ -37,7 +50,7 @@ object TemporaryDirectivesParser {
P(directive.?)
}

private def parseDirective(content: String, fromIndex: Int): Option[(Directive, Int)] = {
private def parseDirective(content: String, fromIndex: Int): Option[(Seq[Directive], Int)] = {
// TODO Don't create a new String here
val res = parse(content.drop(fromIndex), maybeDirective(_))
res.fold((err, idx, _) => sys.error(err), (dirOpt, idx) => dirOpt.map((_, idx + fromIndex)))
Expand All @@ -48,7 +61,7 @@ object TemporaryDirectivesParser {
def helper(fromIndex: Int, acc: List[Directive]): (List[Directive], Int) =
parseDirective(content, fromIndex) match {
case None => (acc.reverse, fromIndex)
case Some((dir, newIndex)) => helper(newIndex, dir :: acc)
case Some((dir, newIndex)) => helper(newIndex, dir.toList ::: acc)
}

val (directives, codeStartsAt) = helper(0, Nil)
Expand Down
3 changes: 1 addition & 2 deletions modules/integration/src/test/scala/scala/cli/integration/TestTestDefinitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,7 @@ abstract class TestTestDefinitions(val scalaVersionOpt: Option[String])
val successfulWeaverInputs = TestInputs(
Seq(
os.rel / "MyTests.scala" ->
"""using "com.disneystreaming::weaver-cats:0.7.6"
|using "com.eed3si9n.expecty::expecty:0.15.4+5-f1d8927e-SNAPSHOT"
"""using com.disneystreaming::weaver-cats:0.7.6, com.eed3si9n.expecty::expecty:0.15.4+5-f1d8927e-SNAPSHOT
|import weaver._
|import cats.effect.IO
|
Expand Down