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

Minor: Fix compilation-breaking nullability issues

Browse Source
This commit is contained in:
Alexey Sedunov
2015-07-09 20:26:45 +03:00
parent 058829aa55
commit e8f5a2db7c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt
+2 -1
View File
@@ -29,6 +29,7 @@ import com.intellij.refactoring.rename.RenameUtil
import com.intellij.usageView.UsageInfo import com.intellij.usageView.UsageInfo
import com.intellij.usageView.UsageViewDescriptor import com.intellij.usageView.UsageViewDescriptor
import com.intellij.util.containers.MultiMap import com.intellij.util.containers.MultiMap
import org.jetbrains.annotations.NotNull
import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetUsageInfo import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetUsageInfo
import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinWrapperForJavaUsageInfos import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinWrapperForJavaUsageInfos
import java.util.* import java.util.*
@@ -101,7 +102,7 @@ public class JetChangeSignatureProcessor(project: Project,
return true return true
} }
override fun isPreviewUsages(usages: Array<UsageInfo>?) = isPreviewUsages() override fun isPreviewUsages(NotNull usages: Array<out UsageInfo>): Boolean = isPreviewUsages()
override fun getCommandName() = commandName override fun getCommandName() = commandName
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.kt
+2 -2
View File
@@ -406,7 +406,7 @@ public class JetChangeSignatureDialog(
private fun evaluateChangeInfo(parametersModel: JetCallableParameterTableModel, private fun evaluateChangeInfo(parametersModel: JetCallableParameterTableModel,
returnTypeCodeFragment: PsiCodeFragment?, returnTypeCodeFragment: PsiCodeFragment?,
methodDescriptor: JetMethodDescriptor, methodDescriptor: JetMethodDescriptor,
visibility: Visibility, visibility: Visibility?,
methodName: String, methodName: String,
defaultValueContext: PsiElement): JetChangeInfo { defaultValueContext: PsiElement): JetChangeInfo {
val parameters = parametersModel.getItems().map { parameter -> val parameters = parametersModel.getItems().map { parameter ->
@@ -428,7 +428,7 @@ public class JetChangeSignatureDialog(
methodName, methodName,
returnType, returnType,
returnTypeText, returnTypeText,
visibility, visibility ?: Visibilities.INTERNAL,
parameters, parameters,
parametersModel.getReceiver(), parametersModel.getReceiver(),
defaultValueContext) defaultValueContext)