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

Fixed KT-5808 Code completion auto-popup does not appear after typing "?."

Browse Source 
#KT-5808 Fixed
This commit is contained in:
Valentin Kipyatkov
2014-09-18 18:28:05 +02:00
committed by valentin
parent 94c9338e3c
commit 3fcf0f7340
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/editor/KotlinTypedHandler.java
+23
View File
@@ -16,6 +16,7 @@
package org.jetbrains.jet.plugin.editor;
import com.intellij.codeInsight.AutoPopupController;
import com.intellij.codeInsight.CodeInsightSettings;
import com.intellij.codeInsight.editorActions.TypedHandlerDelegate;
import com.intellij.codeInsight.highlighting.BraceMatcher;
@@ -31,6 +32,7 @@ import com.intellij.openapi.editor.highlighter.EditorHighlighter;
import com.intellij.openapi.editor.highlighter.HighlighterIterator;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Condition;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
@@ -64,6 +66,7 @@ public class KotlinTypedHandler extends TypedHandlerDelegate {
jetLTTyped = CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET &&
JetLtGtTypingUtils.shouldAutoCloseAngleBracket(editor.getCaretModel().getOffset(), editor);
return Result.CONTINUE;
case '>':
if (CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET) {
if (JetLtGtTypingUtils.handleJetGTInsert(editor)) {
@@ -71,6 +74,7 @@ public class KotlinTypedHandler extends TypedHandlerDelegate {
}
}
return Result.CONTINUE;
case '{':
// Returning Result.CONTINUE will cause inserting "{}" for unmatched '{'
@@ -107,11 +111,30 @@ public class KotlinTypedHandler extends TypedHandlerDelegate {
}
return Result.CONTINUE;
case '.':
autoPopupMemberLookup(project, editor);
return Result.CONTINUE;
}
return Result.CONTINUE;
}
private static void autoPopupMemberLookup(Project project, final Editor editor) {
AutoPopupController.getInstance(project).autoPopupMemberLookup(editor, new Condition<PsiFile>() {
@Override
public boolean value(PsiFile file) {
int offset = editor.getCaretModel().getOffset();
PsiElement lastElement = file.findElementAt(offset - 1);
if (lastElement == null) return false;
String text = lastElement.getText();
return ".".equals(text) || "?.".equals(text);
}
});
}
@Override
public Result charTyped(char c, Project project, @NotNull Editor editor, @NotNull PsiFile file) {
if (!(file instanceof JetFile)) {