MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

process c-style arrays in setInitializer (IDEA-20538 )

Browse Source
This commit is contained in:
anna
2011-08-26 17:57:19 +02:00
parent 79e57eb2d3
commit 9bc5f34ff8
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java
View File

@@ -23,6 +23,7 @@ import com.intellij.psi.impl.GeneratedMarkerVisitor;
import com.intellij.psi.impl.source.PsiTypeElementImpl;
import com.intellij.psi.impl.source.SourceTreeToPsiMap;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
import com.intellij.util.CharTable;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
@@ -154,7 +155,9 @@ public class JavaSharedImplUtil {
if (eq == null) {
final CharTable charTable = SharedImplUtil.findCharTableByTree(variableElement);
eq = Factory.createSingleLeafElement(JavaTokenType.EQ, "=", 0, 1, charTable, variable.getManager());
variableElement.addInternal((TreeElement)eq, eq, variable.getNameIdentifier().getNode(), Boolean.FALSE);
PsiElement element = variable.getNameIdentifier();
final ASTNode node = TreeUtil.skipElements(element.getNode().getTreeNext(), TokenSet.orSet(ElementType.WHITE_SPACE_BIT_SET, TokenSet.create(JavaTokenType.LBRACKET, JavaTokenType.RBRACKET)));
variableElement.addInternal((TreeElement)eq, eq, node, Boolean.TRUE);
eq = variableElement.findChildByRole(ChildRole.INITIALIZER_EQ);
}
variable.addAfter(initializer, eq.getPsi());

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/afterCBrackets.java Normal file
View File

@@ -0,0 +1,8 @@
// "Move assignment to field declaration" "true"
public class Foo {
protected boolean isString[] = new boolean[123];
public Foo() {
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/beforeCBrackets.java Normal file
View File

@@ -0,0 +1,9 @@
// "Move assignment to field declaration" "true"
public class Foo {
protected boolean isString[] ;
public Foo() {
isSt<caret>ring = new boolean[123];
}
}