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

Remove old 'get' delegate convention in interfaces

Browse Source
This commit is contained in:
Yan Zhulanow
2015-10-12 01:31:00 +03:00
parent 6d2f9cc669
commit bc3d1ddda0
20 changed files with 11 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationSplitter.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget.*
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.storage.get
import org.jetbrains.kotlin.storage.getValue
/*
This class lazily splits Annotations into several different Annotations according to declaration site target priority on property.
compiler/frontend/src/org/jetbrains/kotlin/psi/userDataUtil.kt
-9
View File
@@ -22,9 +22,6 @@ import com.intellij.openapi.util.UserDataHolder
import com.intellij.psi.PsiElement
public class UserDataProperty<in R: UserDataHolder, T : Any>(val key: Key<T>, val default: T? = null) {
fun get(thisRef: R, desc: kotlin.PropertyMetadata) = getValue(thisRef, desc)
fun set(thisRef: R, desc: kotlin.PropertyMetadata, value: T?) = setValue(thisRef, desc, value)
fun getValue(thisRef: R, desc: kotlin.PropertyMetadata): T? {
return thisRef.getUserData(key)
}
@@ -35,9 +32,6 @@ public class UserDataProperty<in R: UserDataHolder, T : Any>(val key: Key<T>, va
}
public class NotNullableUserDataProperty<in R: UserDataHolder, T : Any>(val key: Key<T>, val defaultValue: T) {
fun get(thisRef: R, desc: kotlin.PropertyMetadata) = getValue(thisRef, desc)
fun set(thisRef: R, desc: kotlin.PropertyMetadata, value: T) = setValue(thisRef, desc, value)
fun getValue(thisRef: R, desc: kotlin.PropertyMetadata): T {
return thisRef.getUserData(key) ?: defaultValue
}
@@ -48,9 +42,6 @@ public class NotNullableUserDataProperty<in R: UserDataHolder, T : Any>(val key:
}
public class CopyableUserDataProperty<in R: PsiElement, T : Any>(val key: Key<T>, val default: T? = null) {
fun get(thisRef: R, desc: kotlin.PropertyMetadata) = getValue(thisRef, desc)
fun set(thisRef: R, desc: kotlin.PropertyMetadata, value: T?) = setValue(thisRef, desc, value)
fun getValue(thisRef: R, property: PropertyMetadata): T? {
return thisRef.getCopyableUserData(key)
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeProviderImpl.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.*
import org.jetbrains.kotlin.resolve.bindingContextUtil.recordScope
import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.storage.get
import org.jetbrains.kotlin.storage.getValue
import org.jetbrains.kotlin.utils.sure
import java.util.*