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

Replace single line let: application on IDEA + front-end modules

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-11-14 14:05:15 +03:00
parent 09ae1f1a5d
commit b850d71e17
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeProvider.kt
+2 -1
View File
@@ -42,7 +42,8 @@ class FileScopeProviderImpl(
) : FileScopeProvider { ) : FileScopeProvider {
private val cache = storageManager.createMemoizedFunction<KtFile, FileScopes> { file -> private val cache = storageManager.createMemoizedFunction<KtFile, FileScopes> { file ->
val scopes = (file.originalFile as KtFile?)?.fileScopesCustomizer?.let { it.createFileScopes(fileScopeFactory) } ?: fileScopeFactory.createScopesForFile(file) val scopes = (file.originalFile as KtFile?)?.fileScopesCustomizer?.createFileScopes(fileScopeFactory)
?: fileScopeFactory.createScopesForFile(file)
bindingTrace.recordScope(scopes.lexicalScope, file) bindingTrace.recordScope(scopes.lexicalScope, file)
scopes scopes
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterMethodUsageProcessor.kt
+1 -1
View File
@@ -64,7 +64,7 @@ class KotlinIntroduceParameterMethodUsageProcessor : IntroduceParameterMethodUsa
data.parametersToRemove.toNativeArray().sortedDescending().forEach { changeInfo.removeParameter(it) } data.parametersToRemove.toNativeArray().sortedDescending().forEach { changeInfo.removeParameter(it) }
// Temporarily assume that the new parameter is of Any type. Actual type is substituted during the signature update phase // Temporarily assume that the new parameter is of Any type. Actual type is substituted during the signature update phase
val defaultValueForCall = (data.parameterInitializer.expression as? PsiExpression)?.let { it.j2k() } val defaultValueForCall = (data.parameterInitializer.expression as? PsiExpression)?.j2k()
changeInfo.addParameter(KotlinParameterInfo(callableDescriptor = psiMethodDescriptor, changeInfo.addParameter(KotlinParameterInfo(callableDescriptor = psiMethodDescriptor,
name = data.parameterName, name = data.parameterName,
originalTypeInfo = KotlinTypeInfo(false, psiMethodDescriptor.builtIns.anyType), originalTypeInfo = KotlinTypeInfo(false, psiMethodDescriptor.builtIns.anyType),
idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
+3 -5
View File
@@ -386,11 +386,9 @@ fun <T> chooseContainerElement(
else -> null else -> null
} ?: return null } ?: return null
val name = renderName() val name = renderName()
val params = (descriptor as? FunctionDescriptor)?.let { descriptor -> val params = (descriptor as? FunctionDescriptor)?.valueParameters
descriptor.valueParameters ?.map { DescriptorRenderer.Companion.SHORT_NAMES_IN_TYPES.renderType(it.type) }
.map { DescriptorRenderer.Companion.SHORT_NAMES_IN_TYPES.renderType(it.type) } ?.joinToString(", ", "(", ")") ?: ""
.joinToString(", ", "(", ")")
} ?: ""
return "$name$params" return "$name$params"
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
+2 -5
View File
@@ -158,11 +158,8 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
val referencedElement = reference.element val referencedElement = reference.element
val argList = referencedElement.getNonStrictParentOfType<KtUserType>()?.let { jetType -> val argList = referencedElement.getNonStrictParentOfType<KtUserType>()?.typeArgumentList
jetType.typeArgumentList ?: referencedElement.getNonStrictParentOfType<KtCallExpression>()?.typeArgumentList
} ?: referencedElement.getNonStrictParentOfType<KtCallExpression>()?.let { callExpression ->
callExpression.typeArgumentList
} ?: null
if (argList != null) { if (argList != null) {
val projections = argList.arguments val projections = argList.arguments