From da004cf104244964f2a53e3dfbf27e28acdf2a38 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 22 Sep 2014 16:43:26 +0400 Subject: [PATCH] Minor: Add @NotNull annotation --- annotations/com/intellij/refactoring/annotations.xml | 5 ++++- .../ReplaceExplicitFunctionLiteralParamWithItIntention.kt | 2 +- .../MoveKotlinTopLevelDeclarationsProcessor.kt | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/annotations/com/intellij/refactoring/annotations.xml b/annotations/com/intellij/refactoring/annotations.xml index f9e6d56b074..0f8aa80e314 100644 --- a/annotations/com/intellij/refactoring/annotations.xml +++ b/annotations/com/intellij/refactoring/annotations.xml @@ -8,7 +8,10 @@ - + + + diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt index 8348537f6ff..9022a95d5a0 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt @@ -98,7 +98,7 @@ public class ReplaceExplicitFunctionLiteralParamWithItIntention() : PsiElementBa false, false ) { - public override fun performRefactoring(usages: Array?) { + public override fun performRefactoring(usages: Array) { super.performRefactoring(usages) funcLiteral.deleteChildRange(funcLiteral.getValueParameterList(), funcLiteral.getArrowNode()!!.getPsi()) if (cursorWasOverParameterList) { diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt index 0276a5330d0..968e7a4eb5b 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt @@ -219,7 +219,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor(project: Project, val optio return showConflicts(conflicts, refUsages.get()) } - override fun performRefactoring(usages: Array?) { + override fun performRefactoring(usages: Array) { fun moveDeclaration( declaration: JetNamedDeclaration, moveTarget: KotlinMoveTarget,