From 6e19e8c05549cb50f91f88115eafa35f331b8378 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Mon, 5 Oct 2015 20:18:58 +0300 Subject: [PATCH] Replace get() and set() to getValue() and setValue() (property delegates) Original commit: 1f2b4e20fe9c628427fba15e57d556b95c528ba9 --- .../lookupTracker/conventions/delegateProperty.kt | 12 ++++++------ .../inlineGet.kt | 2 +- .../inlineGet.kt.new.1 | 2 +- .../inlineSet.kt | 2 +- .../inlineSet.kt.new.2 | 2 +- .../delegatedPropertyInlineMethodAccessor/inline.kt | 4 ++-- .../inline.kt.new.1 | 4 ++-- .../inline.kt.new.2 | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 073c7bfbcb7..b6595d9bbbb 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -18,11 +18,11 @@ package foo.bar } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(get) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(get) c:foo.bar.D1(set) p:foo.bar(set) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) p:foo.bar(getValue) c:foo.bar.D1(get) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) p:foo.bar(getValue) c:foo.bar.D1(get) c:foo.bar.D1(setValue) p:foo.bar(setValue) c:foo.bar.D1(set) p:foo.bar(set) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated)*/D1() -/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() -/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(set) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() +/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() +/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(setValue) p:foo.bar(setValue) c:foo.bar.D2(set) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() -/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(propertyDelegated)*/D3() -/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(set) c:foo.bar.D3(propertyDelegated)*/D3() +/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(getValue) p:foo.bar(getValue) c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(propertyDelegated)*/D3() +/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(getValue) p:foo.bar(getValue) c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(setValue) p:foo.bar(setValue) c:foo.bar.D3(set) c:foo.bar.D3(propertyDelegated)*/D3() diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt index 405ef2eef20..1277c339dca 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt @@ -1,5 +1,5 @@ package inline -inline fun Inline.get(receiver: Any?, prop: PropertyMetadata): Int { +inline fun Inline.getValue(receiver: Any?, prop: PropertyMetadata): Int { return 0 } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 index efc57e7afd9..3ed00a5f3b1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 @@ -1,5 +1,5 @@ package inline -inline fun Inline.get(receiver: Any?, prop: PropertyMetadata): Int { +inline fun Inline.getValue(receiver: Any?, prop: PropertyMetadata): Int { return 1 } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt index ffebce91d6a..0a9a76e7be4 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt @@ -1,5 +1,5 @@ package inline -inline fun Inline.set(receiver: Any?, prop: PropertyMetadata, value: Int) { +inline fun Inline.setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { println(value) } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 index 4eda0b9b94e..446a5ad574c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 @@ -1,5 +1,5 @@ package inline -inline fun Inline.set(receiver: Any?, prop: PropertyMetadata, value: Int) { +inline fun Inline.setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { println(value * 2) } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt index 5840d17a8a3..470f1f47d05 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt @@ -1,11 +1,11 @@ package inline class Inline { - inline fun get(receiver: Any?, prop: PropertyMetadata): Int { + inline fun getValue(receiver: Any?, prop: PropertyMetadata): Int { return 0 } - inline fun set(receiver: Any?, prop: PropertyMetadata, value: Int) { + inline fun setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { println(value) } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 index bb80da599b8..49af798d65d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 @@ -1,11 +1,11 @@ package inline class Inline { - inline fun get(receiver: Any?, prop: PropertyMetadata): Int { + inline fun getValue(receiver: Any?, prop: PropertyMetadata): Int { return 1 } - inline fun set(receiver: Any?, prop: PropertyMetadata, value: Int) { + inline fun setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { println(value) } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 index 17180968e7a..d0a03b3014f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 @@ -1,11 +1,11 @@ package inline class Inline { - inline fun get(receiver: Any?, prop: PropertyMetadata): Int { + inline fun getValue(receiver: Any?, prop: PropertyMetadata): Int { return 1 } - inline fun set(receiver: Any?, prop: PropertyMetadata, value: Int) { + inline fun setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { println(value * 2) } } \ No newline at end of file