azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make java classes completion popup not so obtrusive

Browse Source
This commit is contained in:
Nikolay Krasko
2012-01-17 19:21:34 +04:00
parent 7b8a057f37
commit c4bdd59f02
2 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java
+40 -37
View File
@@ -4,10 +4,15 @@ import com.intellij.codeInsight.completion.*;
import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.patterns.PlatformPatterns; import com.intellij.patterns.PlatformPatterns;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Consumer; import com.intellij.util.Consumer;
import com.intellij.util.ProcessingContext; import com.intellij.util.ProcessingContext;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetQualifiedExpression;
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
import org.jetbrains.jet.lang.psi.JetUserType;
import org.jetbrains.jet.lexer.JetTokens;
/** /**
* @author Nikolay Krasko * @author Nikolay Krasko
@@ -30,46 +35,44 @@ public class JetCompletionContributor extends CompletionContributor {
} }
CompletionResultSet result = _result.withPrefixMatcher(CompletionUtil.findReferenceOrAlphanumericPrefix(parameters)); CompletionResultSet result = _result.withPrefixMatcher(CompletionUtil.findReferenceOrAlphanumericPrefix(parameters));
JavaClassNameCompletionContributor.addAllClasses(parameters, JavaCompletionSorting.addJavaSorting(
if (shouldRunClassNameCompletion(parameters, context)) {
JavaClassNameCompletionContributor.addAllClasses(parameters, JavaCompletionSorting.addJavaSorting(
parameters, result), parameters.getInvocationCount() <= 1, new Consumer<LookupElement>() { parameters, result), parameters.getInvocationCount() <= 1, new Consumer<LookupElement>() {
@Override
public void consume(LookupElement element) { @Override
_result.addElement(element); public void consume(LookupElement element) {
} _result.addElement(element);
});
}
});
}
} }
}); });
} }
// @Override private static boolean shouldRunClassNameCompletion(@NotNull CompletionParameters parameters, ProcessingContext context) {
// public void beforeCompletion(@NotNull CompletionInitializationContext context) { final PsiElement element = parameters.getPosition();
// final PsiFile file = context.getFile();
// if (parameters.getInvocationCount() > 1) {
// if (file instanceof JetFile) { return true;
// autoImport(file, context.getStartOffset() - 1, context.getEditor()); }
// }
// } if (element.getNode().getElementType() == JetTokens.IDENTIFIER) {
// if (element.getParent() instanceof JetSimpleNameExpression) {
// private static void autoImport(final PsiFile file, int offset, final Editor editor) { JetSimpleNameExpression nameExpression = (JetSimpleNameExpression) element.getParent();
// final CharSequence text = editor.getDocument().getCharsSequence(); if (PsiTreeUtil.getParentOfType(nameExpression, JetQualifiedExpression.class) != null) {
// while (offset > 0 && Character.isJavaIdentifierPart(text.charAt(offset))) offset--; return false;
// if (offset <= 0) return; }
//
// while (offset > 0 && Character.isWhitespace(text.charAt(offset))) offset--; if (PsiTreeUtil.getParentOfType(nameExpression, JetUserType.class) != null) {
// if (offset <= 0 || text.charAt(offset) != '.') return; return true;
// }
// offset--;
// return parameters.getInvocationCount() == 1;
// while (offset > 0 && Character.isWhitespace(text.charAt(offset))) offset--; }
// if (offset <= 0) return; }
//
// final JetSimpleNameExpression nameExpression = return false;
// PsiTreeUtil.findElementOfClassAtOffset(file, offset, JetSimpleNameExpression.class, false); }
// if (nameExpression == null) return;
//
// final ImportClassFix importClassFix = new ImportClassFix(nameExpression);
// if (importClassFix.isAvailable(file.getProject(), editor, file)) {
// new ImportClassFix(nameExpression).invoke(file.getProject(), editor, file);
// }
// }
} }
idea/testData/completion/basic/JavaClassNames.kt
+10
View File
@@ -0,0 +1,10 @@
package testing
// Should show java names by short name
class Hello() {
fun test() {
val a : S<caret>
}
}
// EXIST: SortedMap, Short, Socket