From f4064e59a9a7748dd23220ed5c8bb9dd3e2fb661 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 11 Mar 2011 17:34:29 +0100 Subject: [PATCH] strings to have the greatest priority in groovy completion (for named arguments) --- .../lang/completion/weighers/GrKindWeigher.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java index 1a2f74a3c24a..58a80da31355 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java @@ -52,15 +52,14 @@ public class GrKindWeigher extends CompletionWeigher { } final PsiElement position = location.getCompletionParameters().getPosition(); - if (!(position.getParent() instanceof GrReferenceElement)) { - if (position.getContainingFile() instanceof GroovyFileBase) { - if (o instanceof PsiClass || o instanceof PsiPackage) return 0; - return 1; - } + if (!(position.getContainingFile() instanceof GroovyFileBase)) { return null; } - if (!(o instanceof PsiElement)) return null; + if (!(position.getParent() instanceof GrReferenceElement)) { + if (o instanceof PsiClass || o instanceof PsiPackage) return 0; + return 1; + } final GrReferenceElement parent = (GrReferenceElement)position.getParent(); @@ -70,6 +69,7 @@ public class GrKindWeigher extends CompletionWeigher { if (o instanceof PsiPackage) return NotQualifiedKind.aPackage; if (isLightElement(o)) return NotQualifiedKind.anImplicitGroovyMethod; if (o instanceof PsiMember) return NotQualifiedKind.aMember; + if (o instanceof String) return NotQualifiedKind.aString; } else { if (o instanceof PsiClass) return QualifiedKind.aClass; @@ -87,6 +87,7 @@ public class GrKindWeigher extends CompletionWeigher { } return QualifiedKind.aMember; } + if (o instanceof String) return QualifiedKind.aString; } return null; } @@ -96,10 +97,10 @@ public class GrKindWeigher extends CompletionWeigher { } static enum NotQualifiedKind { - aPackage, aClass, anImplicitGroovyMethod, aMember, aLocal + aPackage, aClass, anImplicitGroovyMethod, aMember, aLocal, aString } static enum QualifiedKind { - aPackage, aClass, aTrashMethod, anImplicitGroovyMethod, aMember, anEnumConstant + aPackage, aClass, aTrashMethod, anImplicitGroovyMethod, aMember, anEnumConstant, aString } }