From 2eef0e449ec17a9e79becfb2e6b973a36122006f Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Tue, 6 Jul 2010 17:53:24 +0400 Subject: [PATCH 1/4] readded svg export again --- platform/platform-resources/src/META-INF/LangExtensions.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml index fe87fed07bb1..e92940282c5e 100644 --- a/platform/platform-resources/src/META-INF/LangExtensions.xml +++ b/platform/platform-resources/src/META-INF/LangExtensions.xml @@ -484,6 +484,8 @@ serviceImplementation="com.intellij.openapi.graph.impl.builder.util.CustomGraphActionsFactoryImpl"/> + From a2ee54012175d904070fa49d30ca3b6418ec18a4 Mon Sep 17 00:00:00 2001 From: Maxim Medvedev Date: Tue, 6 Jul 2010 18:12:26 +0400 Subject: [PATCH 2/4] closure type assignability --- .../plugins/groovy/gpp/GppTypeConverter.java | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppTypeConverter.java b/plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppTypeConverter.java index 88b9f1963582..3390514092de 100644 --- a/plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppTypeConverter.java +++ b/plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppTypeConverter.java @@ -66,21 +66,18 @@ public class GppTypeConverter extends GrTypeConverter { public Boolean isConvertible(@NotNull PsiType lType, @NotNull PsiType rType, @NotNull GroovyPsiElement context) { if (rType instanceof GrTupleType) { final PsiType type = PsiUtil.extractIterableTypeParameter(lType, false); - if (type != null && !TypesUtil.isAssignable(type, ((GrTupleType)rType).getParameters()[0], context)) { - return null; - } - final PsiType[] componentTypes = ((GrTupleType)rType).getComponentTypes(); + if (type == null || TypesUtil.isAssignable(type, ((GrTupleType)rType).getParameters()[0], context)) { + final PsiType[] componentTypes = ((GrTupleType)rType).getComponentTypes(); - final PsiType expectedComponent = PsiUtil.extractIterableTypeParameter(lType, false); - if (expectedComponent != null && hasDefaultConstructor(lType)) { - return true; - } + final PsiType expectedComponent = PsiUtil.extractIterableTypeParameter(lType, false); + if (expectedComponent != null && hasDefaultConstructor(lType)) { + return true; + } - if (lType instanceof PsiClassType && hasConstructor((PsiClassType)lType, componentTypes, context)) { - return true; + if (lType instanceof PsiClassType && hasConstructor((PsiClassType)lType, componentTypes, context)) { + return true; + } } - - return null; } else if (rType instanceof GrMapType) { final PsiType lKeyType = PsiUtil.substituteTypeParameter(lType, CommonClassNames.JAVA_UTIL_MAP, 0, false); @@ -94,8 +91,6 @@ public class GppTypeConverter extends GrTypeConverter { if (hasDefaultConstructor(lType)) { return true; } - - return null; } else if (rType instanceof GrClosureType) { final PsiType[] methodParameters = GppClosureParameterTypeProvider.findSingleAbstractMethodSignature(lType); @@ -103,10 +98,8 @@ public class GppTypeConverter extends GrTypeConverter { if (methodParameters != null && GrClosureSignatureUtil.isSignatureApplicable(signature, methodParameters, context)) { return true; } - return false; } - return null; } From 01aa673f7088ad57deae6d22be6f24e508cdd31c Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Tue, 6 Jul 2010 18:49:52 +0400 Subject: [PATCH 3/4] Merge branch 'master' of git.labs.intellij.net:idea/ultimate Conflicts: python/src/com/jetbrains/django/lang/template/inspection/DjangoTemplateNamesValidator.java python/src/com/jetbrains/django/model/DjangoModel.java --- .../com/intellij/openapi/wm/PassThroughtIdeFocusManager.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/wm/PassThroughtIdeFocusManager.java b/platform/platform-api/src/com/intellij/openapi/wm/PassThroughtIdeFocusManager.java index eb96491daae1..c0954567afd7 100644 --- a/platform/platform-api/src/com/intellij/openapi/wm/PassThroughtIdeFocusManager.java +++ b/platform/platform-api/src/com/intellij/openapi/wm/PassThroughtIdeFocusManager.java @@ -81,11 +81,6 @@ public class PassThroughtIdeFocusManager extends IdeFocusManager { }; } - @Override - public FocusRequestor getFurtherRequestor() { - return this; - } - @Override public void suspendKeyProcessingUntil(@NotNull ActionCallback done) { } From 81bd9db2c9d02a023c59c4b01f7cb75d7929306b Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Tue, 6 Jul 2010 19:01:55 +0400 Subject: [PATCH 4/4] Merge branch 'master' of git.labs.intellij.net:idea/ultimate Conflicts: python/src/com/jetbrains/django/lang/template/inspection/DjangoTemplateNamesValidator.java python/src/com/jetbrains/django/model/DjangoModel.java --- .../com/intellij/openapi/wm/PassThroughtIdeFocusManager.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platform/platform-api/src/com/intellij/openapi/wm/PassThroughtIdeFocusManager.java b/platform/platform-api/src/com/intellij/openapi/wm/PassThroughtIdeFocusManager.java index c0954567afd7..eb96491daae1 100644 --- a/platform/platform-api/src/com/intellij/openapi/wm/PassThroughtIdeFocusManager.java +++ b/platform/platform-api/src/com/intellij/openapi/wm/PassThroughtIdeFocusManager.java @@ -81,6 +81,11 @@ public class PassThroughtIdeFocusManager extends IdeFocusManager { }; } + @Override + public FocusRequestor getFurtherRequestor() { + return this; + } + @Override public void suspendKeyProcessingUntil(@NotNull ActionCallback done) { }