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

Cleanup (formatting)

Browse Source
This commit is contained in:
Roman Shevchenko
2017-07-13 12:55:25 +02:00
parent 49f12ad572
commit ac8b9ae4ee
8 changed files with 65 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java
+49 -40
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,9 +22,12 @@ import com.intellij.psi.impl.source.tree.*;
import com.intellij.psi.scope.ElementClassHint;
import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.psi.tree.TokenSet;
import com.intellij.util.CharTable;
import org.jetbrains.annotations.NotNull;
public class PsiDeclarationStatementImpl extends CompositePsiElement implements PsiDeclarationStatement {
private static final TokenSet DECLARED_ELEMENT_BIT_SET = TokenSet.create(JavaElementType.LOCAL_VARIABLE, JavaElementType.CLASS);
public PsiDeclarationStatementImpl() {
super(JavaElementType.DECLARATION_STATEMENT);
}
@@ -35,8 +38,6 @@ public class PsiDeclarationStatementImpl extends CompositePsiElement implements
return getChildrenAsPsiElements(DECLARED_ELEMENT_BIT_SET, PsiElement.ARRAY_FACTORY);
}
private static final TokenSet DECLARED_ELEMENT_BIT_SET = TokenSet.create(JavaElementType.LOCAL_VARIABLE, JavaElementType.CLASS);
@Override
public int getChildRole(ASTNode child) {
if (child.getElementType() == JavaTokenType.COMMA) return ChildRole.COMMA;
@@ -48,30 +49,33 @@ public class PsiDeclarationStatementImpl extends CompositePsiElement implements
if (DECLARED_ELEMENT_BIT_SET.contains(child.getElementType())) {
PsiElement[] declaredElements = getDeclaredElements();
int length = declaredElements.length;
if (length == 1) {
getTreeParent().deleteChildInternal(this);
return;
}
if (length > 0) {
if (length == 1) {
getTreeParent().deleteChildInternal(this);
return;
} else {
if (SourceTreeToPsiMap.psiElementToTree(declaredElements[length - 1]) == child) {
removeCommaBefore(child);
final LeafElement semicolon = Factory.createSingleLeafElement(JavaTokenType.SEMICOLON, ";", 0, 1,
SharedImplUtil.findCharTableByTree(this), getManager());
SourceTreeToPsiMap.psiElementToTree(declaredElements[length - 2]).addChild(semicolon, null);
}
else if (SourceTreeToPsiMap.psiElementToTree(declaredElements[0]) == child) {
CompositeElement next = (CompositeElement)SourceTreeToPsiMap.psiElementToTree(declaredElements[1]);
ASTNode copyChild = child.copyElement();
ASTNode nameChild = ((CompositeElement)copyChild).findChildByRole(ChildRole.NAME);
removeCommaBefore(next);
next.addInternal((TreeElement)copyChild.getFirstChildNode(), nameChild.getTreePrev(), null, Boolean.FALSE);
}
else {
removeCommaBefore (child);
}
if (SourceTreeToPsiMap.psiElementToTree(declaredElements[length - 1]) == child) {
removeCommaBefore(child);
CharTable charTable = SharedImplUtil.findCharTableByTree(this);
LeafElement semicolon = Factory.createSingleLeafElement(JavaTokenType.SEMICOLON, ";", charTable, getManager());
SourceTreeToPsiMap.psiToTreeNotNull(declaredElements[length - 2]).addChild(semicolon, null);
}
else if (SourceTreeToPsiMap.psiElementToTree(declaredElements[0]) == child) {
CompositeElement next = (CompositeElement)SourceTreeToPsiMap.psiToTreeNotNull(declaredElements[1]);
ASTNode copyChild = child.copyElement();
ASTNode nameChild = ((CompositeElement)copyChild).findChildByRole(ChildRole.NAME);
assert nameChild != null;
removeCommaBefore(next);
next.addInternal((TreeElement)copyChild.getFirstChildNode(), nameChild.getTreePrev(), null, Boolean.FALSE);
}
else {
removeCommaBefore(child);
}
}
}
super.deleteChildInternal(child);
}
@@ -79,8 +83,11 @@ public class PsiDeclarationStatementImpl extends CompositePsiElement implements
ASTNode prev = child;
do {
prev = prev.getTreePrev();
} while (prev != null && ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(prev.getElementType()));
if (prev != null && prev.getElementType() == JavaTokenType.COMMA) deleteChildInternal(prev);
}
while (prev != null && ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(prev.getElementType()));
if (prev != null && prev.getElementType() == JavaTokenType.COMMA) {
deleteChildInternal(prev);
}
}
@Override
@@ -93,28 +100,30 @@ public class PsiDeclarationStatementImpl extends CompositePsiElement implements
}
}
public String toString() {
return "PsiDeclarationStatement";
}
@Override
public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place) {
public boolean processDeclarations(@NotNull PsiScopeProcessor processor,
@NotNull ResolveState state,
PsiElement lastParent,
@NotNull PsiElement place) {
processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, this);
PsiElement[] decls = getDeclaredElements();
for (PsiElement decl : decls) {
if (decl != lastParent) {
if (!processor.execute(decl, state)) return false;
for (PsiElement element : getDeclaredElements()) {
if (element != lastParent) {
if (!processor.execute(element, state)) return false;
}
else {
final ElementClassHint hint = processor.getHint(ElementClassHint.KEY);
if (lastParent instanceof PsiClass) {
if (hint == null || hint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)) {
if (!processor.execute(lastParent, state)) return false;
}
ElementClassHint hint = processor.getHint(ElementClassHint.KEY);
if (lastParent instanceof PsiClass && (hint == null || hint.shouldProcess(ElementClassHint.DeclarationKind.CLASS))) {
if (!processor.execute(lastParent, state)) return false;
}
}
}
return true;
}
}
@Override
public String toString() {
return "PsiDeclarationStatement";
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/afterIncompleteConstructor.java
+1 -1
View File
@@ -1,6 +1,6 @@
// "Initialize in constructor" "true"
class A {
private final int var;
private final int var;
private Main() {
var = 0;
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/beforeIncompleteConstructor.java
+2 -2
View File
@@ -1,6 +1,6 @@
// "Initialize in constructor" "true"
class A {
private final int v<caret>ar;
private final int v<caret>ar;
private Main()
private Main()
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/after12.java
+4 -5
View File
@@ -3,10 +3,9 @@ import java.io.*;
class a {
int k;
private int run() {
/*ddddd*/ Object oo = (Object) new Integer(0);
return 0;
/*ddddd*/ Object oo = (Object) new Integer(0);
return 0;
}
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/before12.java
+4 -5
View File
@@ -3,10 +3,9 @@ import java.io.*;
class a {
int k;
private int run() {
Object <caret>o1, /*ddddd*/ oo = (Object) new Integer(0);
return 0;
Object <caret>o1, /*ddddd*/ oo = (Object) new Integer(0);
return 0;
}
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/InitializeFinalFieldInConstructorFixTest.java
+1 -1
View File
@@ -25,7 +25,7 @@ public class InitializeFinalFieldInConstructorFixTest extends LightQuickFixParam
enableInspectionTool(new UnusedDeclarationInspection());
}
public void test() throws Exception { doAllTests(); }
public void test() { doAllTests(); }
@Override
protected String getBasePath() {
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/RemoveUnusedVariableTest.java
+2 -7
View File
@@ -24,16 +24,11 @@ public class RemoveUnusedVariableTest extends LightQuickFixParameterizedTestCase
super.setUp();
enableInspectionTool(new UnusedDeclarationInspection());
}
public void test() throws Exception {
doAllTests();
}
public void test() { doAllTests(); }
@Override
protected String getBasePath() {
return "/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable";
}
}
}
java/java-tests/testSrc/com/intellij/java/parser/partial/FileParserTest.java
+2 -14
View File
@@ -40,20 +40,8 @@ public class FileParserTest extends JavaParsingTestCase {
public void testUnclosedImport3() { doParserTest("import static a"); }
public void testImportBrokenFromBeginning() { doParserTest("xx import a;"); }
public void testExtraSemicolons() {
doParserTest(
"package p;;\n" +
"import a;;\n" +
"class C{};");
}
public void testFileWithClass() {
doParserTest(
"package a;\n" +
"import b;\n" +
"public class C { }\n" +
"class D { }");
}
public void testExtraSemicolons() { doParserTest("package p;;\nimport a;;\nclass C{};"); }
public void testFileWithClass() { doParserTest("package a;\nimport b;\npublic class C { }\nclass D { }"); }
public void testBindBefore0() { doParserTest("class A{\n // comment\n int field;\n}"); }
public void testBindBefore1() { doParserTest("class A{\n // comment\n\n int field;\n}"); }