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

IDEA-120738 Complete current statement creates broken code

Browse Source
This commit is contained in:
peter
2014-02-13 19:43:13 +01:00
parent 4fb9534f06
commit 5cd8a05139
6 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingMethodBodyFixer.java
View File

@@ -17,7 +17,6 @@ package com.intellij.codeInsight.editorActions.smartEnter;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
@@ -57,10 +56,9 @@ public class MissingMethodBodyFixer implements Fixer {
}
return;
}
int endOffset = method.getTextRange().getEndOffset();
if (StringUtil.endsWithChar(method.getText(), ';')) {
doc.deleteString(endOffset - 1, endOffset);
endOffset--;
int endOffset = method.getThrowsList().getTextRange().getEndOffset();
if (endOffset < doc.getTextLength() && doc.getCharsSequence().charAt(endOffset) == ';') {
doc.deleteString(endOffset, endOffset + 1);
}
doc.insertString(endOffset, "{\n}");
}

6
java/java-tests/testData/codeInsight/completeStatement/MethodBeforeCommentField.java Normal file
View File

@@ -0,0 +1,6 @@
public class Test {
private String s()<caret>
/* a comment */ String foo;
}

8
java/java-tests/testData/codeInsight/completeStatement/MethodBeforeCommentField_after.java Normal file
View File

@@ -0,0 +1,8 @@
public class Test {
private String s() {
<caret>
}
/* a comment */ String foo;
}

6
java/java-tests/testData/codeInsight/completeStatement/MethodBeforeCommentMethod.java Normal file
View File

@@ -0,0 +1,6 @@
public class Test {
private String s()<caret>
/* a comment */ String foo() {}
}

8
java/java-tests/testData/codeInsight/completeStatement/MethodBeforeCommentMethod_after.java Normal file
View File

@@ -0,0 +1,8 @@
public class Test {
private String s() {
<caret>
}
/* a comment */ String foo() {}
}

2
java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java
View File

@@ -147,6 +147,8 @@ public class CompleteStatementTest extends EditorActionTestCase {
public void testFieldBeforeAnnotation() throws Exception { doTest(); }
public void testMethodBeforeAnnotation() throws Exception { doTest(); }
public void testMethodBeforeCommentField() throws Exception { doTest(); }
public void testMethodBeforeCommentMethod() throws Exception { doTest(); }
public void testParenthesized() throws Exception { doTest(); }