Skip to content

Commit cb68046

Browse files
bjaglinbjaglin
committed
prepare for different per-minor expect file
1 parent 221835b commit cb68046

File tree

5 files changed

+273
-2
lines changed

5 files changed

+273
-2
lines changed

‎scalafix-tests/integration/src/main/resources-2/expect/Pretty.expect‎ renamed to ‎scalafix-tests/integration/src/main/resources-2.13/expect/Pretty.expect‎

File renamed without changes.

‎scalafix-tests/integration/src/main/resources-3/expect/Pretty.expect‎ renamed to ‎scalafix-tests/integration/src/main/resources-3.3/expect/Pretty.expect‎

File renamed without changes.

‎scalafix-tests/integration/src/main/resources-3.6/expect/Pretty.expect‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
[7:7..7:17]: test/PrettyTest# => class PrettyTest extends Object { self: PrettyTest => +6 decls }
2+
[8:3..8:14]: *[Int]
3+
[8:3..8:7]: *.apply[Int]
4+
[8:3..8:3]: test/PrettyTest#`<init>`(). => primary ctor <init>(): PrettyTest
5+
[10:10..10:11]: intWrapper(*)
6+
[11:10..11:11]: intWrapper(*)
7+
[15:10..15:16]: *.apply[Inclusive]
8+
[15:10..15:26]: *(global)
9+
[15:17..15:18]: intWrapper(*)
10+
[16:10..16:16]: *.apply[Inclusive]
11+
[16:10..16:32]: *(global)
12+
[16:17..16:18]: intWrapper(*)
13+
[21:3..21:3]: test/PrettyTest#Inner#`<init>`(). => primary ctor <init>(): Inner
14+
[21:9..21:14]: test/PrettyTest#Inner# => class Inner extends Object { self: Inner => +1 decls }
15+
[22:7..22:8]: test/PrettyTest#a. => val method aPrettyTest
16+
[23:7..23:8]: test/PrettyTest#b. => val method ba.Inner
17+
[25:3..25:9]: *.apply[Object {
18+
local4 => abstract method foo(a: Int): Int
19+
local5 => abstract method bar(a: Int): Int
20+
}]
21+
[30:3..30:9]: *.apply[Int & String]
22+
[38:7..38:10]: test/ann# => class ann[T] extends Annotation with StaticAnnotation { self: ann[T] => +3 decls }
23+
[38:10..38:10]: test/ann#`<init>`(). => primary ctor <init>[T](x: T): ann[T]
24+
[38:11..38:12]: test/ann#[T] => typeparam T
25+
[38:14..38:15]: test/ann#x. => private[this] val method xT
26+
[39:7..39:11]: test/ann1# => class ann1 extends Annotation with StaticAnnotation { self: ann1 => +1 decls }
27+
[39:20..39:20]: test/ann1#`<init>`(). => primary ctor <init>(): ann1
28+
[40:7..40:11]: test/ann2# => class ann2 extends Annotation with StaticAnnotation { self: ann2 => +1 decls }
29+
[40:20..40:20]: test/ann2#`<init>`(). => primary ctor <init>(): ann2
30+
[42:1..42:1]: test/B#`<init>`(). => primary ctor <init>(): B
31+
[42:7..42:8]: test/B# => class B extends Object { self: B => +1 decls }
32+
[44:1..44:1]: test/C#`<init>`(). => primary ctor <init>(): C
33+
[44:7..44:8]: test/C# => class C extends Object { self: C => +1 decls }
34+
[46:7..46:8]: test/P# => class P extends Object { self: P => +8 decls }
35+
[47:3..47:3]: test/P#C#`<init>`(). => primary ctor <init>(): C
36+
[47:3..47:3]: test/P#`<init>`(). => primary ctor <init>(): P
37+
[47:9..47:10]: test/P#C# => class C extends Object { self: C => +1 decls }
38+
[48:3..48:3]: test/P#X#`<init>`(). => primary ctor <init>(): X
39+
[48:9..48:10]: test/P#X# => class X extends Object { self: X => +1 decls }
40+
[49:7..49:8]: test/P#x. => val method xX
41+
[52:7..52:8]: test/T# => class T extends Object { self: T => +8 decls }
42+
[53:3..53:3]: test/T#C#`<init>`(). => primary ctor <init>(): C
43+
[53:3..53:3]: test/T#`<init>`(). => primary ctor <init>(): T
44+
[53:9..53:10]: test/T#C# => class C extends Object { self: C => +1 decls }
45+
[54:3..54:3]: test/T#X#`<init>`(). => primary ctor <init>(): X
46+
[54:9..54:10]: test/T#X# => class X extends Object { self: X => +1 decls }
47+
[55:7..55:8]: test/T#x. => val method xX
48+
[58:8..58:12]: test/Test. => final object Test extends Object { self: Test.type => +12 decls }
49+
[59:9..59:10]: test/Test.M# => class M extends Object { self: M => +2 decls }
50+
[60:5..60:5]: test/Test.M#`<init>`(). => primary ctor <init>(): M
51+
[60:9..60:10]: test/Test.M#m(). => method m=> Int
52+
[63:9..63:10]: test/Test.N# => trait N extends Object { self: N => +2 decls }
53+
[64:5..64:5]: test/Test.N#`<init>`(). => primary ctor <init>(): N
54+
[64:9..64:10]: test/Test.N#n(). => method n=> Int
55+
[67:9..67:10]: test/Test.C# => class C extends M { self: C => +42 decls }
56+
[67:19..67:19]: test/Test.C#`<init>`(). => primary ctor <init>(): C
57+
[68:9..68:10]: test/Test.C#p. => val method pP
58+
[69:9..69:10]: test/Test.C#x. => val method xp.X
59+
[71:9..71:17]: test/Test.C#typeRef1. => val method typeRef1C
60+
[72:9..72:17]: test/Test.C#typeRef2. => val method typeRef2p.C
61+
[73:9..73:17]: test/Test.C#typeRef3. => val method typeRef3T#C
62+
[74:9..74:17]: test/Test.C#typeRef4. => val method typeRef4List[Int]
63+
[76:9..76:20]: test/Test.C#singleType1. => val method singleType1x.type
64+
[77:9..77:20]: test/Test.C#singleType2. => val method singleType2p.x.type
65+
[78:9..78:15]: test/Test.C#Either. => val method EitherEither.type
66+
[80:9..80:18]: test/Test.C#thisType1. => val method thisType1C.this.type
67+
[81:9..81:18]: test/Test.C#thisType2. => val method thisType2C.this.type
68+
[83:9..83:19]: test/Test.C#superType1. => val method superType1Int
69+
[84:9..84:19]: test/Test.C#superType2. => val method superType2Int
70+
[85:9..85:19]: test/Test.C#superType3. => val method superType3Int
71+
[87:9..87:22]: test/Test.C#compoundType1. => val method compoundType1Object { def k=> Int }
72+
[88:9..88:22]: test/Test.C#compoundType2. => val method compoundType2M & N
73+
[89:9..89:22]: test/Test.C#compoundType3. => val method compoundType3M & N { def k=> Int }
74+
[90:9..90:22]: test/Test.C#compoundType4. => val method compoundType4Object
75+
[91:9..91:22]: test/Test.C#compoundType5. => val method compoundType5M & N
76+
[92:9..92:22]: test/Test.C#compoundType6. => val method compoundType6M & N
77+
[94:9..94:17]: test/Test.C#annType1. => val method annType1T @ann[T]
78+
[94:21..94:25]: [Int]
79+
[95:9..95:17]: test/Test.C#annType2. => val method annType2T @ann1 @ann2
80+
[97:9..97:25]: test/Test.C#existentialType2. => val method existentialType2List[_] forSome { type _ }
81+
[98:9..98:25]: test/Test.C#existentialType3. => val method existentialType3Class[_] forSome { type _ }
82+
[99:9..99:25]: test/Test.C#existentialType4. => val method existentialType4Class[_] forSome { type _ }
83+
[101:9..101:20]: test/Test.C#typeLambda1(). => method typeLambda1[M[type _]]: Nothing
84+
[101:21..101:22]: test/Test.C#typeLambda1().[M] => typeparam M[type _]
85+
[104:12..104:26]: test/Test.C#ClassInfoType1. => final object ClassInfoType1 extends Object { self: ClassInfoType1.type => +1 decls }
86+
[105:11..105:25]: test/Test.C#ClassInfoType2# => class ClassInfoType2 extends B { self: ClassInfoType2 => +2 decls }
87+
[105:34..105:34]: test/Test.C#ClassInfoType2#`<init>`(). => primary ctor <init>(): ClassInfoType2
88+
[105:42..105:43]: test/Test.C#ClassInfoType2#x(). => method x=> Int
89+
[106:11..106:25]: test/Test.C#ClassInfoType3# => trait ClassInfoType3[T] extends Object { self: ClassInfoType3[T] => +2 decls }
90+
[106:25..106:25]: test/Test.C#ClassInfoType3#`<init>`(). => primary ctor <init>[T](): ClassInfoType3[T]
91+
[106:26..106:27]: test/Test.C#ClassInfoType3#[T] => typeparam T
92+
[108:12..108:22]: test/Test.C#MethodType. => final object MethodType extends Object { self: MethodType.type => +7 decls }
93+
[109:11..109:13]: test/Test.C#MethodType.x1(). => method x1=> Int
94+
[110:11..110:13]: test/Test.C#MethodType.x2(). => method x2=> Int
95+
[111:11..111:13]: test/Test.C#MethodType.m3(). => method m3=> Int
96+
[112:11..112:13]: test/Test.C#MethodType.m4(). => method m4(): Int
97+
[113:11..113:13]: test/Test.C#MethodType.m5(). => method m5(x: Int): Int
98+
[113:14..113:15]: test/Test.C#MethodType.m5().(x) => param x: Int
99+
[114:11..114:13]: test/Test.C#MethodType.m6(). => method m6[T](x: T): T
100+
[114:14..114:15]: test/Test.C#MethodType.m6().[T] => typeparam T
101+
[114:17..114:18]: test/Test.C#MethodType.m6().(x) => param x: T
102+
[117:12..117:22]: test/Test.C#ByNameType. => final object ByNameType extends Object { self: ByNameType.type => +2 decls }
103+
[118:11..118:13]: test/Test.C#ByNameType.m1(). => method m1(x: => Int): Int
104+
[118:14..118:15]: test/Test.C#ByNameType.m1().(x) => param x: => Int
105+
[121:16..121:28]: test/Test.C#RepeatedType# => case class RepeatedType extends Object with Product with Serializable { self: RepeatedType => +4 decls }
106+
[121:28..121:28]: test/Test.C#RepeatedType#`<init>`(). => primary ctor <init>(val s: String*): RepeatedType
107+
[121:29..121:30]: test/Test.C#RepeatedType#s. => val method sString*
108+
[122:11..122:13]: test/Test.C#RepeatedType#m1(). => method m1(x: Int*): Int
109+
[122:14..122:15]: test/Test.C#RepeatedType#m1().(x) => param x: Int*
110+
[125:12..125:20]: test/Test.C#TypeType. => final object TypeType extends Object { self: TypeType.type => +6 decls }
111+
[126:12..126:14]: test/Test.C#TypeType.T1# => type T1
112+
[127:11..127:13]: test/Test.C#TypeType.m2(). => method m2[T2 = C]: Nothing
113+
[127:14..127:16]: test/Test.C#TypeType.m2().[T2] => typeparam T2 = C
114+
[128:11..128:13]: test/Test.C#TypeType.m3(). => method m3[M3[type _]]: Nothing
115+
[128:14..128:16]: test/Test.C#TypeType.m3().[M3] => typeparam M3[type _]
116+
[129:12..129:14]: test/Test.C#TypeType.T4# => type T4 = C
117+
[130:12..130:14]: test/Test.C#TypeType.T5# => type T5[U] = U
118+
[130:15..130:16]: test/Test.C#TypeType.T5#[U] => typeparam U
119+
[134:10..134:17]: test/Test.Literal. => final object Literal extends Object { self: Literal.type => +12 decls }
120+
[135:15..135:18]: test/Test.Literal.int. => final val method int1
121+
[136:15..136:19]: test/Test.Literal.long. => final val method long1L
122+
[137:15..137:20]: test/Test.Literal.float. => final val method float1.0f
123+
[138:15..138:21]: test/Test.Literal.double. => final val method double2.0
124+
[139:15..139:18]: test/Test.Literal.nil. => final val method nilNull
125+
[140:15..140:19]: test/Test.Literal.char. => final val method char'a'
126+
[141:15..141:21]: test/Test.Literal.string. => final val method string"a"
127+
[142:15..142:19]: test/Test.Literal.bool. => final val method booltrue
128+
[143:15..143:19]: test/Test.Literal.unit. => final val method unitUnit
129+
[144:15..144:23]: test/Test.Literal.javaEnum. => final val method javaEnumLinkOption
130+
[145:15..145:22]: test/Test.Literal.clazzOf. => final val method clazzOfOption[Int]
131+
[148:8..148:13]: test/Test.MapKV# => type MapKV[K] = [V] =>> Map[K, V]
132+
[148:17..148:18]: test/Test.MapKV#[K] => typeparam K
133+
[148:25..148:26]: test/Test.MapKV#[V] => typeparam V
134+
[150:8..150:15]: test/Test.Convert# => type Convert[X] = X match { String => Char, Int => Float }
135+
[150:16..150:17]: test/Test.Convert#[X] => typeparam X

