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

fix double space after return in java

Browse Source
This commit is contained in:
peter.gromov
2010-11-11 21:03:29 +03:00
parent f997b56ec5
commit 68d0598a76
5 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaAwareCompletionData.java
+7 -9
View File
@@ -19,7 +19,6 @@ import com.intellij.codeInsight.TailType;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.codeInsight.lookup.LookupItemUtil;
import com.intellij.codeInsight.lookup.TailTypeDecorator;
import com.intellij.psi.*;
import com.intellij.psi.filters.ContextGetter;
import com.intellij.util.IncorrectOperationException;
@@ -72,7 +71,7 @@ public class JavaAwareCompletionData extends CompletionData{
return TailType.NONE;
}
protected void addLookupItem(Set<LookupElement> set, TailType tailType, @NotNull Object completion, final PsiFile file, final CompletionVariant variant) {
protected void addLookupItem(Set<LookupElement> set, final TailType tailType, @NotNull Object completion, final PsiFile file, final CompletionVariant variant) {
if (completion instanceof LookupElement && !(completion instanceof LookupItem)) {
set.add((LookupElement)completion);
return;
@@ -88,8 +87,11 @@ public class JavaAwareCompletionData extends CompletionData{
ret.setInsertHandler(new InsertHandler<LookupElement>() {
@Override
public void handleInsert(InsertionContext context, LookupElement item) {
final TailType type = analyzeItem(item.getObject(), context.getFile().findElementAt(context.getStartOffset()));
new DefaultInsertHandler().handleInsert(context, item);
TailType type = analyzeItem(item.getObject(), context.getFile().findElementAt(context.getStartOffset()));
if (type == TailType.NONE) {
type = tailType;
}
//new DefaultInsertHandler().handleInsert(context, item);
if (type != TailType.NONE) {
context.setAddCompletionChar(false);
type.processTail(context.getEditor(), context.getTailOffset());
@@ -102,11 +104,7 @@ public class JavaAwareCompletionData extends CompletionData{
ret.setAttribute(key, itemProperties.get(key));
}
if ((insertHandler == null || ret.getInsertHandler() != null) && tailType != TailType.NONE) {
set.add(TailTypeDecorator.withTail(ret, tailType));
} else {
set.add(ret);
}
set.add(ret);
}
protected void addKeywords(final Set<LookupElement> set, final PsiElement position, final PrefixMatcher matcher, final PsiFile file,
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
+1 -1
View File
@@ -538,7 +538,7 @@ public class JavaCompletionData extends JavaAwareCompletionData{
variant.addCompletion(PsiKeyword.IF, TailTypes.IF_LPARENTH);
variant.addCompletion(PsiKeyword.TRY, TailType.createSimpleTailType('{'));
variant.addCompletion(PsiKeyword.THROW, TailType.SPACE);
variant.addCompletion(PsiKeyword.RETURN, TailType.SPACE);
variant.addCompletion(PsiKeyword.RETURN, TailType.NONE);
variant.addCompletion(PsiKeyword.NEW, TailType.SPACE);
variant.addCompletion(PsiKeyword.ASSERT, TailType.SPACE);
variant.addCompletion(PsiKeyword.SYNCHRONIZED, TailTypes.SYNCHRONIZED_LPARENTH);
java/java-tests/testData/codeInsight/completion/normal/SpaceAfterReturn.java
+8
View File
@@ -0,0 +1,8 @@
public abstract class Zzza {
int foo() {
ret<caret>x
}
}
java/java-tests/testData/codeInsight/completion/normal/SpaceAfterReturn_after.java
+8
View File
@@ -0,0 +1,8 @@
public abstract class Zzza {
int foo() {
return <caret>x
}
}
java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+6
View File
@@ -684,6 +684,12 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
public void testSecondAnonymousClassParameter() throws Throwable { doTest(); }
public void testSpaceAfterReturn() throws Throwable {
configure()
type '\n'
checkResultByFile(getTestName(false) + "_after.java")
}
public void testCastInstanceofedQualifier() throws Throwable { doTest(); }
public void testCastComplexInstanceofedQualifier() throws Throwable { doTest(); }