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

let GrMapType always be LinkedHashMap, thus avoid a costly check at its creation

Browse Source
This commit is contained in:
peter
2015-10-06 16:59:10 +02:00
parent 2f00162511
commit 17aefed9d3
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapType.java
+2 -7
View File
@@ -34,7 +34,6 @@ import java.util.*;
* @author peter
*/
public abstract class GrMapType extends GrLiteralClassType {
private final String myJavaClassName;
private final VolatileNotNullLazyValue<PsiType[]> myParameters = new VolatileNotNullLazyValue<PsiType[]>() {
@NotNull
@@ -58,22 +57,18 @@ public abstract class GrMapType extends GrLiteralClassType {
GlobalSearchScope scope,
LanguageLevel languageLevel) {
super(languageLevel, scope, facade);
myJavaClassName = facade.findClass(
GroovyCommonClassNames.JAVA_UTIL_LINKED_HASH_MAP, scope) != null ? GroovyCommonClassNames.JAVA_UTIL_LINKED_HASH_MAP
: CommonClassNames.JAVA_UTIL_MAP;
}
@NotNull
@Override
protected String getJavaClassName() {
return myJavaClassName;
return GroovyCommonClassNames.JAVA_UTIL_LINKED_HASH_MAP;
}
@Override
@NotNull
public String getClassName() {
return StringUtil.getShortName(myJavaClassName);
return "LinkedHashMap";
}
@Nullable
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrListOrMapImpl.java
-1
View File
@@ -192,7 +192,6 @@ public class GrListOrMapImpl extends GrExpressionImpl implements GrListOrMap {
GlobalSearchScope scope = listOrMap.getResolveScope();
JavaPsiFacade facade = JavaPsiFacade.getInstance(listOrMap.getProject());
PsiClass hashMap = facade.findClass(GroovyCommonClassNames.JAVA_UTIL_LINKED_HASH_MAP, scope);
if (hashMap == null) hashMap = facade.findClass(CommonClassNames.JAVA_UTIL_MAP, scope);
if (hashMap != null) {
PsiSubstitutor mapSubstitutor = PsiSubstitutor.EMPTY.
put(hashMap.getTypeParameters()[0], com.intellij.psi.util.PsiUtil.substituteTypeParameter(lType, CommonClassNames.JAVA_UTIL_MAP, 0, false)).