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

Change Signature: Support constructors of header/impl classes

Browse Source
This commit is contained in:
Alexey Sedunov
2017-08-10 21:22:44 +03:00
parent 7f9110b4e6
commit f5c7db8270
77 changed files with 1075 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/HeaderImplDeclarationChecker.kt
+4 -1
View File
@@ -181,7 +181,10 @@ object HeaderImplDeclarationChecker : DeclarationChecker {
listOf(module.getPackage(containingDeclaration.fqName).memberScope)
}
is ClassDescriptor -> {
containingDeclaration.findClassifiersFromModule(module).mapNotNull { (it as? ClassDescriptor)?.unsubstitutedMemberScope }
val classes = containingDeclaration.findClassifiersFromModule(module).filterIsInstance<ClassDescriptor>()
if (this is ConstructorDescriptor) return classes.flatMap { it.constructors }
classes.map { it.unsubstitutedMemberScope }
}
else -> return emptyList()
}
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureData.kt
+12 -7
View File
@@ -32,10 +32,7 @@ import org.jetbrains.kotlin.idea.highlighter.markers.headerImplementations
import org.jetbrains.kotlin.idea.highlighter.markers.isHeaderOrHeaderClassMember
import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinCallableDefinitionUsage
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
import org.jetbrains.kotlin.psi.KtCallableDeclaration
import org.jetbrains.kotlin.psi.KtClass
import org.jetbrains.kotlin.psi.KtFunction
import org.jetbrains.kotlin.psi.KtNamedDeclaration
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.DescriptorUtils
import java.util.*
@@ -99,14 +96,22 @@ class KotlinChangeSignatureData(
override val affectedCallables: Collection<UsageInfo> by lazy {
primaryCallables + primaryCallables.flatMapTo(HashSet<UsageInfo>()) { primaryFunction ->
val primaryDeclaration = primaryFunction.declaration as? KtCallableDeclaration ?: return@flatMapTo emptyList()
val primaryDeclaration = primaryFunction.declaration as? KtDeclaration ?: return@flatMapTo emptyList()
if (primaryDeclaration.isHeaderOrHeaderClassMember()) {
return@flatMapTo primaryDeclaration.headerImplementations().map {
KotlinCallableDefinitionUsage<PsiElement>(it, it.resolveToDescriptor() as CallableDescriptor, primaryFunction, null)
return@flatMapTo primaryDeclaration.headerImplementations().mapNotNull {
val descriptor = it.resolveToDescriptor()
val callableDescriptor = when (descriptor) {
is CallableDescriptor -> descriptor
is ClassDescriptor -> descriptor.unsubstitutedPrimaryConstructor ?: return@mapNotNull null
else -> return@mapNotNull null
}
KotlinCallableDefinitionUsage<PsiElement>(it, callableDescriptor, primaryFunction, null)
}
}
if (primaryDeclaration !is KtCallableDeclaration) return@flatMapTo emptyList()
primaryDeclaration.toLightMethods().flatMap { baseMethod ->
OverridingMethodsSearch
.search(baseMethod)
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt
-2
View File
@@ -229,8 +229,6 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
for (reference in findReferences(functionPsi)) {
val element = reference.element
if (functionPsi is KtClass && reference.resolve() !== functionPsi) continue
if (element is KtReferenceExpression) {
var parent = element.parent
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructor/after/Common/Common.iml
Vendored
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="Common (experimental) " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructor/after/Common/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
header class C(n: Int, b: Boolean)
fun test() {
C(1, false)
}
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructor/after/JS/JS.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JavaScript " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructor/after/JS/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(s: String) {
constructor(n: Int, b: Boolean): this("")
}
fun test() {
C("1")
C(1, false)
}
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructor/after/JVM/JVM.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructor/after/JVM/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(n: Int, b: Boolean) {
constructor(s: String): this(1, false)
}
fun test() {
C("1")
C(1, false)
}
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructor/before/Common/Common.iml
Vendored
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="Common (experimental) " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructor/before/Common/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
header class <caret>C(n: Int)
fun test() {
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructor/before/JS/JS.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JavaScript " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructor/before/JS/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(s: String) {
constructor(n: Int): this("")
}
fun test() {
C("1")
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructor/before/JVM/JVM.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructor/before/JVM/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(n: Int) {
constructor(s: String): this(1)
}
fun test() {
C("1")
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructorNoParams/after/Common/Common.iml
Vendored
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="Common (experimental) " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructorNoParams/after/Common/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
header class C(n: Int)
fun test() {
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructorNoParams/after/JS/JS.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JavaScript " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructorNoParams/after/JS/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
impl class C(n: Int)
fun test() {
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructorNoParams/after/JVM/JVM.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructorNoParams/after/JVM/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
impl class C(n: Int)
fun test() {
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructorNoParams/before/Common/Common.iml
Vendored
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="Common (experimental) " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructorNoParams/before/Common/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
header class <caret>C
fun test() {
C()
}
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructorNoParams/before/JS/JS.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JavaScript " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructorNoParams/before/JS/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
impl class C()
fun test() {
C()
}
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructorNoParams/before/JVM/JVM.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerPrimaryConstructorNoParams/before/JVM/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
impl class C
fun test() {
C()
}
idea/testData/refactoring/changeSignatureMultiModule/headerSecondaryConstructor/after/Common/Common.iml
Vendored
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="Common (experimental) " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerSecondaryConstructor/after/Common/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
header class C(s: String) {
constructor(n: Int, b: Boolean): this("")
}
fun test() {
C(1, false)
C("1")
}
idea/testData/refactoring/changeSignatureMultiModule/headerSecondaryConstructor/after/JS/JS.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JavaScript " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerSecondaryConstructor/after/JS/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(s: String) {
constructor(n: Int, b: Boolean): this("")
}
fun test() {
C("1")
C(1, false)
}
idea/testData/refactoring/changeSignatureMultiModule/headerSecondaryConstructor/after/JVM/JVM.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerSecondaryConstructor/after/JVM/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(n: Int, b: Boolean) {
constructor(s: String): this(1, false)
}
fun test() {
C("1")
C(1, false)
}
idea/testData/refactoring/changeSignatureMultiModule/headerSecondaryConstructor/before/Common/Common.iml
Vendored
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="Common (experimental) " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerSecondaryConstructor/before/Common/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
header class C(s: String) {
<caret>constructor(n: Int): this("")
}
fun test() {
C(1)
C("1")
}
idea/testData/refactoring/changeSignatureMultiModule/headerSecondaryConstructor/before/JS/JS.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JavaScript " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerSecondaryConstructor/before/JS/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(s: String) {
constructor(n: Int): this("")
}
fun test() {
C("1")
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/headerSecondaryConstructor/before/JVM/JVM.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/headerSecondaryConstructor/before/JVM/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(n: Int) {
constructor(s: String): this(1)
}
fun test() {
C("1")
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructor/after/Common/Common.iml
Vendored
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="Common (experimental) " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructor/after/Common/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
header class C(n: Int, b: Boolean)
fun test() {
C(1, false)
}
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructor/after/JS/JS.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JavaScript " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructor/after/JS/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(s: String) {
constructor(n: Int, b: Boolean): this("")
}
fun test() {
C("1")
C(1, false)
}
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructor/after/JVM/JVM.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructor/after/JVM/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(n: Int, b: Boolean) {
constructor(s: String): this(1, false)
}
fun test() {
C("1")
C(1, false)
}
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructor/before/Common/Common.iml
Vendored
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="Common (experimental) " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructor/before/Common/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
header class C(n: Int)
fun test() {
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructor/before/JS/JS.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JavaScript " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructor/before/JS/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(s: String) {
constructor(n: Int): this("")
}
fun test() {
C("1")
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructor/before/JVM/JVM.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructor/before/JVM/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C<caret>(n: Int) {
constructor(s: String): this(1)
}
fun test() {
C("1")
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructorNoParams/after/Common/Common.iml
Vendored
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="Common (experimental) " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructorNoParams/after/Common/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
header class C(n: Int)
fun test() {
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructorNoParams/after/JS/JS.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JavaScript " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructorNoParams/after/JS/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
impl class C(n: Int)
fun test() {
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructorNoParams/after/JVM/JVM.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructorNoParams/after/JVM/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
impl class C(n: Int)
fun test() {
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructorNoParams/before/Common/Common.iml
Vendored
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="Common (experimental) " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructorNoParams/before/Common/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
header class C
fun test() {
C()
}
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructorNoParams/before/JS/JS.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JavaScript " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructorNoParams/before/JS/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
impl class C()
fun test() {
C()
}
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructorNoParams/before/JVM/JVM.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implPrimaryConstructorNoParams/before/JVM/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
impl class <caret>C
fun test() {
C()
}
idea/testData/refactoring/changeSignatureMultiModule/implSecondaryConstructor/after/Common/Common.iml
Vendored
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="Common (experimental) " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implSecondaryConstructor/after/Common/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
header class C(s: String) {
constructor(n: Int, b: Boolean): this("")
}
fun test() {
C(1, false)
C("1")
}
idea/testData/refactoring/changeSignatureMultiModule/implSecondaryConstructor/after/JS/JS.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JavaScript " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implSecondaryConstructor/after/JS/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(s: String) {
constructor(n: Int, b: Boolean): this("")
}
fun test() {
C("1")
C(1, false)
}
idea/testData/refactoring/changeSignatureMultiModule/implSecondaryConstructor/after/JVM/JVM.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implSecondaryConstructor/after/JVM/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(n: Int, b: Boolean) {
constructor(s: String): this(1, false)
}
fun test() {
C("1")
C(1, false)
}
idea/testData/refactoring/changeSignatureMultiModule/implSecondaryConstructor/before/Common/Common.iml
Vendored
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="Common (experimental) " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implSecondaryConstructor/before/Common/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
header class C(s: String) {
constructor(n: Int): this("")
}
fun test() {
C(1)
C("1")
}
idea/testData/refactoring/changeSignatureMultiModule/implSecondaryConstructor/before/JS/JS.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JavaScript " useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implSecondaryConstructor/before/JS/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(s: String) {
<caret>constructor(n: Int): this("")
}
fun test() {
C("1")
C(1)
}
idea/testData/refactoring/changeSignatureMultiModule/implSecondaryConstructor/before/JVM/JVM.iml
Vendored
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="2" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings/>
<compilerArguments/>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Common" />
</component>
</module>
idea/testData/refactoring/changeSignatureMultiModule/implSecondaryConstructor/before/JVM/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
impl class C(n: Int) {
constructor(s: String): this(1)
}
fun test() {
C("1")
C(1)
}
idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt
+1 -1
View File
@@ -62,7 +62,7 @@ import java.util.*
class KotlinChangeSignatureTest : KotlinLightCodeInsightFixtureTestCase() {
companion object {
private val BUILT_INS = DefaultBuiltIns.Instance
internal val BUILT_INS = DefaultBuiltIns.Instance
private val EXTENSIONS = arrayOf(".kt", ".java")
}
idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMultiModuleChangeSignatureTest.kt
+38
View File
@@ -23,7 +23,9 @@ import org.jetbrains.kotlin.idea.test.KotlinMultiFileTestCase
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.idea.test.extractMarkerOffset
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtPsiFactory
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.types.KotlinType
class KotlinMultiModuleChangeSignatureTest : KotlinMultiFileTestCase() {
init {
@@ -48,6 +50,18 @@ class KotlinMultiModuleChangeSignatureTest : KotlinMultiFileTestCase() {
}
}
private fun KotlinChangeInfo.addParameter(name: String, type: KotlinType, defaultValue: String) {
addParameter(
KotlinParameterInfo(
originalBaseFunctionDescriptor,
-1,
name,
KotlinTypeInfo(false, type),
defaultValueForCall = KtPsiFactory(project).createExpression(defaultValue)
)
)
}
fun testHeadersAndImplsByHeaderFun() = doTest("Common/src/test/test.kt") {
newName = "baz"
}
@@ -63,4 +77,28 @@ class KotlinMultiModuleChangeSignatureTest : KotlinMultiFileTestCase() {
fun testHeadersAndImplsByImplClassMemberFun() = doTest("JS/src/test/test.kt") {
newName = "baz"
}
fun testHeaderPrimaryConstructorNoParams() = doTest("Common/src/test/test.kt") {
addParameter("n", KotlinChangeSignatureTest.BUILT_INS.intType, "1")
}
fun testHeaderPrimaryConstructor() = doTest("Common/src/test/test.kt") {
addParameter("b", KotlinChangeSignatureTest.BUILT_INS.booleanType, "false")
}
fun testHeaderSecondaryConstructor() = doTest("Common/src/test/test.kt") {
addParameter("b", KotlinChangeSignatureTest.BUILT_INS.booleanType, "false")
}
fun testImplPrimaryConstructorNoParams() = doTest("JVM/src/test/test.kt") {
addParameter("n", KotlinChangeSignatureTest.BUILT_INS.intType, "1")
}
fun testImplPrimaryConstructor() = doTest("JVM/src/test/test.kt") {
addParameter("b", KotlinChangeSignatureTest.BUILT_INS.booleanType, "false")
}
fun testImplSecondaryConstructor() = doTest("JS/src/test/test.kt") {
addParameter("b", KotlinChangeSignatureTest.BUILT_INS.booleanType, "false")
}
}