azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename unary plus() and minus() to unaryPlus() and unaryMinus()

Browse Source
This commit is contained in:
Yan Zhulanow
2015-10-07 19:25:32 +03:00
parent 1f2b4e20fe
commit ed5c059cea
59 changed files with 210 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/quickfix/autoImports/unaryMinusOperator.after.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
package h
import util.minus
import util.unaryMinus
interface H
idea/testData/quickfix/autoImports/unaryMinusOperator.before.Dependency.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
package util
operator fun h.H?.minus() = ""
operator fun h.H?.unaryMinus() = ""
idea/testData/quickfix/autoImports/unaryPlusOperator.after.kt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
// "Import" "true"
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>public</b> operator <b>fun</b> h.A.plus(): kotlin.Int <i>defined in</i> h</li><li><b>public</b> operator <b>fun</b> kotlin.String?.plus(other: kotlin.Any?): kotlin.String <i>defined in</i> kotlin</li></ul></html>
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>public</b> operator <b>fun</b> h.A.unaryPlus(): kotlin.Int <i>defined in</i> h</li></ul></html>
package h
import util.plus
import util.unaryPlus
interface H
@@ -13,4 +13,4 @@ fun f(h: H?) {
class A()
operator fun A.plus(): Int = 3
operator fun A.unaryPlus(): Int = 3
idea/testData/quickfix/autoImports/unaryPlusOperator.before.Dependency.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
package util
operator fun h.H.plus() = ""
operator fun h.H.unaryPlus() = ""
idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
// "Import" "true"
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>public</b> operator <b>fun</b> h.A.plus(): kotlin.Int <i>defined in</i> h</li><li><b>public</b> operator <b>fun</b> kotlin.String?.plus(other: kotlin.Any?): kotlin.String <i>defined in</i> kotlin</li></ul></html>
// ERROR: <html>Unresolved reference. <br/> None of the following candidates is applicable because of receiver type mismatch: <ul><li><b>public</b> operator <b>fun</b> h.A.unaryPlus(): kotlin.Int <i>defined in</i> h</li></ul></html>
package h
@@ -11,4 +11,4 @@ fun f(h: H?) {
class A()
operator fun A.plus(): Int = 3
operator fun A.unaryPlus(): Int = 3
idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
// "Create member function 'plus'" "true"
class A<T>(val n: T) {
fun plus(): A<T> = throw Exception()
operator fun unaryPlus(): A<T> = throw Exception()
}
fun test() {
val a: A<Int> = A(1) + <caret>2
val a: A<Int> = A(1) +<caret> 2
}
idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// "Create member function 'plus'" "true"
class A<T>(val n: T) {
fun plus(): A<T> = throw Exception()
operator fun unaryPlus(): A<T> = throw Exception()
operator fun plus(t: T): A<T> {
throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// "Create member function 'getValue', function 'set'" "true"
// "Create member function 'getValue', function 'setValue'" "true"
class F {
}
idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
// "Create member function 'setValue'" "true"
class F {
fun get(x: X, propertyMetadata: PropertyMetadata): Int = 1
fun getValue(x: X, propertyMetadata: PropertyMetadata): Int = 1
fun set(x: X, propertyMetadata: PropertyMetadata, i: Int) {
fun setValue(x: X, propertyMetadata: PropertyMetadata, i: Int) {
throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
}
}
idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// "Create member function 'minus'" "true"
// "Create member function 'unaryMinus'" "true"
class A<T>(val n: T) {
fun minus(n: Int): A<T> = throw Exception()
operator fun minus(n: Int): A<T> = throw Exception()
}
fun test() {
idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
// "Create member function 'minus'" "true"
// "Create member function 'unaryMinus'" "true"
class A<T>(val n: T) {
fun minus(n: Int): A<T> = throw Exception()
operator fun minus(n: Int): A<T> = throw Exception()
operator fun minus(): A<T> {
operator fun unaryMinus(): A<T> {
throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
}
}
idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// "Create extension function 'minus'" "true"
// "Create extension function 'unaryMinus'" "true"
fun test() {
val a = <caret>-false
idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
// "Create extension function 'minus'" "true"
// "Create extension function 'unaryMinus'" "true"
fun test() {
val a = -false
}
operator fun Boolean.minus(): Any {
operator fun Boolean.unaryMinus(): Any {
throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
}
idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// "Create member function 'minus'" "true"
// "Create member function 'unaryMinus'" "true"
class A<T>(val n: T)
idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// "Create member function 'minus'" "true"
// "Create member function 'unaryMinus'" "true"
class A<T>(val n: T) {
operator fun minus(): Any {
operator fun unaryMinus(): Any {
throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
}
}
idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// "Create member function 'minus'" "true"
// "Create member function 'unaryMinus'" "true"
class A<T>(val n: T)
idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// "Create member function 'minus'" "true"
// "Create member function 'unaryMinus'" "true"
class A<T>(val n: T) {
operator fun minus(): A<T> {
operator fun unaryMinus(): A<T> {
throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
}
}