MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

non reifiable types: erase to avoid illegal generics array creation (IDEA-195562)

Browse Source
This commit is contained in:
Anna.Kozlova
2018-07-16 12:36:00 +02:00
parent 8c64535bb1
commit 23e9412db6
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java
View File

@@ -19,6 +19,7 @@ import com.intellij.codeInsight.FileModificationService;
import com.intellij.codeInsight.daemon.QuickFixBundle;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil;
import com.intellij.codeInsight.daemon.impl.analysis.JavaGenericsUtil;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.diagnostic.Logger;
@@ -32,6 +33,7 @@ import com.intellij.psi.codeStyle.JavaCodeStyleSettings;
import com.intellij.psi.controlFlow.ControlFlowUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
@@ -184,7 +186,8 @@ public class VariableAccessFromInnerClassFix implements IntentionAction {
variableDeclarationStatement = factory.createVariableDeclarationStatement(variable.getName(), newType, init);
}
else {
PsiExpression init = factory.createExpressionFromText("{ " + initializer.getText() + " }", variable);
String explicitArrayDeclaration = JavaGenericsUtil.isReifiableType(type) ? "" : "new " + TypeConversionUtil.erasure(type).getCanonicalText() + "[]";
PsiExpression init = factory.createExpressionFromText(explicitArrayDeclaration + "{ " + initializer.getText() + " }", variable);
variableDeclarationStatement = factory.createVariableDeclarationStatement(variable.getName(), newType, init);
}
PsiVariable newVariable = (PsiVariable)variableDeclarationStatement.getDeclaredElements()[0];

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mustBeFinal18/afterNonReifiableType.java Normal file
View File

@@ -0,0 +1,10 @@
// "Transform 'a' into final one element array" "true"
import java.util.*;
class Test {
public void test() {
final List<String>[] a = new List[]{new ArrayList<>()};
Runnable r = () -> {
a[0] = new ArrayList<>();
};
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mustBeFinal18/beforeNonReifiableType.java Normal file
View File

@@ -0,0 +1,10 @@
// "Transform 'a' into final one element array" "true"
import java.util.*;
class Test {
public void test() {
List<String> a = new ArrayList<>();
Runnable r = () -> {
<caret>a = new ArrayList<>();
};
}
}