‎scalafix-tests/integration/src/main/resources-3.7/expect/Pretty.expect‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
[7:7..7:17]: test/PrettyTest# => class PrettyTest extends Object { self: PrettyTest => +6 decls }
2+
[8:3..8:14]: *[Int]
3+
[8:3..8:7]: *.apply[Int]
4+
[8:3..8:3]: test/PrettyTest#`<init>`(). => primary ctor <init>(): PrettyTest
5+
[10:10..10:11]: intWrapper(*)
6+
[11:10..11:11]: intWrapper(*)
7+
[15:10..15:16]: *.apply[Inclusive]
8+
[15:10..15:26]: *(global)
9+
[15:17..15:18]: intWrapper(*)
10+
[16:10..16:16]: *.apply[Inclusive]
11+
[16:10..16:32]: *(global)
12+
[16:17..16:18]: intWrapper(*)
13+
[21:3..21:3]: test/PrettyTest#Inner#`<init>`(). => primary ctor <init>(): Inner
14+
[21:9..21:14]: test/PrettyTest#Inner# => class Inner extends Object { self: Inner => +1 decls }
15+
[22:7..22:8]: test/PrettyTest#a. => val method aPrettyTest
16+
[23:7..23:8]: test/PrettyTest#b. => val method ba.Inner
17+
[25:3..25:9]: *.apply[Object {
18+
local4 => abstract method foo(a: Int): Int
19+
local5 => abstract method bar(a: Int): Int
20+
}]
21+
[30:3..30:9]: *.apply[Int & String]
22+
[38:7..38:10]: test/ann# => class ann[T] extends Annotation with StaticAnnotation { self: ann[T] => +3 decls }
23+
[38:10..38:10]: test/ann#`<init>`(). => primary ctor <init>[T](x: T): ann[T]
24+
[38:11..38:12]: test/ann#[T] => typeparam T
25+
[38:14..38:15]: test/ann#x. => private[this] val method xT
26+
[39:7..39:11]: test/ann1# => class ann1 extends Annotation with StaticAnnotation { self: ann1 => +1 decls }
27+
[39:20..39:20]: test/ann1#`<init>`(). => primary ctor <init>(): ann1
28+
[40:7..40:11]: test/ann2# => class ann2 extends Annotation with StaticAnnotation { self: ann2 => +1 decls }
29+
[40:20..40:20]: test/ann2#`<init>`(). => primary ctor <init>(): ann2
30+
[42:1..42:1]: test/B#`<init>`(). => primary ctor <init>(): B
31+
[42:7..42:8]: test/B# => class B extends Object { self: B => +1 decls }
32+
[44:1..44:1]: test/C#`<init>`(). => primary ctor <init>(): C
33+
[44:7..44:8]: test/C# => class C extends Object { self: C => +1 decls }
34+
[46:7..46:8]: test/P# => class P extends Object { self: P => +8 decls }
35+
[47:3..47:3]: test/P#C#`<init>`(). => primary ctor <init>(): C
36+
[47:3..47:3]: test/P#`<init>`(). => primary ctor <init>(): P
37+
[47:9..47:10]: test/P#C# => class C extends Object { self: C => +1 decls }
38+
[48:3..48:3]: test/P#X#`<init>`(). => primary ctor <init>(): X
39+
[48:9..48:10]: test/P#X# => class X extends Object { self: X => +1 decls }
40+
[49:7..49:8]: test/P#x. => val method xX
41+
[52:7..52:8]: test/T# => class T extends Object { self: T => +8 decls }
42+
[53:3..53:3]: test/T#C#`<init>`(). => primary ctor <init>(): C
43+
[53:3..53:3]: test/T#`<init>`(). => primary ctor <init>(): T
44+
[53:9..53:10]: test/T#C# => class C extends Object { self: C => +1 decls }
45+
[54:3..54:3]: test/T#X#`<init>`(). => primary ctor <init>(): X
46+
[54:9..54:10]: test/T#X# => class X extends Object { self: X => +1 decls }
47+
[55:7..55:8]: test/T#x. => val method xX
48+
[58:8..58:12]: test/Test. => final object Test extends Object { self: Test.type => +12 decls }
49+
[59:9..59:10]: test/Test.M# => class M extends Object { self: M => +2 decls }
50+
[60:5..60:5]: test/Test.M#`<init>`(). => primary ctor <init>(): M
51+
[60:9..60:10]: test/Test.M#m(). => method m=> Int
52+
[63:9..63:10]: test/Test.N# => trait N extends Object { self: N => +2 decls }
53+
[64:5..64:5]: test/Test.N#`<init>`(). => primary ctor <init>(): N
54+
[64:9..64:10]: test/Test.N#n(). => method n=> Int
55+
[67:9..67:10]: test/Test.C# => class C extends M { self: C => +42 decls }
56+
[67:19..67:19]: test/Test.C#`<init>`(). => primary ctor <init>(): C
57+
[68:9..68:10]: test/Test.C#p. => val method pP
58+
[69:9..69:10]: test/Test.C#x. => val method xp.X
59+
[71:9..71:17]: test/Test.C#typeRef1. => val method typeRef1C
60+
[72:9..72:17]: test/Test.C#typeRef2. => val method typeRef2p.C
61+
[73:9..73:17]: test/Test.C#typeRef3. => val method typeRef3T#C
62+
[74:9..74:17]: test/Test.C#typeRef4. => val method typeRef4List[Int]
63+
[76:9..76:20]: test/Test.C#singleType1. => val method singleType1x.type
64+
[77:9..77:20]: test/Test.C#singleType2. => val method singleType2p.x.type
65+
[78:9..78:15]: test/Test.C#Either. => val method EitherEither.type
66+
[80:9..80:18]: test/Test.C#thisType1. => val method thisType1C.this.type
67+
[81:9..81:18]: test/Test.C#thisType2. => val method thisType2C.this.type
68+
[83:9..83:19]: test/Test.C#superType1. => val method superType1Int
69+
[84:9..84:19]: test/Test.C#superType2. => val method superType2Int
70+
[85:9..85:19]: test/Test.C#superType3. => val method superType3Int
71+
[87:9..87:22]: test/Test.C#compoundType1. => val method compoundType1Object { def k=> Int }
72+
[88:9..88:22]: test/Test.C#compoundType2. => val method compoundType2M & N
73+
[89:9..89:22]: test/Test.C#compoundType3. => val method compoundType3M & N { def k=> Int }
74+
[90:9..90:22]: test/Test.C#compoundType4. => val method compoundType4Object
75+
[91:9..91:22]: test/Test.C#compoundType5. => val method compoundType5M & N
76+
[92:9..92:22]: test/Test.C#compoundType6. => val method compoundType6M & N
77+
[94:9..94:17]: test/Test.C#annType1. => val method annType1T @ann[T]
78+
[94:21..94:25]: [Int]
79+
[95:9..95:17]: test/Test.C#annType2. => val method annType2T @ann1 @ann2
80+
[97:9..97:25]: test/Test.C#existentialType2. => val method existentialType2List[_] forSome { type _ }
81+
[98:9..98:25]: test/Test.C#existentialType3. => val method existentialType3Class[_] forSome { type _ }
82+
[99:9..99:25]: test/Test.C#existentialType4. => val method existentialType4Class[_] forSome { type _ }
83+
[101:9..101:20]: test/Test.C#typeLambda1(). => method typeLambda1[M[type _]]: Nothing
84+
[101:21..101:22]: test/Test.C#typeLambda1().[M] => typeparam M[type _]
85+
[104:12..104:26]: test/Test.C#ClassInfoType1. => final object ClassInfoType1 extends Object { self: ClassInfoType1.type => +1 decls }
86+
[105:11..105:25]: test/Test.C#ClassInfoType2# => class ClassInfoType2 extends B { self: ClassInfoType2 => +2 decls }
87+
[105:34..105:34]: test/Test.C#ClassInfoType2#`<init>`(). => primary ctor <init>(): ClassInfoType2
88+
[105:42..105:43]: test/Test.C#ClassInfoType2#x(). => method x=> Int
89+
[106:11..106:25]: test/Test.C#ClassInfoType3# => trait ClassInfoType3[T] extends Object { self: ClassInfoType3[T] => +2 decls }
90+
[106:25..106:25]: test/Test.C#ClassInfoType3#`<init>`(). => primary ctor <init>[T](): ClassInfoType3[T]
91+
[106:26..106:27]: test/Test.C#ClassInfoType3#[T] => typeparam T
92+
[108:12..108:22]: test/Test.C#MethodType. => final object MethodType extends Object { self: MethodType.type => +7 decls }
93+
[109:11..109:13]: test/Test.C#MethodType.x1(). => method x1=> Int
94+
[110:11..110:13]: test/Test.C#MethodType.x2(). => method x2=> Int
95+
[111:11..111:13]: test/Test.C#MethodType.m3(). => method m3=> Int
96+
[112:11..112:13]: test/Test.C#MethodType.m4(). => method m4(): Int
97+
[113:11..113:13]: test/Test.C#MethodType.m5(). => method m5(x: Int): Int
98+
[113:14..113:15]: test/Test.C#MethodType.m5().(x) => param x: Int
99+
[114:11..114:13]: test/Test.C#MethodType.m6(). => method m6[T](x: T): T
100+
[114:14..114:15]: test/Test.C#MethodType.m6().[T] => typeparam T
101+
[114:17..114:18]: test/Test.C#MethodType.m6().(x) => param x: T
102+
[117:12..117:22]: test/Test.C#ByNameType. => final object ByNameType extends Object { self: ByNameType.type => +2 decls }
103+
[118:11..118:13]: test/Test.C#ByNameType.m1(). => method m1(x: => Int): Int
104+
[118:14..118:15]: test/Test.C#ByNameType.m1().(x) => param x: => Int
105+
[121:16..121:28]: test/Test.C#RepeatedType# => case class RepeatedType extends Object with Product with Serializable { self: RepeatedType => +4 decls }
106+
[121:28..121:28]: test/Test.C#RepeatedType#`<init>`(). => primary ctor <init>(val s: String*): RepeatedType
107+
[121:29..121:30]: test/Test.C#RepeatedType#s. => val method sString*
108+
[122:11..122:13]: test/Test.C#RepeatedType#m1(). => method m1(x: Int*): Int
109+
[122:14..122:15]: test/Test.C#RepeatedType#m1().(x) => param x: Int*
110+
[125:12..125:20]: test/Test.C#TypeType. => final object TypeType extends Object { self: TypeType.type => +6 decls }
111+
[126:12..126:14]: test/Test.C#TypeType.T1# => type T1
112+
[127:11..127:13]: test/Test.C#TypeType.m2(). => method m2[T2 = C]: Nothing
113+
[127:14..127:16]: test/Test.C#TypeType.m2().[T2] => typeparam T2 = C
114+
[128:11..128:13]: test/Test.C#TypeType.m3(). => method m3[M3[type _]]: Nothing
115+
[128:14..128:16]: test/Test.C#TypeType.m3().[M3] => typeparam M3[type _]
116+
[129:12..129:14]: test/Test.C#TypeType.T4# => type T4 = C
117+
[130:12..130:14]: test/Test.C#TypeType.T5# => type T5[U] = U
118+
[130:15..130:16]: test/Test.C#TypeType.T5#[U] => typeparam U
119+
[134:10..134:17]: test/Test.Literal. => final object Literal extends Object { self: Literal.type => +12 decls }
120+
[135:15..135:18]: test/Test.Literal.int. => final val method int1
121+
[136:15..136:19]: test/Test.Literal.long. => final val method long1L
122+
[137:15..137:20]: test/Test.Literal.float. => final val method float1.0f
123+
[138:15..138:21]: test/Test.Literal.double. => final val method double2.0
124+
[139:15..139:18]: test/Test.Literal.nil. => final val method nilNull
125+
[140:15..140:19]: test/Test.Literal.char. => final val method char'a'
126+
[141:15..141:21]: test/Test.Literal.string. => final val method string"a"
127+
[142:15..142:19]: test/Test.Literal.bool. => final val method booltrue
128+
[143:15..143:19]: test/Test.Literal.unit. => final val method unitUnit
129+
[144:15..144:23]: test/Test.Literal.javaEnum. => final val method javaEnumLinkOption
130+
[145:15..145:22]: test/Test.Literal.clazzOf. => final val method clazzOfOption[Int]
131+
[148:8..148:13]: test/Test.MapKV# => type MapKV[K] = [V] =>> Map[K, V]
132+
[148:17..148:18]: test/Test.MapKV#[K] => typeparam K
133+
[148:25..148:26]: test/Test.MapKV#[V] => typeparam V
134+
[150:8..150:15]: test/Test.Convert# => type Convert[X] = X match { String => Char, Int => Float }
135+
[150:16..150:17]: test/Test.Convert#[X] => typeparam X

‎scalafix-tests/integration/src/test/scala/scalafix/tests/util/ExpectSuite.scala‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ trait ExpectSuite extends AnyFunSuite with DiffAssertions {
1515
def obtained(): String
1616

1717
final def path: AbsolutePath = {
18-
val scalaMajorVersion = BuildInfo.scalaVersion.split("\\.")(0)
19-
AbsolutePath(s"${BuildInfo.resourceDirectory}-${scalaMajorVersion}")
18+
val scalaMajorMinorVersion =
19+
BuildInfo.scalaVersion.split('.').take(2).mkString(".")
20+
AbsolutePath(s"${BuildInfo.resourceDirectory}-${scalaMajorMinorVersion}")
2021
.resolve("expect")
2122
.resolve(filename.stripSuffix("Test.scala") + ".expect")
2223
}

0 commit comments

Comments
 (0)