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

Generate error tip for rename kotlin package klass from java

Browse Source
This commit is contained in:
Nikolay Krasko
2013-11-25 16:15:09 +04:00
parent 76562f9aa5
commit ce810d3a55
9 changed files with 103 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/JetBundle.properties
+1
View File
@@ -55,6 +55,7 @@ specify.type.explicitly.add.action.name=Specify type explicitly
specify.type.explicitly.remove.action.name=Remove explicitly specified type
rename.parameter.to.match.overridden.method=Rename parameter to match overridden method
rename.family=Rename
rename.kotlin.package.class.error="Can't rename kotlin package class"
add.semicolon.after.invocation=Add semicolon after invocation of ''{0}''
add.semicolon.family=Add Semicolon
change.function.return.type=Change ''{0}'' function return type to ''{1}''
idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java
+36 -18
View File
@@ -19,14 +19,18 @@ package org.jetbrains.jet.plugin.refactoring.rename;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.rename.RenamePsiElementProcessor;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.asJava.KotlinLightClass;
import org.jetbrains.jet.asJava.KotlinLightClassForExplicitDeclaration;
import org.jetbrains.jet.asJava.KotlinLightClassForPackage;
import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.plugin.JetBundle;
import java.util.Map;
@@ -39,11 +43,41 @@ public class RenameJetClassProcessor extends RenamePsiElementProcessor {
@Nullable
@Override
public PsiElement substituteElementToRename(PsiElement element, @Nullable Editor editor) {
return getJetClassOrObject(element, true, editor);
}
@Override
public void prepareRenaming(PsiElement element, String newName, Map<PsiElement, String> allRenames) {
JetClassOrObject classOrObject = getJetClassOrObject(element, false, null);
if (classOrObject != null) {
JetFile file = (JetFile) classOrObject.getContainingFile();
VirtualFile virtualFile = file.getVirtualFile();
if (virtualFile != null) {
String nameWithoutExtensions = virtualFile.getNameWithoutExtension();
if (nameWithoutExtensions.equals(classOrObject.getName())) {
allRenames.put(file, newName + "." + virtualFile.getExtension());
}
}
}
}
@Nullable
private static JetClassOrObject getJetClassOrObject(@Nullable PsiElement element, boolean showErrors, @Nullable Editor editor) {
if (element instanceof KotlinLightClass) {
if (element instanceof KotlinLightClassForExplicitDeclaration) {
return element.getNavigationElement();
return ((KotlinLightClassForExplicitDeclaration) element).getJetClassOrObject();
}
else if (element instanceof KotlinLightClassForPackage) {
if (showErrors) {
CommonRefactoringUtil.showErrorHint(
element.getProject(), editor,
JetBundle.message("rename.kotlin.package.class.error"),
RefactoringBundle.message("rename.title"),
null);
}
// Cancel rename
return null;
}
@@ -52,22 +86,6 @@ public class RenameJetClassProcessor extends RenamePsiElementProcessor {
}
}
return element;
}
@Override
public void prepareRenaming(PsiElement element, String newName, Map<PsiElement, String> allRenames) {
JetClassOrObject clazz = (JetClassOrObject) element;
JetFile file = (JetFile) clazz.getContainingFile();
VirtualFile virtualFile = file.getVirtualFile();
if (virtualFile != null) {
String nameWithoutExtensions = virtualFile.getNameWithoutExtension();
if (nameWithoutExtensions.equals(clazz.getName())) {
allRenames.put(file, newName + "." + virtualFile.getExtension());
}
}
super.prepareRenaming(element, newName, allRenames);
return (JetClassOrObject) element;
}
}
idea/testData/refactoring/rename/renameKotlinPackageClass/after/RenameKotlinClass.kt
+3
View File
@@ -0,0 +1,3 @@
package testing.rename
fun test() = 12
idea/testData/refactoring/rename/renameKotlinPackageClass/after/testing/JavaClient.java
+9
View File
@@ -0,0 +1,9 @@
package testing;
import testing.rename.RenamePackage;
class JavaClient {
void foo() {
RenamePackage.test();
}
}
idea/testData/refactoring/rename/renameKotlinPackageClass/before/RenameKotlinClass.kt
+3
View File
@@ -0,0 +1,3 @@
package testing.rename
fun test() = 12
idea/testData/refactoring/rename/renameKotlinPackageClass/before/testing/JavaClient.java
+9
View File
@@ -0,0 +1,9 @@
package testing;
import testing.rename.RenamePackage;
class JavaClient {
void foo() {
RenamePackage.test();
}
}
idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test
+2
View File
@@ -0,0 +1,2 @@
// RENAME: JAVA_CLASS->testing.rename.RenamePackage->NewPackageName
// HINT: Can't rename kotlin package class
idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.java
+35 -18
View File
@@ -68,27 +68,44 @@ public abstract class AbstractRenameTest extends MultiFileTestCase {
String[] strings = renameDirective.split("->");
Assert.assertTrue("'// RENAME:' directive should have at least AbstractRenameTest.RenameType parameter", strings.length > 0);
String hintDirective = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// HINT:");
String renameTypeStr = strings[0];
RenameType type = RenameType.valueOf(renameTypeStr);
FqNameUnsafe fqNameUnsafe = new FqNameUnsafe(strings[1]);
switch (type) {
case JAVA_CLASS:
renameJavaClassTest(fqNameUnsafe.asString(), strings[2]);
break;
case JAVA_METHOD:
renameJavaMethodTest(fqNameUnsafe.asString(), strings[2], strings[3]);
break;
case KOTLIN_CLASS:
renameKotlinClassTest(fqNameUnsafe.toSafe(), strings[2]);
break;
case KOTLIN_FUNCTION:
renameKotlinFunctionTest(fqNameUnsafe.parent().toSafe(),fqNameUnsafe.shortName().asString(), strings[2]);
break;
case KOTLIN_PROPERTY:
renameKotlinPropertyTest(fqNameUnsafe.parent().toSafe(), fqNameUnsafe.shortName().asString(), strings[2]);
break;
try {
FqNameUnsafe fqNameUnsafe = new FqNameUnsafe(strings[1]);
switch (type) {
case JAVA_CLASS:
renameJavaClassTest(fqNameUnsafe.asString(), strings[2]);
break;
case JAVA_METHOD:
renameJavaMethodTest(fqNameUnsafe.asString(), strings[2], strings[3]);
break;
case KOTLIN_CLASS:
renameKotlinClassTest(fqNameUnsafe.toSafe(), strings[2]);
break;
case KOTLIN_FUNCTION:
renameKotlinFunctionTest(fqNameUnsafe.parent().toSafe(),fqNameUnsafe.shortName().asString(), strings[2]);
break;
case KOTLIN_PROPERTY:
renameKotlinPropertyTest(fqNameUnsafe.parent().toSafe(), fqNameUnsafe.shortName().asString(), strings[2]);
break;
}
if (hintDirective != null) {
Assert.fail(String.format("Hint \"%s\" was expected", hintDirective));
}
}
catch (CommonRefactoringUtil.RefactoringErrorHintException hintException) {
String hintExceptionUnquoted = StringUtil.unquoteString(hintException.getMessage());
if (hintDirective != null) {
Assert.assertEquals(hintDirective, hintExceptionUnquoted);
}
else {
Assert.fail(String.format("Unexpected hint: // HINT: %s", hintExceptionUnquoted));
}
}
}
catch (Exception e) {
idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java
+5
View File
@@ -61,4 +61,9 @@ public class RenameTestGenerated extends AbstractRenameTest {
doTest("idea/testData/refactoring/rename/renameKotlinMethod/renameKotlinMethod.test");
}
@TestMetadata("renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test")
public void testRenameKotlinPackageClass_JavaWrapperForKotlinPackageClass() throws Exception {
doTest("idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test");
}
}