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

JavaChangeSignatureDialog: diagnostics for EA-121611

Browse Source
This commit is contained in:
Tagir Valeev
2018-06-01 12:12:25 +07:00
parent bf0125eb3a
commit 1e2dc48e11
1 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureDialog.java
+28 -16
View File
@@ -22,6 +22,7 @@ import com.intellij.icons.AllIcons;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CustomShortcutSet;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.colors.EditorFontType;
@@ -91,6 +92,8 @@ import static com.intellij.refactoring.changeSignature.ChangeSignatureHandler.RE
* @author Konstantin Bulenkov
*/
public class JavaChangeSignatureDialog extends ChangeSignatureDialogBase<ParameterInfoImpl, PsiMethod, String, JavaMethodDescriptor, ParameterTableModelItemBase<ParameterInfoImpl>, JavaParameterTableModel> {
private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.changeSignature.JavaChangeSignatureDialog");
private ExceptionsTableModel myExceptionsModel;
protected Set<PsiMethod> myMethodsToPropagateExceptions;
private AnActionButton myPropExceptionsButton;
@@ -705,25 +708,34 @@ public class JavaChangeSignatureDialog extends ChangeSignatureDialogBase<Paramet
final StringBuilder buffer = new StringBuilder();
final PsiModifierList modifierList = method.getModifierList();
PsiModifierList copy = (PsiModifierList)modifierList.copy();
PsiAnnotation annotation = copy.findAnnotation(JavaMethodContractUtil.ORG_JETBRAINS_ANNOTATIONS_CONTRACT);
if (annotation != null) {
String[] oldNames = ContainerUtil.map2Array(method.getParameterList().getParameters(), String.class, PsiParameter::getName);
JavaParameterInfo[] parameters = ContainerUtil.map2Array(myParametersTableModel.getItems(), JavaParameterInfo.class, item -> item.parameter);
try {
PsiAnnotation converted = ContractConverter.convertContract(method, oldNames, parameters);
if (converted != null && converted != annotation) {
annotation.replace(converted);
String modifiers = "";
if (copy == null) {
LOG.error(new RuntimeException(
"Unexpected null-copy; original modifier list: " + modifierList.getClass().getName() + ":" + modifierList.getText()));
}
else {
PsiAnnotation annotation = copy.findAnnotation(JavaMethodContractUtil.ORG_JETBRAINS_ANNOTATIONS_CONTRACT);
if (annotation != null) {
String[] oldNames = ContainerUtil.map2Array(method.getParameterList().getParameters(), String.class, PsiParameter::getName);
JavaParameterInfo[] parameters =
ContainerUtil.map2Array(myParametersTableModel.getItems(), JavaParameterInfo.class, item -> item.parameter);
try {
PsiAnnotation converted = ContractConverter.convertContract(method, oldNames, parameters);
if (converted != null && converted != annotation) {
annotation.replace(converted);
}
}
catch (ContractConverter.ContractConversionException ignored) {
}
}
catch (ContractConverter.ContractConversionException ignored) { }
final String oldModifier = VisibilityUtil.getVisibilityModifier(modifierList);
@PsiModifier.ModifierConstant final String newModifier = ObjectUtils.notNull(getVisibility(), PsiModifier.PACKAGE_LOCAL);
if (!Comparing.equal(newModifier, oldModifier)) {
copy.setModifierProperty(oldModifier, false);
copy.setModifierProperty(newModifier, true);
}
modifiers = copy.getText().replaceAll("\n\\s+", "\n");
}
final String oldModifier = VisibilityUtil.getVisibilityModifier(modifierList);
@PsiModifier.ModifierConstant final String newModifier = ObjectUtils.notNull(getVisibility(), PsiModifier.PACKAGE_LOCAL);
if (!Comparing.equal(newModifier, oldModifier)) {
copy.setModifierProperty(oldModifier, false);
copy.setModifierProperty(newModifier, true);
}
String modifiers = copy.getText().replaceAll("\n\\s+", "\n");
buffer.append(modifiers);
if (modifiers.length() > 0 &&