From 915b4415e82a9d44406baaeae23106879da8a107 Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Mon, 21 Jan 2013 17:00:50 +0400 Subject: [PATCH 1/2] stronger checks while creating Set psi-types (IDEA-99367) --- .../lang/psi/impl/statements/expressions/TypesUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java index 73c3dddfffef..f10a5298d06b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.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. @@ -718,7 +718,7 @@ public class TypesUtil { GlobalSearchScope resolveScope = context.getResolveScope(); PsiClass setClass = facade.findClass(JAVA_UTIL_SET, resolveScope); - if (setClass != null) { + if (setClass != null && setClass.getTypeParameters().length == 1) { return facade.getElementFactory().createType(setClass, type); } From ea0472e9fe442991878cea70221073fbb32be6d3 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Mon, 21 Jan 2013 19:42:20 +0400 Subject: [PATCH 2/2] Move PHP-specific colors for Darcula to PHP plug-in --- colorSchemes/src/colorSchemes/Darcula.xml | 30 ----------------------- 1 file changed, 30 deletions(-) diff --git a/colorSchemes/src/colorSchemes/Darcula.xml b/colorSchemes/src/colorSchemes/Darcula.xml index 91e2d4895d28..5ef36bc7f1a8 100644 --- a/colorSchemes/src/colorSchemes/Darcula.xml +++ b/colorSchemes/src/colorSchemes/Darcula.xml @@ -1587,36 +1587,6 @@ - - -