IDEA-80142 "Ambiguous code block" displayed when Closure is used in optionValue attribute

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
index 0d684f8bce7ec83c281611f5b5290cd8558c4f77..7e1453ff7e78081545990c34d624e77cdd65a0a8 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
@@ -863,6 +863,7 @@ public class GroovyAnnotator extends GroovyElementVisitor implements Annotator {
   private static boolean isClosureAmbiguous(GrClosableBlock closure) {
     PsiElement place = closure;
     while (true) {
+      if (place instanceof GrUnAmbiguousClosureContainer) return false;
       if (PsiUtil.isExpressionStatement(place)) return true;
 
       PsiElement parent = place.getParent();

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/expressions/GrUnAmbiguousClosureContainer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/expressions/GrUnAmbiguousClosureContainer.java
new file mode 100644 (file)
index 0000000..31ebec8
--- /dev/null
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/expressions/GrUnAmbiguousClosureContainer.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2000-2012 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions;
+
+/**
+ * Marker interface. Hack for GSP injected expressions with closures
+ * @see org.jetbrains.plugins.groovy.annotator.GroovyAnnotator#isClosureAmbiguous(org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock)
+ * @author Max Medvedev
+ */
+public interface GrUnAmbiguousClosureContainer {}