Skip to content

Commit 8cdd949

Browse files
dwijnanddwijnand
committed
Drop the "nullAs()" cases
Two problems: * ScalaMeta's SymbolInformation seems to record asInstanceOf as nilary instead of nullary, so the rewrite erroneously rewrites the _definitions_ propNullAs and methNullAs, into invalid code... :( I could move the definitions into another file, but I just decided to drop it, also because... * Infix invocation of nilary methods seems to be no longer valid in 2.13, for example: [error] /d/scala-rewrites/output/src/main/scala/fix/scala213/ExplicitNonNullaryApply.scala:30:42: no arguments allowed for nullary method methNullAs: ()A [error] def def_this_methNullAs_m_in = this methNullAs () [error] ^ Also, "nullAs" is the closest and only method I could think of that is nilary (actually I normally define "nullAs" as nullary) and takes no term arguments but makes legitimate use of the type parameter. So maybe the whole edge-case is a pointless variation.
1 parent 08a418a commit 8cdd949

File tree

4 files changed

+12
-124
lines changed

4 files changed

+12
-124
lines changed

‎input/src/main/scala/fix/scala213/ExplicitNonNullaryApply.scala

Lines changed: 5 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,20 @@ class ExplicitNonNullaryApply {
99
def prop = ""
1010
def meth() = ""
1111

12-
def propNullAs[A] = null.asInstanceOf[A]
13-
def methNullAs[A]() = null.asInstanceOf[A]
14-
1512
def id[A](x: A) = x
1613

17-
1814
def def_prop_p = prop
1915
def def_meth_p = meth
2016
def def_meth_m = meth()
2117

22-
def def_propNullAs_p = propNullAs
23-
def def_propNullAs_p_ta = propNullAs[String]
24-
def def_methNullAs_p = methNullAs
25-
def def_methNullAs_p_ta = methNullAs[String]
26-
def def_methNullAs_m = methNullAs()
27-
def def_methNullAs_m_ta = methNullAs[String]()
28-
2918
def def_id = id("")
3019
def def_id_ta = id[String]("")
3120

3221

3322
def def_this_prop_p = this.prop
3423
def def_this_meth_p = this.meth
3524
def def_this_meth_m = this.meth()
36-
def def_this_meth_m_in = this meth ()
37-
38-
def def_this_propNullAs_p = this.propNullAs
39-
def def_this_propNullAs_p_ta = this.propNullAs[String]
40-
def def_this_methNullAs_p = this.methNullAs
41-
def def_this_methNullAs_p_ta = this.methNullAs[String]
42-
def def_this_methNullAs_m = this.methNullAs()
43-
def def_this_methNullAs_m_ta = this.methNullAs[String]()
44-
def def_this_methNullAs_m_in = this methNullAs ()
45-
def def_this_methNullAs_m_in_ta = this methNullAs[String] ()
25+
//def def_this_meth_m_in = this meth ()
4626

4727
def def_this_id_m = this.id("")
4828
def def_this_id_m_ta = this.id[String]("")
@@ -53,16 +33,7 @@ class ExplicitNonNullaryApply {
5333
def def_enna_prop_p = enna.prop
5434
def def_enna_meth_p = enna.meth
5535
def def_enna_meth_m = enna.meth()
56-
def def_enna_meth_m_in = enna meth ()
57-
58-
def def_enna_propNullAs_p = enna.propNullAs
59-
def def_enna_propNullAs_p_ta = enna.propNullAs[String]
60-
def def_enna_methNullAs_p = enna.methNullAs
61-
def def_enna_methNullAs_p_ta = enna.methNullAs[String]
62-
def def_enna_methNullAs_m = enna.methNullAs()
63-
def def_enna_methNullAs_m_ta = enna.methNullAs[String]()
64-
def def_enna_methNullAs_m_in = enna methNullAs ()
65-
def def_enna_methNullAs_m_in_ta = enna methNullAs[String] ()
36+
//def def_enna_meth_m_in = enna meth ()
6637

6738
def def_enna_id_m = enna.id("")
6839
def def_enna_id_m_ta = enna.id[String]("")
@@ -73,16 +44,7 @@ class ExplicitNonNullaryApply {
7344
def def_this_enna_prop_p = this.enna.prop
7445
def def_this_enna_meth_p = this.enna.meth
7546
def def_this_enna_meth_m = this.enna.meth()
76-
def def_this_enna_meth_m_in = this.enna meth ()
77-
78-
def def_this_enna_propNullAs_p = this.enna.propNullAs
79-
def def_this_enna_propNullAs_p_ta = this.enna.propNullAs[String]
80-
def def_this_enna_methNullAs_p = this.enna.methNullAs
81-
def def_this_enna_methNullAs_p_ta = this.enna.methNullAs[String]
82-
def def_this_enna_methNullAs_m = this.enna.methNullAs()
83-
def def_this_enna_methNullAs_m_ta = this.enna.methNullAs[String]()
84-
def def_this_enna_methNullAs_m_in = this.enna methNullAs ()
85-
def def_this_enna_methNullAs_m_in_ta = this.enna methNullAs[String] ()
47+
//def def_this_enna_meth_m_in = this.enna meth ()
8648

8749
def def_this_enna_id_m = this.enna.id("")
8850
def def_this_enna_id_m_ta = this.enna.id[String]("")
@@ -93,16 +55,7 @@ class ExplicitNonNullaryApply {
9355
def def_enna_this_prop_p = ExplicitNonNullaryApply.this.prop
9456
def def_enna_this_meth_p = ExplicitNonNullaryApply.this.meth
9557
def def_enna_this_meth_m = ExplicitNonNullaryApply.this.meth()
96-
def def_enna_this_meth_m_in = ExplicitNonNullaryApply.this meth ()
97-
98-
def def_enna_this_propNullAs_p = ExplicitNonNullaryApply.this.propNullAs
99-
def def_enna_this_propNullAs_p_ta = ExplicitNonNullaryApply.this.propNullAs[String]
100-
def def_enna_this_methNullAs_p = ExplicitNonNullaryApply.this.methNullAs
101-
def def_enna_this_methNullAs_p_ta = ExplicitNonNullaryApply.this.methNullAs[String]
102-
def def_enna_this_methNullAs_m = ExplicitNonNullaryApply.this.methNullAs()
103-
def def_enna_this_methNullAs_m_ta = ExplicitNonNullaryApply.this.methNullAs[String]()
104-
def def_enna_this_methNullAs_m_in = ExplicitNonNullaryApply.this methNullAs ()
105-
def def_enna_this_methNullAs_m_in_ta = ExplicitNonNullaryApply.this methNullAs[String] ()
58+
//def def_enna_this_meth_m_in = ExplicitNonNullaryApply.this meth ()
10659

10760
def def_enna_this_id_m = ExplicitNonNullaryApply.this.id("")
10861
def def_enna_this_id_m_ta = ExplicitNonNullaryApply.this.id[String]("")
@@ -113,16 +66,7 @@ class ExplicitNonNullaryApply {
11366
def def_enna_enna_prop_p = enna.enna.prop
11467
def def_enna_enna_meth_p = enna.enna.meth
11568
def def_enna_enna_meth_m = enna.enna.meth()
116-
def def_enna_enna_meth_m_in = enna.enna meth ()
117-
118-
def def_enna_enna_propNullAs_p = enna.enna.propNullAs
119-
def def_enna_enna_propNullAs_p_ta = enna.enna.propNullAs[String]
120-
def def_enna_enna_methNullAs_p = enna.enna.methNullAs
121-
def def_enna_enna_methNullAs_p_ta = enna.enna.methNullAs[String]
122-
def def_enna_enna_methNullAs_m = enna.enna.methNullAs()
123-
def def_enna_enna_methNullAs_m_ta = enna.enna.methNullAs[String]()
124-
def def_enna_enna_methNullAs_m_in = enna.enna methNullAs ()
125-
def def_enna_enna_methNullAs_m_in_ta = enna.enna methNullAs[String] ()
69+
//def def_enna_enna_meth_m_in = enna.enna meth ()
12670

12771
def def_enna_enna_id_m = enna.enna.id("")
12872
def def_enna_enna_id_m_ta = enna.enna.id[String]("")

‎input/src/main/scala/fix/scala213/NoAutoApply.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ object NoAutoApply {
2323
new java.util.ArrayList[Int]().toString
2424
val builder = List.newBuilder[Int]
2525
builder.result()
26-
builder result ()
26+
//builder result ()
2727
builder.result
2828
fix.scala213.NoAutoApply.buz.empty[String]
2929
var opt: Option[() => Int] = None

‎output/src/main/scala/fix/scala213/ExplicitNonNullaryApply.scala

Lines changed: 5 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,20 @@ class ExplicitNonNullaryApply {
66
def prop = ""
77
def meth() = ""
88

9-
def propNullAs[A] = null.asInstanceOf[A]()
10-
def methNullAs[A]() = null.asInstanceOf[A]()
11-
129
def id[A](x: A) = x
1310

14-
1511
def def_prop_p = prop
1612
def def_meth_p = meth()
1713
def def_meth_m = meth()
1814

19-
def def_propNullAs_p = propNullAs
20-
def def_propNullAs_p_ta = propNullAs[String]
21-
def def_methNullAs_p = methNullAs()
22-
def def_methNullAs_p_ta = methNullAs[String]()
23-
def def_methNullAs_m = methNullAs()
24-
def def_methNullAs_m_ta = methNullAs[String]()
25-
2615
def def_id = id("")
2716
def def_id_ta = id[String]("")
2817

2918

3019
def def_this_prop_p = this.prop
3120
def def_this_meth_p = this.meth()
3221
def def_this_meth_m = this.meth()
33-
def def_this_meth_m_in = this meth ()
34-
35-
def def_this_propNullAs_p = this.propNullAs
36-
def def_this_propNullAs_p_ta = this.propNullAs[String]
37-
def def_this_methNullAs_p = this.methNullAs()
38-
def def_this_methNullAs_p_ta = this.methNullAs[String]()
39-
def def_this_methNullAs_m = this.methNullAs()
40-
def def_this_methNullAs_m_ta = this.methNullAs[String]()
41-
def def_this_methNullAs_m_in = this methNullAs ()
42-
def def_this_methNullAs_m_in_ta = this methNullAs[String] ()
22+
//def def_this_meth_m_in = this meth ()
4323

4424
def def_this_id_m = this.id("")
4525
def def_this_id_m_ta = this.id[String]("")
@@ -50,16 +30,7 @@ class ExplicitNonNullaryApply {
5030
def def_enna_prop_p = enna.prop
5131
def def_enna_meth_p = enna.meth()
5232
def def_enna_meth_m = enna.meth()
53-
def def_enna_meth_m_in = enna meth ()
54-
55-
def def_enna_propNullAs_p = enna.propNullAs
56-
def def_enna_propNullAs_p_ta = enna.propNullAs[String]
57-
def def_enna_methNullAs_p = enna.methNullAs()
58-
def def_enna_methNullAs_p_ta = enna.methNullAs[String]()
59-
def def_enna_methNullAs_m = enna.methNullAs()
60-
def def_enna_methNullAs_m_ta = enna.methNullAs[String]()
61-
def def_enna_methNullAs_m_in = enna methNullAs ()
62-
def def_enna_methNullAs_m_in_ta = enna methNullAs[String] ()
33+
//def def_enna_meth_m_in = enna meth ()
6334

6435
def def_enna_id_m = enna.id("")
6536
def def_enna_id_m_ta = enna.id[String]("")
@@ -70,16 +41,7 @@ class ExplicitNonNullaryApply {
7041
def def_this_enna_prop_p = this.enna.prop
7142
def def_this_enna_meth_p = this.enna.meth()
7243
def def_this_enna_meth_m = this.enna.meth()
73-
def def_this_enna_meth_m_in = this.enna meth ()
74-
75-
def def_this_enna_propNullAs_p = this.enna.propNullAs
76-
def def_this_enna_propNullAs_p_ta = this.enna.propNullAs[String]
77-
def def_this_enna_methNullAs_p = this.enna.methNullAs()
78-
def def_this_enna_methNullAs_p_ta = this.enna.methNullAs[String]()
79-
def def_this_enna_methNullAs_m = this.enna.methNullAs()
80-
def def_this_enna_methNullAs_m_ta = this.enna.methNullAs[String]()
81-
def def_this_enna_methNullAs_m_in = this.enna methNullAs ()
82-
def def_this_enna_methNullAs_m_in_ta = this.enna methNullAs[String] ()
44+
//def def_this_enna_meth_m_in = this.enna meth ()
8345

8446
def def_this_enna_id_m = this.enna.id("")
8547
def def_this_enna_id_m_ta = this.enna.id[String]("")
@@ -90,16 +52,7 @@ class ExplicitNonNullaryApply {
9052
def def_enna_this_prop_p = ExplicitNonNullaryApply.this.prop
9153
def def_enna_this_meth_p = ExplicitNonNullaryApply.this.meth()
9254
def def_enna_this_meth_m = ExplicitNonNullaryApply.this.meth()
93-
def def_enna_this_meth_m_in = ExplicitNonNullaryApply.this meth ()
94-
95-
def def_enna_this_propNullAs_p = ExplicitNonNullaryApply.this.propNullAs
96-
def def_enna_this_propNullAs_p_ta = ExplicitNonNullaryApply.this.propNullAs[String]
97-
def def_enna_this_methNullAs_p = ExplicitNonNullaryApply.this.methNullAs()
98-
def def_enna_this_methNullAs_p_ta = ExplicitNonNullaryApply.this.methNullAs[String]()
99-
def def_enna_this_methNullAs_m = ExplicitNonNullaryApply.this.methNullAs()
100-
def def_enna_this_methNullAs_m_ta = ExplicitNonNullaryApply.this.methNullAs[String]()
101-
def def_enna_this_methNullAs_m_in = ExplicitNonNullaryApply.this methNullAs ()
102-
def def_enna_this_methNullAs_m_in_ta = ExplicitNonNullaryApply.this methNullAs[String] ()
55+
//def def_enna_this_meth_m_in = ExplicitNonNullaryApply.this meth ()
10356

10457
def def_enna_this_id_m = ExplicitNonNullaryApply.this.id("")
10558
def def_enna_this_id_m_ta = ExplicitNonNullaryApply.this.id[String]("")
@@ -110,16 +63,7 @@ class ExplicitNonNullaryApply {
11063
def def_enna_enna_prop_p = enna.enna.prop
11164
def def_enna_enna_meth_p = enna.enna.meth()
11265
def def_enna_enna_meth_m = enna.enna.meth()
113-
def def_enna_enna_meth_m_in = enna.enna meth ()
114-
115-
def def_enna_enna_propNullAs_p = enna.enna.propNullAs
116-
def def_enna_enna_propNullAs_p_ta = enna.enna.propNullAs[String]
117-
def def_enna_enna_methNullAs_p = enna.enna.methNullAs()
118-
def def_enna_enna_methNullAs_p_ta = enna.enna.methNullAs[String]()
119-
def def_enna_enna_methNullAs_m = enna.enna.methNullAs()
120-
def def_enna_enna_methNullAs_m_ta = enna.enna.methNullAs[String]()
121-
def def_enna_enna_methNullAs_m_in = enna.enna methNullAs ()
122-
def def_enna_enna_methNullAs_m_in_ta = enna.enna methNullAs[String] ()
66+
//def def_enna_enna_meth_m_in = enna.enna meth ()
12367

12468
def def_enna_enna_id_m = enna.enna.id("")
12569
def def_enna_enna_id_m_ta = enna.enna.id[String]("")

‎output/src/main/scala/fix/scala213/NoAutoApply.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ object NoAutoApply {
2020
new java.util.ArrayList[Int]().toString
2121
val builder = List.newBuilder[Int]
2222
builder.result()
23-
builder result ()
23+
//builder result ()
2424
builder.result()
2525
fix.scala213.NoAutoApply.buz.empty[String]()
2626
var opt: Option[() => Int] = None

0 commit comments

Comments
 (0)