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

Minor, delete unneeded underscores from parameter names

Browse Source
This commit is contained in:
Alexander Udalov
2014-08-27 16:01:51 +04:00
parent bc1d59a538
commit 0cb7c08a7a
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt
+10 -11
View File
@@ -50,9 +50,9 @@ class LazyJavaAnnotationDescriptor(
val javaAnnotation : JavaAnnotation val javaAnnotation : JavaAnnotation
) : AnnotationDescriptor { ) : AnnotationDescriptor {
private val _fqName = c.storageManager.createNullableLazyValue { javaAnnotation.getFqName() } private val fqName = c.storageManager.createNullableLazyValue { javaAnnotation.getFqName() }
private val _type = c.storageManager.createLazyValue {() : JetType -> private val _type = c.storageManager.createLazyValue {() : JetType ->
val fqName = _fqName() val fqName = fqName()
if (fqName == null) return@createLazyValue ErrorUtils.createErrorType("No fqName: $javaAnnotation") if (fqName == null) return@createLazyValue ErrorUtils.createErrorType("No fqName: $javaAnnotation")
val annotationClass = JavaToKotlinClassMap.getInstance().mapKotlinClass(fqName, TypeUsage.MEMBER_SIGNATURE_INVARIANT) val annotationClass = JavaToKotlinClassMap.getInstance().mapKotlinClass(fqName, TypeUsage.MEMBER_SIGNATURE_INVARIANT)
?: javaAnnotation.resolve()?.let { javaClass -> c.moduleClassResolver.resolveClass(javaClass) } ?: javaAnnotation.resolve()?.let { javaClass -> c.moduleClassResolver.resolveClass(javaClass) }
@@ -61,17 +61,17 @@ class LazyJavaAnnotationDescriptor(
override fun getType(): JetType = _type() override fun getType(): JetType = _type()
private val _nameToArgument = c.storageManager.createLazyValue { private val nameToArgument = c.storageManager.createLazyValue {
var arguments: Collection<JavaAnnotationArgument> = javaAnnotation.getArguments() var arguments: Collection<JavaAnnotationArgument> = javaAnnotation.getArguments()
if (arguments.isEmpty() && _fqName()?.asString() == "java.lang.Deprecated") { if (arguments.isEmpty() && fqName()?.asString() == "java.lang.Deprecated") {
arguments = listOf(DEPRECATED_IN_JAVA) arguments = listOf(DEPRECATED_IN_JAVA)
} }
arguments.valuesToMap { it.name } arguments.valuesToMap { it.name }
} }
private val _valueArguments = c.storageManager.createMemoizedFunctionWithNullableValues<ValueParameterDescriptor, CompileTimeConstant<out Any?>> { private val valueArguments = c.storageManager.createMemoizedFunctionWithNullableValues<ValueParameterDescriptor, CompileTimeConstant<out Any?>> {
valueParameter -> valueParameter ->
val nameToArg = _nameToArgument() val nameToArg = nameToArgument()
var javaAnnotationArgument = nameToArg[valueParameter.getName()] var javaAnnotationArgument = nameToArg[valueParameter.getName()]
if (javaAnnotationArgument == null && valueParameter.getName() == DEFAULT_ANNOTATION_MEMBER_NAME) { if (javaAnnotationArgument == null && valueParameter.getName() == DEFAULT_ANNOTATION_MEMBER_NAME) {
@@ -81,9 +81,9 @@ class LazyJavaAnnotationDescriptor(
resolveAnnotationArgument(javaAnnotationArgument) resolveAnnotationArgument(javaAnnotationArgument)
} }
override fun getValueArgument(valueParameterDescriptor: ValueParameterDescriptor) = _valueArguments(valueParameterDescriptor) override fun getValueArgument(valueParameterDescriptor: ValueParameterDescriptor) = valueArguments(valueParameterDescriptor)
private val _allValueArguments = c.storageManager.createLazyValue { private val allValueArguments = c.storageManager.createLazyValue {
val constructors = getAnnotationClass().getConstructors() val constructors = getAnnotationClass().getConstructors()
if (constructors.isEmpty()) if (constructors.isEmpty())
mapOf<ValueParameterDescriptor, CompileTimeConstant<*>>() mapOf<ValueParameterDescriptor, CompileTimeConstant<*>>()
@@ -93,7 +93,7 @@ class LazyJavaAnnotationDescriptor(
} }
} }
override fun getAllValueArguments() = _allValueArguments() override fun getAllValueArguments() = allValueArguments()
private fun getAnnotationClass() = getType().getConstructor().getDeclarationDescriptor() as ClassDescriptor private fun getAnnotationClass() = getType().getConstructor().getDeclarationDescriptor() as ClassDescriptor
@@ -164,8 +164,7 @@ class LazyJavaAnnotationDescriptor(
return JavaClassValue(javaClassObjectType) return JavaClassValue(javaClassObjectType)
} }
override fun toString(): String { override fun toString(): String {
return DescriptorRenderer.FQ_NAMES_IN_TYPES.renderAnnotation(this) return DescriptorRenderer.FQ_NAMES_IN_TYPES.renderAnnotation(this)
} }
} }