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

IDEA-101217: suggest 'def' only in Groovy templates

Browse Source
This commit is contained in:
Max Medvedev
2013-02-21 09:43:16 +04:00
parent 87f9d894f7
commit 3018735c9d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/template/expressions/ChooseTypeExpression.java
+4 -2
View File
@@ -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);
}