From 1f3fb553a2c355d57a16327f7e02e2b44e15adbd Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Wed, 31 Jul 2024 11:09:57 +0200 Subject: [PATCH] Format Scala files in codesig test cases (#3323) Newer versions of Mill better find these nested modules (https://github.com/com-lihaoyi/mill/pull/3270), so that our CI check for formatted Scala files will fail once we bump to Mill `0.11.10` or newer. Pull request: https://github.com/com-lihaoyi/mill/pull/3323 --- .../16-scala-static-method/src/Hello.scala | 6 +++--- .../basic/17-scala-lambda/src/Hello.scala | 6 +++--- .../src/Hello.scala | 8 ++++---- .../src/Hello.scala | 12 +++++------- .../10-iterator-foreach-scala/src/Hello.scala | 8 ++++---- .../src/Hello.scala | 8 ++++---- .../src/Hello.scala | 4 ++-- .../src/Hello.scala | 7 ++++--- .../src/Hello.scala | 9 ++++----- .../6-classes-misc-scala/src/Hello.scala | 7 +++---- .../7-manifest-scala/src/Hello.scala | 4 ++-- .../8-linked-list-scala/src/Hello.scala | 4 ++-- .../9-array-seq-scala/src/Hello.scala | 8 ++++---- .../3-par-merge-sort/src/Hello.scala | 2 +- .../realistic/4-actors/src/Hello.scala | 19 +++++++++---------- .../realistic/5-parser/src/Hello.scala | 4 ++-- .../unchanged/simple-scala-2/src/Hello.scala | 1 + .../unchanged/simple-scala/src/Hello.scala | 2 +- .../sourcecode-line-2/src/Hello.scala | 1 + main/codesig/test/src/CallGraphTests.scala | 2 +- 20 files changed, 60 insertions(+), 62 deletions(-) diff --git a/main/codesig/test/cases/callgraph/basic/16-scala-static-method/src/Hello.scala b/main/codesig/test/cases/callgraph/basic/16-scala-static-method/src/Hello.scala index 8735449e739..8bdc28976f3 100644 --- a/main/codesig/test/cases/callgraph/basic/16-scala-static-method/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/basic/16-scala-static-method/src/Hello.scala @@ -1,6 +1,6 @@ package hello -object Hello{ +object Hello { def main(): Int = used() def used(): Int = 2 def unused(): Int = 1 @@ -24,7 +24,7 @@ object Hello{ "hello.Hello$#used()int" ] } -*/ + */ /* expected-transitive-call-graph { @@ -45,4 +45,4 @@ object Hello{ "hello.Hello$#used()int" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/basic/17-scala-lambda/src/Hello.scala b/main/codesig/test/cases/callgraph/basic/17-scala-lambda/src/Hello.scala index b003635f9f5..45fdc0c8195 100644 --- a/main/codesig/test/cases/callgraph/basic/17-scala-lambda/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/basic/17-scala-lambda/src/Hello.scala @@ -1,6 +1,6 @@ package hello -object Hello{ +object Hello { def main(): Int = { val foo = () => used() @@ -23,7 +23,7 @@ object Hello{ "hello.Hello$#used()int" ] } -*/ + */ /* expected-transitive-call-graph { @@ -40,4 +40,4 @@ object Hello{ "hello.Hello$#used()int" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/basic/18-scala-anon-class-lambda/src/Hello.scala b/main/codesig/test/cases/callgraph/basic/18-scala-anon-class-lambda/src/Hello.scala index 20774bacbc1..ebaff122334 100644 --- a/main/codesig/test/cases/callgraph/basic/18-scala-anon-class-lambda/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/basic/18-scala-anon-class-lambda/src/Hello.scala @@ -1,9 +1,9 @@ package hello -object Hello{ +object Hello { def main(): Int = { - val foo = new Function0[Int]{def apply() = used() } + val foo = new Function0[Int] { def apply() = used() } foo() } def used(): Int = 2 @@ -69,7 +69,7 @@ object Hello{ "hello.Hello$#used()int" ] } -*/ + */ /* expected-transitive-call-graph { @@ -311,4 +311,4 @@ object Hello{ "hello.Hello$$anon$1#toString()java.lang.String" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/basic/19-scala-trait-constructor/src/Hello.scala b/main/codesig/test/cases/callgraph/basic/19-scala-trait-constructor/src/Hello.scala index 4e7b0c60ffd..d0865e5042a 100644 --- a/main/codesig/test/cases/callgraph/basic/19-scala-trait-constructor/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/basic/19-scala-trait-constructor/src/Hello.scala @@ -4,14 +4,12 @@ package hello -trait MyTrait{ +trait MyTrait { Hello.used() def used() = 1 } -object MyObject extends MyTrait{ - -} -object Hello{ +object MyObject extends MyTrait {} +object Hello { def main(): Int = MyObject.used() def used(): Int = 2 def unused(): Int = 1 @@ -50,7 +48,7 @@ object Hello{ "hello.MyTrait#used()int" ] } -*/ + */ /* expected-transitive-call-graph { @@ -95,4 +93,4 @@ object Hello{ "hello.MyTrait#used()int" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/complicated/10-iterator-foreach-scala/src/Hello.scala b/main/codesig/test/cases/callgraph/complicated/10-iterator-foreach-scala/src/Hello.scala index 2534d0ea089..6f1c17f51c3 100644 --- a/main/codesig/test/cases/callgraph/complicated/10-iterator-foreach-scala/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/complicated/10-iterator-foreach-scala/src/Hello.scala @@ -1,17 +1,17 @@ package hello -trait TestIter[+A]{ +trait TestIter[+A] { def hasNext: Boolean def next(): A def foreach[U](f: A => U) = { while (hasNext) f(next()) } } -class SubTestIter() extends TestIter[Nothing]{ +class SubTestIter() extends TestIter[Nothing] { def hasNext: Boolean = false def next(): Nothing = throw new NoSuchElementException("next on empty iterator") } -object Hello{ +object Hello { def minimizedIterator(): Array[Int] = { val iterator = new SubTestIter() val holder = Array(1) @@ -46,4 +46,4 @@ object Hello{ "hello.TestIter#foreach(scala.Function1)void" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/complicated/11-iterator-callback-class-scala/src/Hello.scala b/main/codesig/test/cases/callgraph/complicated/11-iterator-callback-class-scala/src/Hello.scala index 0e56fd4e3dd..2f79e694779 100644 --- a/main/codesig/test/cases/callgraph/complicated/11-iterator-callback-class-scala/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/complicated/11-iterator-callback-class-scala/src/Hello.scala @@ -1,15 +1,15 @@ package hello -object Hello{ +object Hello { class TestElements() extends TestIterator trait TestIterator { def run(f: TestCallback[Int, Int]): Int = f(123) } - abstract class TestCallback[T, void]{ + abstract class TestCallback[T, void] { def apply(x: T): void } - class TestCallbackImpl extends TestCallback[Int, Int]{ + class TestCallbackImpl extends TestCallback[Int, Int] { // Because `TestCallbackImpl` is a SAM implementation, // we treat `apply` as being called from `` def apply(x: Int): Int = x + 1 @@ -48,4 +48,4 @@ object Hello{ "hello.Hello$#staticSpecialInterfaceMethods()int" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/complicated/12-iterator-inherit-external-scala/src/Hello.scala b/main/codesig/test/cases/callgraph/complicated/12-iterator-inherit-external-scala/src/Hello.scala index aa247b5ac83..b394b2a0519 100644 --- a/main/codesig/test/cases/callgraph/complicated/12-iterator-inherit-external-scala/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/complicated/12-iterator-inherit-external-scala/src/Hello.scala @@ -2,7 +2,7 @@ package hello import scala.collection.AbstractIterator -object Hello{ +object Hello { class Elements[T](arr: Array[T]) extends AbstractIterator[T] { val end = arr.length @@ -77,4 +77,4 @@ object Hello{ "hello.Hello$#manualIterator2(int)int" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/complicated/13-iterator-inherit-external-filter-scala/src/Hello.scala b/main/codesig/test/cases/callgraph/complicated/13-iterator-inherit-external-filter-scala/src/Hello.scala index 5ee2559e899..7096870a717 100644 --- a/main/codesig/test/cases/callgraph/complicated/13-iterator-inherit-external-filter-scala/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/complicated/13-iterator-inherit-external-filter-scala/src/Hello.scala @@ -2,7 +2,7 @@ package hello import scala.collection.AbstractIterator -object Hello{ +object Hello { class SingletonBigTestIterator[T](a: T) extends BigTestIterator[T] { var ready = true def hasNext: Boolean = ready @@ -20,7 +20,8 @@ object Hello{ def filter(p: A => Boolean): BigTestIterator[A] = new FilterBigTestIterator[A](this, p) } - class FilterBigTestIterator[A](parent: BigTestIterator[A], pred: A => Boolean) extends BigTestIterator [A]{ + class FilterBigTestIterator[A](parent: BigTestIterator[A], pred: A => Boolean) + extends BigTestIterator[A] { private[this] var hd: A = _ private[this] var hdDefined: Boolean = false @@ -87,4 +88,4 @@ object Hello{ "hello.Hello$#manualIterator3(int)int" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/complicated/14-singleton-objects-scala/src/Hello.scala b/main/codesig/test/cases/callgraph/complicated/14-singleton-objects-scala/src/Hello.scala index c7bb405255f..a872d9349ba 100644 --- a/main/codesig/test/cases/callgraph/complicated/14-singleton-objects-scala/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/complicated/14-singleton-objects-scala/src/Hello.scala @@ -1,19 +1,18 @@ package hello -trait MyModule{ +trait MyModule { def x = "123" def y = "456" } -object Foo extends MyModule{ +object Foo extends MyModule { override def x = super.x + "abc" } -object Bar extends MyModule{ +object Bar extends MyModule { override def y = super.y + "abc" + Foo.x } - /* expected-direct-call-graph { "hello.Bar$#x()java.lang.String": [ @@ -53,4 +52,4 @@ object Bar extends MyModule{ "hello.MyModule#y()java.lang.String" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/complicated/6-classes-misc-scala/src/Hello.scala b/main/codesig/test/cases/callgraph/complicated/6-classes-misc-scala/src/Hello.scala index c3ce9cbb99d..39896097bae 100644 --- a/main/codesig/test/cases/callgraph/complicated/6-classes-misc-scala/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/complicated/6-classes-misc-scala/src/Hello.scala @@ -2,7 +2,6 @@ package hello // Taken from https://github.com/lihaoyi/Metascala/blob/76dfbfa18484b9ee39bd09453328ea1081fcab6b/src/test/java/metascala/features/classes/Inheritance.java - class Cow { def moo: String = { return "moooo" @@ -22,10 +21,10 @@ class Matrix(aa: Float, ab: Float, ba: Float, bb: Float) { } class DoubleMatrix(aa: Float, ab: Float, ba: Float, bb: Float) - extends Matrix(aa*2, ab*2, ba*2, bb*2) + extends Matrix(aa * 2, ab * 2, ba * 2, bb * 2) class DoubleDetMatrix(aa: Float, ab: Float, ba: Float, bb: Float) - extends Matrix(aa*2, ab*2, ba*2, bb*2){ + extends Matrix(aa * 2, ab * 2, ba * 2, bb * 2) { override def determinant: Float = { return super.determinant * 2 @@ -81,4 +80,4 @@ class LinkedList { "hello.LinkedList$Inner#value()int" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/complicated/7-manifest-scala/src/Hello.scala b/main/codesig/test/cases/callgraph/complicated/7-manifest-scala/src/Hello.scala index be1317216c4..9dc587d80e1 100644 --- a/main/codesig/test/cases/callgraph/complicated/7-manifest-scala/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/complicated/7-manifest-scala/src/Hello.scala @@ -2,7 +2,7 @@ package hello import scala.collection.AbstractIterator -object Hello{ +object Hello { object TestManifestFactory { val Nothing = new PhantomManifest() @@ -30,4 +30,4 @@ object Hello{ "hello.Hello$#testManifestFactory()java.lang.String" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/complicated/8-linked-list-scala/src/Hello.scala b/main/codesig/test/cases/callgraph/complicated/8-linked-list-scala/src/Hello.scala index ae1d216803d..061c4c14aeb 100644 --- a/main/codesig/test/cases/callgraph/complicated/8-linked-list-scala/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/complicated/8-linked-list-scala/src/Hello.scala @@ -2,7 +2,7 @@ package hello import scala.collection.AbstractIterator -object Hello{ +object Hello { sealed abstract class TestList[+A] { def isEmpty: Boolean @@ -76,4 +76,4 @@ object Hello{ "hello.Hello$#simpleLinkedListForeach()int[]" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/complicated/9-array-seq-scala/src/Hello.scala b/main/codesig/test/cases/callgraph/complicated/9-array-seq-scala/src/Hello.scala index 25abebddc21..ace325a3280 100644 --- a/main/codesig/test/cases/callgraph/complicated/9-array-seq-scala/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/complicated/9-array-seq-scala/src/Hello.scala @@ -2,11 +2,11 @@ package hello import scala.collection.AbstractIterator -object Hello{ - class TestArraySeq[T](inner: Array[T]){ +object Hello { + class TestArraySeq[T](inner: Array[T]) { def foreach[void](f: T => void) = { var i = 0 - while (i < inner.length){ + while (i < inner.length) { f(inner(i)) i += 1 } @@ -33,4 +33,4 @@ object Hello{ "hello.Hello$#simpleArraySeqForeach()int[]" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/realistic/3-par-merge-sort/src/Hello.scala b/main/codesig/test/cases/callgraph/realistic/3-par-merge-sort/src/Hello.scala index ff9bfa16ffc..3c0b4bbb0b2 100644 --- a/main/codesig/test/cases/callgraph/realistic/3-par-merge-sort/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/realistic/3-par-merge-sort/src/Hello.scala @@ -90,4 +90,4 @@ object Main { "hello.Main$#mergeSortSequential(scala.collection.immutable.IndexedSeq,scala.math.Ordering)scala.collection.immutable.IndexedSeq" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/realistic/4-actors/src/Hello.scala b/main/codesig/test/cases/callgraph/realistic/4-actors/src/Hello.scala index 26df51160f4..7151915f929 100644 --- a/main/codesig/test/cases/callgraph/realistic/4-actors/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/realistic/4-actors/src/Hello.scala @@ -2,8 +2,8 @@ package hello // Taken from https://github.com/handsonscala/handsonscala/blob/ebc0367144513fc181281a024f8071a6153be424/examples/16.8%20-%20LoggingRearrangedPipeline2/LoggingPipeline.sc import scalatags.Text.all._ import scala.concurrent._, duration.Duration.Inf -class DiskActor(logPath: os.Path, rotateSize: Int = 50) - (implicit cc: castor.Context) extends castor.SimpleActor[String]{ +class DiskActor(logPath: os.Path, rotateSize: Int = 50)(implicit cc: castor.Context) + extends castor.SimpleActor[String] { val oldPath = logPath / os.up / (logPath.last + "-old") def run(s: String) = { val newLogSize = logSize + s.length + 1 @@ -17,28 +17,27 @@ class DiskActor(logPath: os.Path, rotateSize: Int = 50) private var logSize = 0 } -class Base64Actor(dest: castor.Actor[String]) - (implicit cc: castor.Context) extends castor.SimpleActor[String]{ +class Base64Actor(dest: castor.Actor[String])(implicit cc: castor.Context) + extends castor.SimpleActor[String] { def run(msg: String) = { dest.send(java.util.Base64.getEncoder.encodeToString(msg.getBytes)) } } -class UploadActor(url: String) - (implicit cc: castor.Context) extends castor.SimpleActor[String]{ +class UploadActor(url: String)(implicit cc: castor.Context) extends castor.SimpleActor[String] { def run(msg: String) = { val res = requests.post(url, data = msg) println(s"response ${res.statusCode} " + ujson.read(res)("data")) } } -class SanitizeActor(dest: castor.Actor[String]) - (implicit cc: castor.Context) extends castor.SimpleActor[String]{ +class SanitizeActor(dest: castor.Actor[String])(implicit cc: castor.Context) + extends castor.SimpleActor[String] { def run(msg: String) = { dest.send(msg.replaceAll("([0-9]{4})[0-9]{8}([0-9]{4})", "")) } } -object Hello{ +object Hello { def main() = { implicit val cc = new castor.Context.Test() @@ -100,4 +99,4 @@ object Hello{ "hello.UploadActor#run(java.lang.String)void" ] } -*/ + */ diff --git a/main/codesig/test/cases/callgraph/realistic/5-parser/src/Hello.scala b/main/codesig/test/cases/callgraph/realistic/5-parser/src/Hello.scala index b31c862d9f8..1fb9a5a8a10 100644 --- a/main/codesig/test/cases/callgraph/realistic/5-parser/src/Hello.scala +++ b/main/codesig/test/cases/callgraph/realistic/5-parser/src/Hello.scala @@ -5,7 +5,7 @@ sealed trait Phrase class Word(s: String) extends Phrase class Pair(lhs: Phrase, rhs: Phrase) extends Phrase -object Parser{ +object Parser { def prefix[_: P] = P("hello" | "goodbye").!.map(new Word(_)) def suffix[_: P] = P("world" | "seattle").!.map(new Word(_)) @@ -58,4 +58,4 @@ object Parser{ "hello.Parser$#ws(fastparse.ParsingRun)fastparse.ParsingRun" ] } -*/ + */ diff --git a/main/codesig/test/cases/methodhash/unchanged/simple-scala-2/src/Hello.scala b/main/codesig/test/cases/methodhash/unchanged/simple-scala-2/src/Hello.scala index f6fb08033b9..94efcfb7631 100644 --- a/main/codesig/test/cases/methodhash/unchanged/simple-scala-2/src/Hello.scala +++ b/main/codesig/test/cases/methodhash/unchanged/simple-scala-2/src/Hello.scala @@ -4,6 +4,7 @@ package hello * Very verbose Scaladoc comment on top of class */ object Hello { + /** * less verbose Scaladoc comment for single method */ diff --git a/main/codesig/test/cases/methodhash/unchanged/simple-scala/src/Hello.scala b/main/codesig/test/cases/methodhash/unchanged/simple-scala/src/Hello.scala index ad1f86739bc..ac37133342e 100644 --- a/main/codesig/test/cases/methodhash/unchanged/simple-scala/src/Hello.scala +++ b/main/codesig/test/cases/methodhash/unchanged/simple-scala/src/Hello.scala @@ -1,7 +1,7 @@ package hello object Hello { - def main: Int = {println(1); println(2); println(3); println(4); used} + def main: Int = { println(1); println(2); println(3); println(4); used } def used = 2 def unused = 1 } diff --git a/main/codesig/test/cases/methodhash/unchanged/sourcecode-line-2/src/Hello.scala b/main/codesig/test/cases/methodhash/unchanged/sourcecode-line-2/src/Hello.scala index 173512a014b..2725587f02f 100644 --- a/main/codesig/test/cases/methodhash/unchanged/sourcecode-line-2/src/Hello.scala +++ b/main/codesig/test/cases/methodhash/unchanged/sourcecode-line-2/src/Hello.scala @@ -4,6 +4,7 @@ package hello * Very verbose Scaladoc comment on top of class */ object Hello { + /** * less verbose Scaladoc comment for single method */ diff --git a/main/codesig/test/src/CallGraphTests.scala b/main/codesig/test/src/CallGraphTests.scala index 5fba6c81bda..544e343c601 100644 --- a/main/codesig/test/src/CallGraphTests.scala +++ b/main/codesig/test/src/CallGraphTests.scala @@ -180,7 +180,7 @@ object CallGraphTests extends TestSuite { val expectedLines = sourceLines .dropWhile(_ != openTagLine) .drop(1) - .takeWhile(_ != "*/") + .takeWhile(l => l != "*/" && l != " */") Some(expectedLines.mkString("\n")) case _ => sys.error(s"Only one occurence of line \"$openTagLine\" is expected in file")