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

Support named arguments for Java constructors annotated with KotlinSignature

Browse Source
This commit is contained in:
Alexander Udalov
2014-03-19 23:08:56 +04:00
parent d2dc54c14f
commit 7d311cdfa0
14 changed files with 189 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt
+1 -1
View File
@@ -75,7 +75,7 @@ public class InternalCompiledClassesTest : JetLightCodeInsightFixtureTestCase()
}
override fun getProjectDescriptor(): LightProjectDescriptor {
return JdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH, withSources = false)
return JdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH, /* withSources = */ false)
}
private fun isSyntheticClassOfKind(kind: KotlinSyntheticClass.Kind) : VirtualFile.() -> Boolean = {
idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt
+31 -31
View File
@@ -154,12 +154,12 @@ enum class MoveAction {
val targetPackage = config.getString("targetPackage")
MoveClassesOrPackagesProcessor(
project = mainFile.getProject(),
elements = array(classToMove),
moveDestination = MultipleRootsMoveDestination(PackageWrapper(mainFile.getManager(), targetPackage)),
searchInComments = false,
searchInNonJavaFiles = true,
moveCallback = null
mainFile.getProject(),
array(classToMove),
MultipleRootsMoveDestination(PackageWrapper(mainFile.getManager(), targetPackage)),
/* searchInComments = */ false,
/* searchInNonJavaFiles = */ true,
/* moveCallback = */ null
).run()
}
}
@@ -171,12 +171,12 @@ enum class MoveAction {
val targetPackage = config.getString("targetPackage")
MoveClassesOrPackagesProcessor(
project = project,
elements = array(JavaPsiFacade.getInstance(project).findPackage(sourcePackage)!!),
moveDestination = MultipleRootsMoveDestination(PackageWrapper(mainFile.getManager(), targetPackage)),
searchInComments = false,
searchInNonJavaFiles = true,
moveCallback = null
project,
array(JavaPsiFacade.getInstance(project).findPackage(sourcePackage)!!),
MultipleRootsMoveDestination(PackageWrapper(mainFile.getManager(), targetPackage)),
/* searchInComments = */ false,
/* searchInNonJavaFiles = */ true,
/* moveCallback = */ null
).run()
}
}
@@ -189,12 +189,12 @@ enum class MoveAction {
val targetClass = config.getString("targetClass")
MoveClassToInnerProcessor(
project = project,
classesToMove = array(classToMove),
targetClass = JavaPsiFacade.getInstance(project).findClass(targetClass, GlobalSearchScope.allScope(project))!!,
searchInComments = false,
searchInNonJavaFiles = true,
moveCallback = null
project,
array(classToMove),
JavaPsiFacade.getInstance(project).findClass(targetClass, GlobalSearchScope.allScope(project))!!,
/* searchInComments = */ false,
/* searchInNonJavaFiles = */ true,
/* moveCallback = */ null
).run()
}
}
@@ -209,12 +209,12 @@ enum class MoveAction {
val targetPackage = config.getString("targetPackage")
MoveInnerProcessor(
project = project,
innerClass = classToMove,
name = newClassName,
passOuterClass = outerInstanceParameterName != null,
parameterName = outerInstanceParameterName,
targetContainer = JavaPsiFacade.getInstance(project).findPackage(targetPackage)!!.getDirectories()[0]
project,
classToMove,
newClassName,
outerInstanceParameterName != null,
outerInstanceParameterName,
JavaPsiFacade.getInstance(project).findPackage(targetPackage)!!.getDirectories()[0]
).run()
}
}
@@ -226,13 +226,13 @@ enum class MoveAction {
val targetPackage = config.getNullableString("targetPackage")
if (targetPackage != null) {
MoveFilesOrDirectoriesProcessor(
project = project,
elements = array(mainFile),
newParent = JavaPsiFacade.getInstance(project).findPackage(targetPackage)!!.getDirectories()[0],
searchInComments = false,
searchInNonJavaFiles = true,
moveCallback = null,
prepareSuccessfulCallback = null
project,
array(mainFile),
JavaPsiFacade.getInstance(project).findPackage(targetPackage)!!.getDirectories()[0],
/* searchInComments = */ false,
/* searchInNonJavaFiles = */ true,
/* moveCallback = */ null,
/* prepareSuccessfulCallback = */ null
).run()
}
else {