From 3018735c9d1c1b26c6048abc5ae5971981df43f1 Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Thu, 21 Feb 2013 09:42:32 +0400 Subject: [PATCH] IDEA-101217: suggest 'def' only in Groovy templates --- .../groovy/template/expressions/ChooseTypeExpression.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/template/expressions/ChooseTypeExpression.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/template/expressions/ChooseTypeExpression.java index d2953ff739a1..57d54cc34f90 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/template/expressions/ChooseTypeExpression.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/template/expressions/ChooseTypeExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,6 +48,7 @@ public class ChooseTypeExpression extends Expression { protected final SmartTypePointer myTypePointer; private final LookupElement[] myItems; private final PsiManager myManager; + private final boolean myForGroovy; public ChooseTypeExpression(TypeConstraint[] constraints, PsiManager manager, GlobalSearchScope resolveScope) { this(constraints, manager, true, resolveScope); @@ -55,6 +56,7 @@ public class ChooseTypeExpression extends Expression { public ChooseTypeExpression(TypeConstraint[] constraints, PsiManager manager, boolean forGroovy, GlobalSearchScope resolveScope) { myManager = manager; + myForGroovy = forGroovy; myTypePointer = SmartTypePointerManager.getInstance(manager.getProject()).createSmartTypePointer(chooseType(constraints, resolveScope)); myItems = createItems(constraints, forGroovy); } @@ -108,7 +110,7 @@ public class ChooseTypeExpression extends Expression { PsiDocumentManager.getInstance(context.getProject()).commitAllDocuments(); PsiType type = myTypePointer.getType(); if (type != null) { - if (type.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { + if (myForGroovy && type.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { return new TextResult(GrModifier.DEF); }