MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

better fix for tests

Browse Source
This commit is contained in:
Maxim.Mossienko
2010-12-23 16:57:13 +03:00
parent a7df4effdd
commit 640bcc822d
3 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/refactoring/util/CommonRefactoringUtil.java
+3
View File
@@ -50,6 +50,9 @@ public class CommonRefactoringUtil {
dialog.show();
}
/**
* Fatal refactoring problem during unit test run. Corresponds to message of modal dialog shown during user driven refactoring.
*/
public static class RefactoringErrorHintException extends RuntimeException {
public RefactoringErrorHintException(String message) {
super(message);
platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java
+19 -22
View File
@@ -84,47 +84,44 @@ public class PsiElementRenameHandler implements RenameHandler {
rename(element, project, nameSuggestionContext, editor);
}
static boolean canRename(Project project, Editor editor, PsiElement element) {
if (element == null) return false;
if (!(element instanceof PsiFile) && CollectHighlightsUtil.isOutsideSourceRootJavaFile(element.getContainingFile())) return false;
if (!element.isWritable()) {
String message = RefactoringBundle.getCannotRefactorMessage("This element cannot be renamed.");
if (!ApplicationManager.getApplication().isUnitTestMode()) {
showErrorMessage(project, editor, message);
}
static boolean canRename(Project project, Editor editor, PsiElement element) throws CommonRefactoringUtil.RefactoringErrorHintException {
String message = renameabilityStatus(project, element);
if (message != null) {
if (message.length() > 0) showErrorMessage(project, editor, message);
return false;
}
return true;
}
static @Nullable String renameabilityStatus(Project project, PsiElement element) {
if (element == null) return "";
if (!(element instanceof PsiFile) && CollectHighlightsUtil.isOutsideSourceRootJavaFile(element.getContainingFile())) return "";
if (!element.isWritable()) {
return RefactoringBundle.getCannotRefactorMessage("This element cannot be renamed.");
}
boolean hasRenameProcessor = RenamePsiElementProcessor.forElement(element) != RenamePsiElementProcessor.DEFAULT;
boolean hasWritableMetaData = element instanceof PsiMetaOwner && ((PsiMetaOwner)element).getMetaData() instanceof PsiWritableMetaData;
if (!hasRenameProcessor && !hasWritableMetaData && !(element instanceof PsiNamedElement)) {
String message = RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("error.wrong.caret.position.symbol.to.rename"));
if (!ApplicationManager.getApplication().isUnitTestMode()) {
showErrorMessage(project, editor, message);
}
return false;
return RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("error.wrong.caret.position.symbol.to.rename"));
}
if (!PsiManager.getInstance(project).isInProject(element) && element.isPhysical()) {
String message = RefactoringBundle
return RefactoringBundle
.getCannotRefactorMessage(RefactoringBundle.message("error.out.of.project.element", UsageViewUtil.getType(element)));
showErrorMessage(project, editor, message);
return false;
}
if (InjectedLanguageUtil.isInInjectedLanguagePrefixSuffix(element)) {
String message = RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("error.in.injected.lang.prefix.suffix", UsageViewUtil.getType(element)));
showErrorMessage(project, editor, message);
return false;
return RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("error.in.injected.lang.prefix.suffix", UsageViewUtil.getType(element)));
}
return true;//CommonRefactoringUtil.checkReadOnlyStatus(project, element);
return null;
}
private static void showErrorMessage(Project project, @Nullable Editor editor, String message) {
static void showErrorMessage(Project project, @Nullable Editor editor, String message) {
CommonRefactoringUtil.showErrorHint(project, editor, message, RefactoringBundle.message("rename.title"), null);
}
platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
+9 -5
View File
@@ -405,14 +405,18 @@ public class RenameProcessor extends BaseRefactoringProcessor {
}
protected void prepareTestRun() {
try {
if (!PsiElementRenameHandler.canRename(myProject, null, myPrimaryElement)) return;
prepareRenaming(myPrimaryElement, myNewName, myAllRenames);
}
catch (CommonRefactoringUtil.RefactoringErrorHintException e) { // unit test mode
String s = PsiElementRenameHandler.renameabilityStatus(myProject, myPrimaryElement);
if (!StringUtil.isEmpty(s)) {
if (inTestsProduceExceptionOnBadRenameabilityStatus()) {
PsiElementRenameHandler.showErrorMessage(myProject, null, s);
}
return;
}
prepareRenaming(myPrimaryElement, myNewName, myAllRenames);
}
protected boolean inTestsProduceExceptionOnBadRenameabilityStatus() { return false; }
public Collection<String> getNewNames() {
return myAllRenames.values();
}