This is an automated email from the ASF dual-hosted git repository.
davin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-vscode.git
The following commit(s) were added to refs/heads/main by this push:
new 51a386c Update scalafmt-core to 3.10.1
51a386c is described below
commit 51a386cda83ed73131a386a4e2ef818a4d76b1a8
Author: Scala Steward <[email protected]>
AuthorDate: Fri Oct 31 14:11:26 2025 +0000
Update scalafmt-core to 3.10.1
- Reformat with scalafmt 3.10.1
- Executed command: scalafmt --non-interactive
---
.scalafmt.conf | 2 +-
.../org.apache.daffodil.debugger.dap/DAPodil.scala | 12 ++++----
.../org.apache.daffodil.debugger.dap/Parse.scala | 16 +++++-----
.../org.apache.daffodil.debugger.dap/logging.scala | 4 +--
.../org.apache.daffodil.debugger/ParseSuite.scala | 35 +++++++++++++++++-----
5 files changed, 45 insertions(+), 24 deletions(-)
diff --git a/.scalafmt.conf b/.scalafmt.conf
index fd5cf66..fbcb1c1 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-version = "3.8.6"
+version = "3.10.1"
maxColumn = 120
rewrite.rules = [SortImports, RedundantBraces]
runner.dialect = scala212
diff --git
a/debugger/src/main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala
b/debugger/src/main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala
index da4a572..4d7e617 100644
--- a/debugger/src/main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala
+++ b/debugger/src/main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala
@@ -167,7 +167,7 @@ class DAPodil(
def handle(request: Request): IO[Unit] =
// TODO: java-debug doesn't seem to support the Restart request
request match {
- case extract(Command.INITIALIZE, _) => initialize(request)
+ case extract(Command.INITIALIZE, _) => initialize(request)
case extract(Command.CONFIGURATIONDONE, _) =>
session.sendResponse(request.respondSuccess())
case extract(Command.LAUNCH, _) =>
@@ -180,15 +180,15 @@ class DAPodil(
source(request, args)
case extract(Command.SETBREAKPOINTS, args: SetBreakpointArguments) =>
setBreakpoints(request, args)
- case extract(Command.THREADS, _) => threads(request)
- case extract(Command.STACKTRACE, _) => stackTrace(request)
+ case extract(Command.THREADS, _) => threads(request)
+ case extract(Command.STACKTRACE, _) =>
stackTrace(request)
case extract(Command.SCOPES, args: ScopesArguments) =>
scopes(request, args)
case extract(Command.VARIABLES, args: VariablesArguments) =>
variables(request, args)
- case extract(Command.NEXT, _) => next(request)
- case extract(Command.CONTINUE, _) => continue(request)
- case extract(Command.PAUSE, _) => pause(request)
+ case extract(Command.NEXT, _) =>
next(request)
+ case extract(Command.CONTINUE, _) =>
continue(request)
+ case extract(Command.PAUSE, _) =>
pause(request)
case extract(Command.DISCONNECT, args: DisconnectArguments) =>
disconnect(request, args)
case extract(Command.EVALUATE, args: EvaluateArguments) =>
diff --git
a/debugger/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
b/debugger/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
index 442a79b..893a960 100644
--- a/debugger/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
+++ b/debugger/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
@@ -494,10 +494,10 @@ object Parse {
// is set to True, and the type field is set to a value other
than file
def parseInfosetOutput(arguments: JsonObject, requireFile: Boolean =
false) =
Option(arguments.getAsJsonObject("infosetOutput")) match {
- case None => Right(LaunchArgs.InfosetOutput.Console).toEitherNel
+ case None =>
Right(LaunchArgs.InfosetOutput.Console).toEitherNel
case Some(infosetOutput) =>
Option(infosetOutput.getAsJsonPrimitive("type")) match {
- case None => Right(LaunchArgs.InfosetOutput.Console).toEitherNel
+ case None =>
Right(LaunchArgs.InfosetOutput.Console).toEitherNel
case Some(typ) =>
typ.getAsString() match {
case "none" =>
@@ -800,7 +800,7 @@ object Parse {
def deliver(events: Stream[IO, Event]): Stream[IO, Nothing] =
events
.evalScan(Delivery.State.empty) {
- case (state, Parse.Event.Init(_)) => IO.pure(state.copy(data =
DAPodil.Data.empty))
+ case (state, Parse.Event.Init(_)) => IO.pure(state.copy(data =
DAPodil.Data.empty))
case (state, e: Event.StartElement) =>
for {
frame <- createFrame(e)
@@ -1169,8 +1169,8 @@ object Parse {
def apply(that: Debugee.LaunchArgs.InfosetOutput): InfosetOutput =
that match {
- case Debugee.LaunchArgs.InfosetOutput.None => None
- case Debugee.LaunchArgs.InfosetOutput.Console => Console
+ case Debugee.LaunchArgs.InfosetOutput.None => None
+ case Debugee.LaunchArgs.InfosetOutput.Console => Console
case Debugee.LaunchArgs.InfosetOutput.File(path) =>
File(path.toString)
}
@@ -1289,7 +1289,7 @@ object Parse {
case AwaitingFirstAwait(waiterArrived) =>
Stopped(nextContinue, nextAwaitStarted) -> waiterArrived
.complete(()) *> nextContinue.get.as(true)
- case Running => Running -> IO.pure(false)
+ case Running => Running ->
IO.pure(false)
case s @ Stopped(whenContinued, nextAwaitStarted) =>
s -> nextAwaitStarted.complete(()) *> // signal next await
happened
whenContinued.get.as(true) // block
@@ -1307,7 +1307,7 @@ object Parse {
case "stepIn" => stepIn()
case "stepOut" => stepOut()
})
- case Running => Running -> IO.unit
+ case Running => Running -> IO.unit
case Stopped(whenContinued, _) =>
Stopped(nextContinue, nextAwaitStarted) -> (
whenContinued.complete(()) *> // wake up await-ers
@@ -1324,7 +1324,7 @@ object Parse {
state.modify {
case s @ AwaitingFirstAwait(waiterArrived) =>
s -> waiterArrived.get *> continue()
- case Running => Running -> IO.unit
+ case Running => Running -> IO.unit
case Stopped(whenContinued, _) =>
Running -> whenContinued.complete(()).void // wake up await-ers
}.flatten
diff --git
a/debugger/src/main/scala/org.apache.daffodil.debugger.dap/logging.scala
b/debugger/src/main/scala/org.apache.daffodil.debugger.dap/logging.scala
index 06061bf..6b6bf7a 100644
--- a/debugger/src/main/scala/org.apache.daffodil.debugger.dap/logging.scala
+++ b/debugger/src/main/scala/org.apache.daffodil.debugger.dap/logging.scala
@@ -38,8 +38,8 @@ object logging {
}
implicit val eventShow: Show[DebugEvent] = {
- case event: Events.StoppedEvent => s"${event.`type`} ${event.reason}
${event.description}"
- case event: Events.ThreadEvent => s"${event.`type`} ${event.reason}"
+ case event: Events.StoppedEvent => s"${event.`type`} ${event.reason}
${event.description}"
+ case event: Events.ThreadEvent => s"${event.`type`} ${event.reason}"
case event: DAPodil.LoadedSourceEvent =>
s"${event.`type`} ${event.reason} ${JsonUtils.toJson(event.source)}"
case event: Parse.DataEvent =>
diff --git
a/debugger/src/test/scala/org.apache.daffodil.debugger/ParseSuite.scala
b/debugger/src/test/scala/org.apache.daffodil.debugger/ParseSuite.scala
index 843f3d4..7102e7c 100644
--- a/debugger/src/test/scala/org.apache.daffodil.debugger/ParseSuite.scala
+++ b/debugger/src/test/scala/org.apache.daffodil.debugger/ParseSuite.scala
@@ -66,7 +66,10 @@ class ParseSuite extends FunSuite {
schema.remove("path")
val parseResult = Parse.Debugee.LaunchArgs.parse(testJsonObject)
assertEquals(parseResult.isLeft, true)
- assertEquals(parseResult.swap.toOption.map(_.head).getOrElse("no error"),
"missing 'schema.path' field from launch request")
+ assertEquals(
+ parseResult.swap.toOption.map(_.head).getOrElse("no error"),
+ "missing 'schema.path' field from launch request"
+ )
}
test("Parse failed - No data") {
@@ -74,7 +77,10 @@ class ParseSuite extends FunSuite {
testJsonObject.remove("data")
val parseResult = Parse.Debugee.LaunchArgs.parse(testJsonObject)
assertEquals(parseResult.isLeft, true)
- assertEquals(parseResult.swap.toOption.map(_.head).getOrElse("no error"),
"missing 'data' field from launch request")
+ assertEquals(
+ parseResult.swap.toOption.map(_.head).getOrElse("no error"),
+ "missing 'data' field from launch request"
+ )
}
// This test succeeds because stopOnEntry defaults if it is empty
@@ -98,7 +104,10 @@ class ParseSuite extends FunSuite {
buildJson()
val parseResult = Parse.Debugee.LaunchArgs.parse(testJsonObject)
assertEquals(parseResult.isLeft, true)
- assertEquals(parseResult.swap.toOption.map(_.head).getOrElse("no error"),
"can't write to infoset output file at " + infosetOutputPath)
+ assertEquals(
+ parseResult.swap.toOption.map(_.head).getOrElse("no error"),
+ "can't write to infoset output file at " + infosetOutputPath
+ )
infosetOutputType = "none"
infosetOutputPath = "testPath/infoset.xml"
}
@@ -109,7 +118,10 @@ class ParseSuite extends FunSuite {
testTDMLObject.remove("name")
val parseResult = Parse.Debugee.parseTDMLName(testTDMLObject)
assertEquals(parseResult.isLeft, true)
- assertEquals(parseResult.swap.toOption.map(_.head).getOrElse("no error"),
"missing 'tdmlConfig.name' field from launch request")
+ assertEquals(
+ parseResult.swap.toOption.map(_.head).getOrElse("no error"),
+ "missing 'tdmlConfig.name' field from launch request"
+ )
}
test("Parse failed - invalid tdmlConfig - no path") {
@@ -118,7 +130,10 @@ class ParseSuite extends FunSuite {
testTDMLObject.remove("path")
val parseResult = Parse.Debugee.parseTDMLPath(testTDMLObject)
assertEquals(parseResult.isLeft, true)
- assertEquals(parseResult.swap.toOption.map(_.head).getOrElse("no error"),
"missing 'tdmlConfig.path' field from launch request")
+ assertEquals(
+ parseResult.swap.toOption.map(_.head).getOrElse("no error"),
+ "missing 'tdmlConfig.path' field from launch request"
+ )
}
test("Parse failed - invalid tdmlConfig - invalid action") {
@@ -137,7 +152,10 @@ class ParseSuite extends FunSuite {
buildJson()
val parseResult = Parse.Debugee.LaunchArgs.parse(testJsonObject)
assertEquals(parseResult.isLeft, true)
- assertEquals(parseResult.swap.toOption.map(_.head).getOrElse("no error"),
s"schema file at $schemaPath doesn't exist")
+ assertEquals(
+ parseResult.swap.toOption.map(_.head).getOrElse("no error"),
+ s"schema file at $schemaPath doesn't exist"
+ )
}
test("Parse failed - infosetOutputType not file") {
@@ -145,7 +163,10 @@ class ParseSuite extends FunSuite {
buildJson()
val parseResult = Parse.Debugee.LaunchArgs.parse(testJsonObject)
assertEquals(parseResult.isLeft, true)
- assertEquals(parseResult.swap.toOption.map(_.head).getOrElse("no error"),
"'type' field in 'infosetOutput' must be set to 'file'")
+ assertEquals(
+ parseResult.swap.toOption.map(_.head).getOrElse("no error"),
+ "'type' field in 'infosetOutput' must be set to 'file'"
+ )
}
def buildJson(): Unit = {
