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

Fix automatic selection of completion proposal

Browse Source
This commit is contained in:
Nikolay Krasko
2012-02-08 19:36:31 +04:00
parent f671e78dce
commit af9fcfd5e0
3 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+3 -1
View File
@@ -83,7 +83,9 @@
<completion.contributor language="jet" implementationClass="org.jetbrains.jet.plugin.completion.GlobalMemberCompletionContributor"/>
<completion.contributor language="jet" implementationClass="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplateCompletionContributor" id="liveTemplates" order="first"/>
<completion.confidence language="jet" implementationClass="org.jetbrains.jet.plugin.completion.JetCompletionConfidence"/>
<completion.confidence language="jet" implementationClass="com.intellij.codeInsight.completion.UnfocusedNameIdentifier"/>
<completion.confidence language="jet" implementationClass="com.intellij.codeInsight.completion.AlwaysFocusLookup" order="last"/>
<completion.skip implementation="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplateCompletionContributor$Skipper" id="skipLiveTemplate"/>
<psi.referenceContributor language="jet" order="after JetCompletionContributor" implementation="org.jetbrains.jet.plugin.references.JetReferenceContributor"/>
idea/src/org/jetbrains/jet/plugin/completion/JetCompletionConfidence.java
-18
View File
@@ -1,18 +0,0 @@
package org.jetbrains.jet.plugin.completion;
import com.intellij.codeInsight.completion.CompletionConfidence;
import com.intellij.codeInsight.completion.CompletionParameters;
import com.intellij.util.ThreeState;
import org.jetbrains.annotations.NotNull;
/**
* @author Nikolay Krasko
*/
public class JetCompletionConfidence extends CompletionConfidence {
@NotNull
@Override
public ThreeState shouldFocusLookup(@NotNull CompletionParameters parameters) {
return ThreeState.YES;
}
}
idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java
+3 -1
View File
@@ -20,7 +20,9 @@ import org.jetbrains.jet.plugin.completion.JetLookupObject;
import org.jetbrains.jet.plugin.quickfix.ImportClassHelper;
/**
* Inserts '()' after function proposal insert.
* Performs number of code modification after insertion jet function:
* - Insert ()
* - Add import directive if necessary for top level functions
*
* @author Nikolay Krasko
*/