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

java typed-handler shouldn't prevent autopopup after dot in other languages

Browse Source
This commit is contained in:
peter
2016-02-25 14:26:34 +01:00
parent 85f4c04ac6
commit 0a2929c889
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java
+4 -5
View File
@@ -83,7 +83,9 @@ public class JavaTypedHandler extends TypedHandlerDelegate {
@Override
public Result beforeCharTyped(final char c, final Project project, final Editor editor, final PsiFile file, final FileType fileType) {
if (c == '@' && file instanceof PsiJavaFile) {
if (!(file instanceof PsiJavaFile)) return Result.CONTINUE;
if (c == '@') {
autoPopupJavadocLookup(project, editor);
}
else if (c == '#' || c == '.') {
@@ -94,16 +96,13 @@ public class JavaTypedHandler extends TypedHandlerDelegate {
//important to calculate before inserting charTyped
myJavaLTTyped = '<' == c &&
file instanceof PsiJavaFile &&
!(file instanceof JspFile) &&
CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET &&
PsiUtil.isLanguageLevel5OrHigher(file) &&
isAfterClassLikeIdentifierOrDot(offsetBefore, editor);
if ('>' == c) {
if (file instanceof PsiJavaFile && !(file instanceof JspFile) &&
CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET &&
PsiUtil.isLanguageLevel5OrHigher(file)) {
if (!(file instanceof JspFile) && CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET && PsiUtil.isLanguageLevel5OrHigher(file)) {
if (handleJavaGT(editor, JavaTokenType.LT, JavaTokenType.GT, INVALID_INSIDE_REFERENCE)) return Result.STOP;
}
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionConfidence.java
+3
View File
@@ -57,6 +57,9 @@ public class GroovyCompletionConfidence extends CompletionConfidence {
if (PsiJavaPatterns.psiElement().afterLeaf("def").accepts(contextElement)) {
return ThreeState.YES;
}
if (contextElement.textMatches("..") || contextElement.textMatches("...")) {
return ThreeState.YES;
}
return ThreeState.UNSURE;
}