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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Sascha Weinreuter
2013-01-22 10:35:44 +01:00
parent a13ec124d6 ea0472e9fe
commit d79d6cd002
2 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
colorSchemes/src/colorSchemes/Darcula.xml
-30
View File
@@ -1587,36 +1587,6 @@
<option name="ERROR_STRIPE_COLOR" />
</value>
</option>
<option name="PHP_EXEC_COMMAND_ID">
<value>
<option name="FOREGROUND" value="a5c25c" />
<option name="BACKGROUND" value="5e6465" />
<option name="FONT_TYPE" value="0" />
<option name="EFFECT_COLOR" />
<option name="EFFECT_TYPE" value="0" />
<option name="ERROR_STRIPE_COLOR" />
</value>
</option>
<option name="PHP_SCRIPTING_BACKGROUND">
<value>
<option name="FOREGROUND" />
<option name="BACKGROUND" value="444444" />
<option name="FONT_TYPE" value="0" />
<option name="EFFECT_COLOR" />
<option name="EFFECT_TYPE" value="0" />
<option name="ERROR_STRIPE_COLOR" />
</value>
</option>
<option name="PHP_VAR">
<value>
<option name="FOREGROUND" value="bf5553" />
<option name="BACKGROUND" />
<option name="FONT_TYPE" value="0" />
<option name="EFFECT_COLOR" />
<option name="EFFECT_TYPE" value="0" />
<option name="ERROR_STRIPE_COLOR" />
</value>
</option>
<option name="PROPERTIES.INVALID_STRING_ESCAPE">
<value>
<option name="FOREGROUND" value="ffc66d" />
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java
+2 -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.
@@ -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);
}