Skip to content
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

[1.x] Handle parsing of non-problems in JavaErrorParser #1455

Merged
merged 3 commits into from
Oct 12, 2024
Merged

[1.x] Handle parsing of non-problems in JavaErrorParser #1455

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e34dc8
Handle specific javac emitted output
Friendseeker Oct 12, 2024
8c4a539
Add extra opt()
Friendseeker Oct 12, 2024
980b91d
Add test case to JavaErrorParserSpec
Friendseeker Oct 12, 2024
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
9 changes: 8 additions & 1 deletion internal/zinc-compile-core/src/main/scala/sbt/internal/inc/javac/JavaErrorParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,17 @@ class JavaErrorParser(relativeDir: File = new File(new File(".").getAbsolutePath
()
}

val nonProblem: Parser[Unit] = {
val skipLine =
("Loading source file" | "Constructing Javadoc information") ~ """[^\r\n]*(\r\n|\n)?""".r
rep(skipLine) ^^ (_ => ())
}

val potentialProblem: Parser[Problem] =
warningMessage | errorMessage | noteMessage | javacError | javacWarning

val javacOutput: Parser[Seq[Problem]] = rep(potentialProblem) <~ opt(outputSumamry)
val javacOutput: Parser[Seq[Problem]] =
nonProblem ~> rep(potentialProblem) <~ opt(outputSumamry)
Friendseeker marked this conversation as resolved.
Show resolved Hide resolved

/**
* Example:
Expand Down