From 298cf49eaa8b7776ef0a48569594efd84d027466 Mon Sep 17 00:00:00 2001 From: Leonid Shalupov Date: Thu, 9 Nov 2017 14:12:32 +0100 Subject: [PATCH 1/2] GradleRunner: fix failing on non-zero exit code from gradle (reviewed by zolotov) --- .../groovy/org/jetbrains/intellij/build/GradleRunner.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/GradleRunner.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/GradleRunner.groovy index d818d2a59564..78bc674b5776 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/GradleRunner.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/GradleRunner.groovy @@ -53,7 +53,7 @@ class GradleRunner { result = runInner(tasks) if (!result) { def errorMessage = "Failed to complete `gradle ${tasks.join(' ')}`" - if (!force) { + if (force) { messages.warning(errorMessage) } else { From ebfc89e114fd536e66019bae5a15cb3d30467013 Mon Sep 17 00:00:00 2001 From: Yaroslav Pankratyev Date: Thu, 9 Nov 2017 20:12:37 +0700 Subject: [PATCH 2/2] IDEA-115118 DevKitUseScopeEnlarger to provide custom scope for extensions --- plugins/devkit/src/DevKitUseScopeEnlarger.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/devkit/src/DevKitUseScopeEnlarger.java b/plugins/devkit/src/DevKitUseScopeEnlarger.java index 82757dee5b23..2a48e8d230d7 100644 --- a/plugins/devkit/src/DevKitUseScopeEnlarger.java +++ b/plugins/devkit/src/DevKitUseScopeEnlarger.java @@ -29,15 +29,13 @@ import com.intellij.util.xml.DomElement; import com.intellij.util.xml.DomService; import com.intellij.util.xml.DomTarget; import org.jetbrains.annotations.NotNull; +import org.jetbrains.idea.devkit.dom.Extension; import org.jetbrains.idea.devkit.dom.ExtensionPoint; import org.jetbrains.idea.devkit.dom.IdeaPlugin; import org.jetbrains.idea.devkit.util.PsiUtil; import java.util.Collection; -/** - * @author peter - */ public class DevKitUseScopeEnlarger extends UseScopeEnlarger { @Override @@ -46,7 +44,7 @@ public class DevKitUseScopeEnlarger extends UseScopeEnlarger { PomTarget target = ((PomTargetPsiElement)element).getTarget(); if (target instanceof DomTarget) { DomElement domElement = ((DomTarget)target).getDomElement(); - if (domElement instanceof ExtensionPoint) { + if (domElement instanceof ExtensionPoint || domElement instanceof Extension) { return createAllPluginDescriptorFilesSearchScope(element); } }