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

IDEA-84064 Ctrl-Shift-Enter does not work in annotations

Browse Source
This commit is contained in:
peter
2018-01-03 15:07:35 +01:00
parent a753417bb9
commit 20ca3646d2
6 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java
+2
View File
@@ -290,6 +290,7 @@ public class JavaSmartEnterProcessor extends SmartEnterProcessor {
PsiStatement.class,
PsiCodeBlock.class,
PsiMember.class,
PsiAnnotation.class,
PsiComment.class,
PsiImportStatementBase.class,
PsiPackageStatement.class
@@ -305,6 +306,7 @@ public class JavaSmartEnterProcessor extends SmartEnterProcessor {
return statementAtCaret instanceof PsiStatement ||
statementAtCaret instanceof PsiMember ||
statementAtCaret instanceof PsiAnnotation ||
statementAtCaret instanceof PsiImportStatementBase ||
statementAtCaret instanceof PsiPackageStatement
? statementAtCaret
java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingArrayInitializerBraceFixer.java
+5 -5
View File
@@ -17,6 +17,7 @@ package com.intellij.codeInsight.editorActions.smartEnter;
import com.intellij.openapi.editor.Editor;
import com.intellij.psi.PsiArrayInitializerExpression;
import com.intellij.psi.PsiArrayInitializerMemberValue;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiErrorElement;
import com.intellij.util.IncorrectOperationException;
@@ -25,11 +26,10 @@ import com.intellij.util.containers.ContainerUtil;
public class MissingArrayInitializerBraceFixer implements Fixer {
@Override
public void apply(Editor editor, JavaSmartEnterProcessor processor, PsiElement psiElement) throws IncorrectOperationException {
if (!(psiElement instanceof PsiArrayInitializerExpression)) return;
PsiArrayInitializerExpression expr = (PsiArrayInitializerExpression)psiElement;
if (!expr.getText().endsWith("}")) {
PsiErrorElement err = ContainerUtil.findInstance(expr.getChildren(), PsiErrorElement.class);
int endOffset = (err != null ? err : expr).getTextRange().getEndOffset();
if (!(psiElement instanceof PsiArrayInitializerExpression || psiElement instanceof PsiArrayInitializerMemberValue)) return;
if (!psiElement.getText().endsWith("}")) {
PsiErrorElement err = ContainerUtil.findInstance(psiElement.getChildren(), PsiErrorElement.class);
int endOffset = (err != null ? err : psiElement).getTextRange().getEndOffset();
editor.getDocument().insertString(endOffset, "}");
}
}
java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/ParameterListFixer.java
+4 -3
View File
@@ -17,8 +17,8 @@ package com.intellij.codeInsight.editorActions.smartEnter;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiAnnotationParameterList;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiParameter;
import com.intellij.psi.PsiParameterList;
import com.intellij.util.IncorrectOperationException;
@@ -29,10 +29,11 @@ import com.intellij.util.IncorrectOperationException;
public class ParameterListFixer implements Fixer {
@Override
public void apply(Editor editor, JavaSmartEnterProcessor processor, PsiElement psiElement) throws IncorrectOperationException {
if (psiElement instanceof PsiParameterList) {
if (psiElement instanceof PsiParameterList || psiElement instanceof PsiAnnotationParameterList) {
String text = psiElement.getText();
if (StringUtil.startsWithChar(text, '(') && !StringUtil.endsWithChar(text, ')')) {
PsiParameter[] params = ((PsiParameterList)psiElement).getParameters();
PsiElement[] params = psiElement instanceof PsiParameterList ? ((PsiParameterList)psiElement).getParameters()
: ((PsiAnnotationParameterList)psiElement).getAttributes();
int offset;
if (params.length == 0) {
offset = psiElement.getTextRange().getStartOffset() + 1;
java/java-tests/testData/codeInsight/completeStatement/CloseAnnotationWithArrayInitializer.java
+1
View File
@@ -0,0 +1 @@
@SuppressWarnings({"fallthrough", "finally"<caret>
java/java-tests/testData/codeInsight/completeStatement/CloseAnnotationWithArrayInitializer_after.java
+2
View File
@@ -0,0 +1,2 @@
@SuppressWarnings({"fallthrough", "finally"})
<caret>
java/java-tests/testSrc/com/intellij/java/codeInsight/CompleteStatementTest.java
+1
View File
@@ -123,6 +123,7 @@ public class CompleteStatementTest extends EditorActionTestCase {
public void testMethodBeforeAnnotation() { doTest(); }
public void testMethodBeforeCommentField() { doTest(); }
public void testMethodBeforeCommentMethod() { doTest(); }
public void testCloseAnnotationWithArrayInitializer() { doTest(); }
public void testParenthesized() { doTest(); }
public void testCompleteBreak() { doTest(); }
public void testCompleteIfNextLineBraceStyle() { myJavaSettings.BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE; doTest(); }