From 1695bb3fecd87192b7de9d79923e52ff22bbc0d2 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Wed, 28 Mar 2012 16:10:33 +0400
Subject: [PATCH] report 'Missing return' for closure if there is explicit
 generic in expected type

---
 .../MissingReturnInspection.java              |  8 +++++---
 .../groovy/lang/MissingReturnTest.groovy      |  1 +
 .../ClosureWithExplicitExpectedType.groovy    | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 plugins/groovy/testdata/highlighting/missingReturn/ClosureWithExplicitExpectedType.groovy

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/noReturnMethod/MissingReturnInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/noReturnMethod/MissingReturnInspection.java
index 8a13a53cf64f..bf16de6542e3 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/noReturnMethod/MissingReturnInspection.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/noReturnMethod/MissingReturnInspection.java
@@ -18,9 +18,7 @@ package org.jetbrains.plugins.groovy.codeInspection.noReturnMethod;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.PsiType;
+import com.intellij.psi.*;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -71,6 +69,10 @@ public class MissingReturnInspection extends GroovySuppressableInspectionTool {
     public static ReturnStatus getReturnStatus(PsiElement subject) {
       if (subject instanceof GrClosableBlock) {
         final PsiType inferredReturnType = GroovyExpectedTypesProvider.getExpectedClosureReturnType((GrClosableBlock)subject);
+        if (inferredReturnType instanceof PsiClassType) {
+          PsiClass resolved = ((PsiClassType)inferredReturnType).resolve();
+          if (resolved != null && !(resolved instanceof PsiTypeParameter)) return mustReturnValue;
+        }
         return inferredReturnType != null && inferredReturnType != PsiType.VOID ? shouldReturnValue : shouldNotReturnValue;
       }
       else if (subject instanceof GrMethod) {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/MissingReturnTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/MissingReturnTest.groovy
index e85cc9cd0a44..538fac39a666 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/MissingReturnTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/MissingReturnTest.groovy
@@ -41,6 +41,7 @@ public class MissingReturnTest extends LightCodeInsightFixtureTestCase {
   public void testImplicitReturnNull() throws Throwable {doTest();}
   public void testMissingReturnInClosure() {doTest();}
   public void testFinally() {doTest();}
+  public void testClosureWithExplicitExpectedType() {doTest()}
 
   private void doTest() {
     myFixture.enableInspections(new MissingReturnInspection());
diff --git a/plugins/groovy/testdata/highlighting/missingReturn/ClosureWithExplicitExpectedType.groovy b/plugins/groovy/testdata/highlighting/missingReturn/ClosureWithExplicitExpectedType.groovy
new file mode 100644
index 000000000000..d8a58ad50356
--- /dev/null
+++ b/plugins/groovy/testdata/highlighting/missingReturn/ClosureWithExplicitExpectedType.groovy
@@ -0,0 +1,19 @@
+def foo(Closure<String> c) {
+  return c().substring(1)
+}
+
+foo {
+  print 2
+<warning descr="Not all execution paths return a value">}</warning>
+
+foo {
+  's'
+}
+
+foo {
+  if (a) 's'
+<warning descr="Not all execution paths return a value">}</warning>
+
+foo {
+  if (a) 'a' else 'b'
+}