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

type may be weakened: preserve comments

Browse Source
This commit is contained in:
Anna.Kozlova
2018-08-14 15:06:25 +02:00
parent 2a8a14a528
commit 180f78be9e
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java
+5 -8
View File
@@ -28,9 +28,7 @@ import com.intellij.openapi.command.undo.BasicUndoableAction;
import com.intellij.openapi.command.undo.UndoManager;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.progress.ProgressIndicatorProvider;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.VerticalFlowLayout;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.ListPopup;
import com.intellij.openapi.ui.popup.PopupStep;
@@ -44,7 +42,6 @@ import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.ui.components.JBScrollBar;
import com.intellij.ui.components.JBScrollPane;
import com.intellij.ui.components.panels.VerticalBox;
import com.intellij.util.ObjectUtils;
@@ -52,6 +49,7 @@ import com.intellij.util.Query;
import com.intellij.util.containers.OrderedSet;
import com.siyeh.InspectionGadgetsBundle;
import com.siyeh.ig.psiutils.ClassUtils;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.MethodUtils;
import com.siyeh.ig.psiutils.WeakestTypeFinder;
import com.siyeh.ig.ui.UiUtils;
@@ -63,9 +61,7 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.*;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;
public class TypeMayBeWeakenedInspection extends AbstractBaseJavaLocalInspectionTool {
@@ -345,10 +341,11 @@ public class TypeMayBeWeakenedInspection extends AbstractBaseJavaLocalInspection
final PsiElement replacement;
if (isInferredType) {
PsiTypeElement newTypeElement = factory.createTypeElement(classType);
replacement = typeElement.replace(newTypeElement);
} else {
replacement = new CommentTracker().replaceAndRestoreComments(typeElement, newTypeElement);
}
else {
final PsiJavaCodeReferenceElement referenceElement = factory.createReferenceElementByType(classType);
replacement = componentReferenceElement.replace(referenceElement);
replacement = new CommentTracker().replaceAndRestoreComments(componentReferenceElement, referenceElement);
}
final JavaCodeStyleManager javaCodeStyleManager = JavaCodeStyleManager.getInstance(project);
javaCodeStyleManager.shortenClassReferences(replacement);
plugins/InspectionGadgets/test/com/siyeh/igfixes/abstraction/type_may_be_weakened/Generic.after.java
+2 -1
View File
@@ -14,7 +14,8 @@ class A <T1, T2> extends B {}
class Main {
public static void main(String[] args) {
C<String> nonGeneric = new A<>();
//comment
C<String> nonGeneric = new A<>();
nonGeneric.foo();
}
}
plugins/InspectionGadgets/test/com/siyeh/igfixes/abstraction/type_may_be_weakened/Generic.java
+2 -1
View File
@@ -14,7 +14,8 @@ class A <T1, T2> extends B {}
class Main {
public static void main(String[] args) {
A<Integer, String> n<caret>onGeneric = new A<>();
A<Integer, //comment
String> n<caret>onGeneric = new A<>();
nonGeneric.foo();
}
}