This is an automated email from the ASF dual-hosted git repository.
jinterrante pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git
The following commit(s) were added to refs/heads/main by this push:
new 322c91133 Update scalafmt-core to 3.8.0
322c91133 is described below
commit 322c911331042b6e146c76ac2d112aa216ed1a61
Author: Scala Steward <[email protected]>
AuthorDate: Wed Feb 21 15:30:56 2024 +0000
Update scalafmt-core to 3.8.0
Also reformat daffodil-test-integration files. The integration test
subproject is not aggregated, so scalafmtAll does not reformat it.
Instead, we need to manually run daffodil-test-integration/scalafmtAll.
Fortunately these files are rarely changed so we shouldn't have to
remember to run this very often. And in the off chance changes are
needed, this modifies the scalafmt CI check to manually check the
daffodil-test-integration subproject.
---
.github/workflows/main.yml | 2 +-
.scalafmt.conf | 2 +-
.../apache/daffodil/cliTest/TestCLIDebugger.scala | 105 +++++++++++----------
3 files changed, 55 insertions(+), 54 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 74e16b851..18c8829a5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -253,7 +253,7 @@ jobs:
- name: Run scalafmt Check
if: success() || failure()
- run: $SBT scalafmtCheckAll scalafmtSbtCheck
+ run: $SBT scalafmtCheckAll scalafmtSbtCheck
daffodil-test-integration/scalafmtCheckAll
# Ensure pull requests only have a single commit
diff --git a/.scalafmt.conf b/.scalafmt.conf
index d0200904a..c7f640272 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -32,4 +32,4 @@ rewrite.rules = [
rewrite.trailingCommas.style = always
runner.dialect = scala212
spaces.inImportCurlyBraces = true
-version = 3.7.17
+version = 3.8.0
diff --git
a/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIDebugger.scala
b/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIDebugger.scala
index aec4fa7ba..f128dd307 100644
---
a/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIDebugger.scala
+++
b/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIDebugger.scala
@@ -1174,34 +1174,35 @@ class TestCLIDebugger {
"daffodil-cli/src/test/resources/org/apache/daffodil/cli/input/input1.txt.xml",
)
- runCLI(args"-d unparse -s $schema -r matrix -o $devNull $input", fork =
true, envs = envs) { cli =>
- cli.expect("(debug)")
- cli.sendLine("display info diff")
- cli.expect("(debug)")
- cli.sendLine("set diffExcludes childIndex")
- cli.expect("(debug)")
- cli.sendLine("step")
- cli.expect("bitPosition: 0 -> 8")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.expect(regexp("\\+ Suppressable.* for cell"))
- cli.sendLine("step")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.expect(regexp("RegionSplit.* for cell"))
- cli.sendLine("info suspensions")
- cli.expect(regexp("Suppressable.* for cell"))
- cli.expect(regexp("RegionSplit.* for cell"))
- cli.sendLine("quit")
+ runCLI(args"-d unparse -s $schema -r matrix -o $devNull $input", fork =
true, envs = envs) {
+ cli =>
+ cli.expect("(debug)")
+ cli.sendLine("display info diff")
+ cli.expect("(debug)")
+ cli.sendLine("set diffExcludes childIndex")
+ cli.expect("(debug)")
+ cli.sendLine("step")
+ cli.expect("bitPosition: 0 -> 8")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.expect(regexp("\\+ Suppressable.* for cell"))
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.expect(regexp("RegionSplit.* for cell"))
+ cli.sendLine("info suspensions")
+ cli.expect(regexp("Suppressable.* for cell"))
+ cli.expect(regexp("RegionSplit.* for cell"))
+ cli.sendLine("quit")
}(ExitCode.Failure)
}
@@ -1213,30 +1214,31 @@ class TestCLIDebugger {
"daffodil-cli/src/test/resources/org/apache/daffodil/cli/input/input9.txt.xml",
)
- runCLI(args"-d unparse -r list -s $schema -o $devNull $input", fork =
true, envs = envs) { cli =>
- cli.expect("(debug)")
- cli.sendLine("set diffExcludes doesNotExist1 bitLimit doesNotExist2")
- cli.expect("unknown or undiffable info commands: doesNotExist1,
doesNotExist2")
+ runCLI(args"-d unparse -r list -s $schema -o $devNull $input", fork =
true, envs = envs) {
+ cli =>
+ cli.expect("(debug)")
+ cli.sendLine("set diffExcludes doesNotExist1 bitLimit doesNotExist2")
+ cli.expect("unknown or undiffable info commands: doesNotExist1,
doesNotExist2")
- cli.sendLine("display info diff")
- cli.sendLine("break Item")
- cli.sendLine("continue")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.expect(regexp("\\+ SuppressableSeparator.* ex:Item"))
- cli.sendLine("continue")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.sendLine("step")
- cli.expect(regexp("\\+ RegionSplit.* ex:Item"))
- cli.sendLine("step")
- cli.sendLine("step")
- cli.expect(regexp("\\- RegionSplit.* ex:Item"))
- cli.sendLine("info suspensions")
- cli.expect(regexp("SuppressableSeparator.* ex:Item"))
- cli.sendLine("step")
- cli.sendLine("step")
+ cli.sendLine("display info diff")
+ cli.sendLine("break Item")
+ cli.sendLine("continue")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.expect(regexp("\\+ SuppressableSeparator.* ex:Item"))
+ cli.sendLine("continue")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.expect(regexp("\\+ RegionSplit.* ex:Item"))
+ cli.sendLine("step")
+ cli.sendLine("step")
+ cli.expect(regexp("\\- RegionSplit.* ex:Item"))
+ cli.sendLine("info suspensions")
+ cli.expect(regexp("SuppressableSeparator.* ex:Item"))
+ cli.sendLine("step")
+ cli.sendLine("step")
}(ExitCode.Success)
}
@@ -1297,5 +1299,4 @@ class TestCLIDebugger {
}(ExitCode.Success)
}
-
}
