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

Safe Delete: Support header/impl declarations

Browse Source 
#KT-18433 Fixed
This commit is contained in:
Alexey Sedunov
2017-08-11 16:47:26 +03:00
parent 1215b2864b
commit 787bbe9a4c
314 changed files with 4195 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/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/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/Common/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
header class Foo {
constructor()
}
fun test() {
Foo()
Foo()
}
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/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/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JS/src/test/test.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
package test
impl class Foo() {
val x = n + 1
constructor(s: String): this(0)
}
fun test() {
Foo("1")
Foo(s = "1")
Foo()
Foo()
}
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/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/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/after/JVM/src/test/test.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
package test
impl class Foo(s: String) {
constructor(): this("") {
val x = n + 1
}
}
fun test() {
Foo("1")
Foo(s = "1")
Foo()
Foo()
}
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/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/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/Common/src/test/test.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
package test
header class Foo {
constructor(<caret>n: Int)
}
fun test() {
Foo(1)
Foo(n = 1)
}
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/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/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JS/src/test/test.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
package test
impl class Foo(n: Int) {
val x = n + 1
constructor(s: String): this(0)
}
fun test() {
Foo("1")
Foo(s = "1")
Foo(1)
Foo(n = 1)
}
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/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/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/before/JVM/src/test/test.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
package test
impl class Foo(s: String) {
constructor(n: Int): this("") {
val x = n + 1
}
}
fun test() {
Foo("1")
Foo(s = "1")
Foo(1)
Foo(n = 1)
}
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/conflicts.txt
Vendored
+1
View File
@@ -0,0 +1 @@
parameter n has 2 usages that are not safe to delete.
idea/testData/refactoring/safeDeleteMultiModule/byHeaderClassSecondaryConstructorParameter/headersAndImplsByHeaderClassSecondaryConstructorParameter.test
Vendored
+4
View File
@@ -0,0 +1,4 @@
{
"mainFile": "Common/src/test/test.kt",
"elementClass": "org.jetbrains.kotlin.psi.KtParameter"
}