IDEA-134020 ctrl+shift+enter complete error to "package some.pkg"

This commit is contained in:
peter
2015-01-05 16:09:07 +01:00
parent 6a91c7ebd4
commit f5ab71d3b6
5 changed files with 10 additions and 2 deletions
@@ -270,7 +270,8 @@ public class JavaSmartEnterProcessor extends SmartEnterProcessor {
PsiCodeBlock.class,
PsiMember.class,
PsiComment.class,
PsiImportStatementBase.class
PsiImportStatementBase.class,
PsiPackageStatement.class
);
if (statementAtCaret instanceof PsiBlockStatement) return null;
@@ -283,7 +284,8 @@ public class JavaSmartEnterProcessor extends SmartEnterProcessor {
return statementAtCaret instanceof PsiStatement ||
statementAtCaret instanceof PsiMember ||
statementAtCaret instanceof PsiImportStatementBase
statementAtCaret instanceof PsiImportStatementBase ||
statementAtCaret instanceof PsiPackageStatement
? statementAtCaret
: null;
}
@@ -100,6 +100,7 @@ public class SemicolonFixer implements Fixer {
!(psiElement instanceof PsiBreakStatement) &&
!(psiElement instanceof PsiContinueStatement) &&
!(psiElement instanceof PsiAssertStatement) &&
!(psiElement instanceof PsiPackageStatement) &&
(!(psiElement instanceof PsiField) || psiElement instanceof PsiEnumConstant) &&
(!(psiElement instanceof PsiMethod) || (!((PsiMethod)psiElement).getContainingClass().isInterface() &&
!((PsiMethod)psiElement).hasModifierProperty(PsiModifier.ABSTRACT)))) {
@@ -30,6 +30,8 @@ import org.jetbrains.annotations.NotNull;
@TestDataPath("$CONTENT_ROOT/testData")
public class CompleteStatementTest extends EditorActionTestCase {
public void testAddMissingSemicolon() throws Exception { doTest(); }
public void testAddMissingSemicolonToPackageStatement() { doTest(); }
public void testAddMissingParen() throws Exception { doTest(); }