Move: Add conflict checking for "Move directory with classes" case
This commit is contained in:
Vendored
+11
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<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>
|
||||
+8
@@ -0,0 +1,8 @@
|
||||
package test.pack
|
||||
|
||||
import test2.J
|
||||
|
||||
class Bar {
|
||||
internal val foo = Foo()
|
||||
val j = J()
|
||||
}
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
package test.pack
|
||||
|
||||
import test2.J
|
||||
|
||||
internal class Foo {
|
||||
val j = J()
|
||||
}
|
||||
Vendored
+11
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<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>
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
package test2;
|
||||
|
||||
import test2.pack.Foo;
|
||||
|
||||
public class J {
|
||||
Foo foo = new Foo();
|
||||
}
|
||||
Reference in New Issue
Block a user