KT-983 Code completion for not-imported classes - a very temp commit with enabling java class names completion with Ctrl + Space.
This commit is contained in:
@@ -50,11 +50,16 @@
|
|||||||
<lang.formatter language="jet" implementationClass="org.jetbrains.jet.plugin.formatter.JetFormattingModelBuilder"/>
|
<lang.formatter language="jet" implementationClass="org.jetbrains.jet.plugin.formatter.JetFormattingModelBuilder"/>
|
||||||
<lang.findUsagesProvider language="jet" implementationClass="org.jetbrains.jet.plugin.findUsages.JetFindUsagesProvider"/>
|
<lang.findUsagesProvider language="jet" implementationClass="org.jetbrains.jet.plugin.findUsages.JetFindUsagesProvider"/>
|
||||||
<psi.referenceContributor language="jet" implementation="org.jetbrains.jet.plugin.references.JetReferenceContributor"/>
|
<psi.referenceContributor language="jet" implementation="org.jetbrains.jet.plugin.references.JetReferenceContributor"/>
|
||||||
|
|
||||||
|
<completion.contributor language="jet" implementationClass="org.jetbrains.jet.plugin.completion.GlobalMemberCompletionContributor"/>
|
||||||
<completion.contributor language="jet" implementationClass="org.jetbrains.jet.plugin.completion.JetKeywordCompletionContributor"/>
|
<completion.contributor language="jet" implementationClass="org.jetbrains.jet.plugin.completion.JetKeywordCompletionContributor"/>
|
||||||
|
<completion.contributor language="jet" implementationClass="org.jetbrains.jet.plugin.completion.JetCompletionContributor"/>
|
||||||
|
|
||||||
<annotator language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.SoftKeywordsAnnotator"/>
|
<annotator language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.SoftKeywordsAnnotator"/>
|
||||||
<annotator language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.LabelsAnnotator"/>
|
<annotator language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.LabelsAnnotator"/>
|
||||||
<annotator language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.JetPsiChecker"/>
|
<annotator language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.JetPsiChecker"/>
|
||||||
<annotator language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.DebugInfoAnnotator"/>
|
<annotator language="jet" implementationClass="org.jetbrains.jet.plugin.annotations.DebugInfoAnnotator"/>
|
||||||
|
|
||||||
<documentationProvider implementation="org.jetbrains.jet.plugin.JetQuickDocumentationProvider"/>
|
<documentationProvider implementation="org.jetbrains.jet.plugin.JetQuickDocumentationProvider"/>
|
||||||
<configurationType implementation="org.jetbrains.jet.plugin.run.JetRunConfigurationType"/>
|
<configurationType implementation="org.jetbrains.jet.plugin.run.JetRunConfigurationType"/>
|
||||||
<configurationProducer implementation="org.jetbrains.jet.plugin.run.JetRunConfigurationProducer"/>
|
<configurationProducer implementation="org.jetbrains.jet.plugin.run.JetRunConfigurationProducer"/>
|
||||||
@@ -66,8 +71,8 @@
|
|||||||
<codeInsight.implementMethod language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.ImplementMethodsHandler"/>
|
<codeInsight.implementMethod language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.ImplementMethodsHandler"/>
|
||||||
<codeInsight.overrideMethod language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.OverrideMethodsHandler"/>
|
<codeInsight.overrideMethod language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.OverrideMethodsHandler"/>
|
||||||
|
|
||||||
|
|
||||||
<java.elementFinder implementation="org.jetbrains.jet.asJava.JavaElementFinder"/>
|
<java.elementFinder implementation="org.jetbrains.jet.asJava.JavaElementFinder"/>
|
||||||
|
|
||||||
<psi.treeChangePreprocessor implementation="org.jetbrains.jet.asJava.JetCodeBlockModificationListener"/>
|
<psi.treeChangePreprocessor implementation="org.jetbrains.jet.asJava.JetCodeBlockModificationListener"/>
|
||||||
|
|
||||||
<toolWindow id="CodeWindow"
|
<toolWindow id="CodeWindow"
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package org.jetbrains.jet.plugin.completion;
|
||||||
|
|
||||||
|
import com.intellij.codeInsight.completion.*;
|
||||||
|
import com.intellij.patterns.PlatformPatterns;
|
||||||
|
import com.intellij.psi.PsiElement;
|
||||||
|
import com.intellij.util.ProcessingContext;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.jet.lang.psi.JetFile;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Nikolay Krasko
|
||||||
|
*/
|
||||||
|
public class GlobalMemberCompletionContributor extends CompletionContributor {
|
||||||
|
public GlobalMemberCompletionContributor() {
|
||||||
|
extend(CompletionType.CLASS_NAME, PlatformPatterns.psiElement(),
|
||||||
|
new CompletionProvider<CompletionParameters>() {
|
||||||
|
@Override
|
||||||
|
protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context,
|
||||||
|
@NotNull CompletionResultSet result) {
|
||||||
|
if (result.getPrefixMatcher().getPrefix().isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final PsiElement position = parameters.getPosition();
|
||||||
|
if (!(position.getContainingFile() instanceof JetFile)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// final PsiElement parent = position.getParent();
|
||||||
|
// if (parent.getReference() instanceof JetSimpleName)
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
package org.jetbrains.jet.plugin.completion;
|
||||||
|
|
||||||
|
import com.intellij.codeInsight.completion.*;
|
||||||
|
import com.intellij.codeInsight.lookup.LookupElement;
|
||||||
|
import com.intellij.patterns.PlatformPatterns;
|
||||||
|
import com.intellij.psi.PsiElement;
|
||||||
|
import com.intellij.util.Consumer;
|
||||||
|
import com.intellij.util.ProcessingContext;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.jet.lang.psi.JetFile;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Nikolay Krasko
|
||||||
|
*/
|
||||||
|
public class JetCompletionContributor extends CompletionContributor {
|
||||||
|
public JetCompletionContributor() {
|
||||||
|
extend(CompletionType.BASIC, PlatformPatterns.psiElement(),
|
||||||
|
new CompletionProvider<CompletionParameters>() {
|
||||||
|
@Override
|
||||||
|
protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context,
|
||||||
|
final @NotNull CompletionResultSet _result) {
|
||||||
|
|
||||||
|
if (_result.getPrefixMatcher().getPrefix().isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final PsiElement position = parameters.getPosition();
|
||||||
|
if (!(position.getContainingFile() instanceof JetFile)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
CompletionResultSet result = _result.withPrefixMatcher(CompletionUtil.findReferenceOrAlphanumericPrefix(parameters));
|
||||||
|
JavaClassNameCompletionContributor.addAllClasses(parameters, JavaCompletionSorting.addJavaSorting(
|
||||||
|
parameters, result), parameters.getInvocationCount() <= 1, new Consumer<LookupElement>() {
|
||||||
|
@Override
|
||||||
|
public void consume(LookupElement element) {
|
||||||
|
_result.addElement(element);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// @Override
|
||||||
|
// public void beforeCompletion(@NotNull CompletionInitializationContext context) {
|
||||||
|
// final PsiFile file = context.getFile();
|
||||||
|
//
|
||||||
|
// if (file instanceof JetFile) {
|
||||||
|
// autoImport(file, context.getStartOffset() - 1, context.getEditor());
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// private static void autoImport(final PsiFile file, int offset, final Editor editor) {
|
||||||
|
// final CharSequence text = editor.getDocument().getCharsSequence();
|
||||||
|
// while (offset > 0 && Character.isJavaIdentifierPart(text.charAt(offset))) offset--;
|
||||||
|
// if (offset <= 0) return;
|
||||||
|
//
|
||||||
|
// while (offset > 0 && Character.isWhitespace(text.charAt(offset))) offset--;
|
||||||
|
// if (offset <= 0 || text.charAt(offset) != '.') return;
|
||||||
|
//
|
||||||
|
// offset--;
|
||||||
|
//
|
||||||
|
// while (offset > 0 && Character.isWhitespace(text.charAt(offset))) offset--;
|
||||||
|
// if (offset <= 0) return;
|
||||||
|
//
|
||||||
|
// final JetSimpleNameExpression nameExpression =
|
||||||
|
// 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);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user