From dcfc73f460eb632a01100dfafbfe2d7a2cad30e1 Mon Sep 17 00:00:00 2001 From: "peter.gromov" Date: Wed, 22 Dec 2010 18:30:03 +0300 Subject: [PATCH] greener gant scripts --- .../assignment/GroovyAssignabilityCheckInspection.java | 2 ++ .../plugins/groovy/gant/GantReferenceCompletionTest.groovy | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignabilityCheckInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignabilityCheckInspection.java index bcc9d6603d2e..ff504996c2b6 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignabilityCheckInspection.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignabilityCheckInspection.java @@ -43,6 +43,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrOpenBlock; import org.jetbrains.plugins.groovy.lang.psi.api.statements.branch.GrReturnStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.*; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrAccessorMethod; +import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrBuilderMethod; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod; import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement; import org.jetbrains.plugins.groovy.lang.psi.controlFlow.Instruction; @@ -336,6 +337,7 @@ public class GroovyAssignabilityCheckInspection extends BaseInspection { private boolean checkMethodApplicability(GroovyResolveResult methodResolveResult, GroovyPsiElement place) { final PsiElement element = methodResolveResult.getElement(); if (!(element instanceof PsiMethod)) return true; + if (element instanceof GrBuilderMethod) return true; final PsiMethod method = (PsiMethod)element; PsiType[] argumentTypes = PsiUtil.getArgumentTypes(place, true); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/gant/GantReferenceCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/gant/GantReferenceCompletionTest.groovy index ebb97fead944..82c4f481a280 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/gant/GantReferenceCompletionTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/gant/GantReferenceCompletionTest.groovy @@ -164,10 +164,10 @@ target (default : '') { myFixture.configureByText "a.gant", """ target (default : '') { - echo(new FileInputStream()) echo("hello2") echo(message: 'Echo task.') ant.fail('Failure reason') + ant.junit(fork:'yes') {} }""" myFixture.checkHighlighting(true, false, false) }