From c660c3eeb321337f125b048599c64d4b52056265 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Mon, 26 Dec 2011 14:16:17 +0400
Subject: [PATCH] fix broken highlighting for duplicate methods

---
 .../plugins/groovy/annotator/GroovyAnnotator.java      |  2 +-
 .../plugins/groovy/lang/GroovyHighlightingTest.groovy  | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

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 44e73486e68c..712b1b5d02eb 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
@@ -346,7 +346,7 @@ public class GroovyAnnotator extends GroovyElementVisitor implements Annotator {
     checkTypeDefinition(myHolder, typeDefinition);
     checkTypeDefinitionModifiers(myHolder, typeDefinition);
 
-    checkDuplicateMethod(typeDefinition.getGroovyMethods(), myHolder);
+    checkDuplicateMethod(typeDefinition.getMethods(), myHolder);
     checkImplementedMethodsOfClass(myHolder, typeDefinition);
     checkConstructors(myHolder, typeDefinition);
     highligtClassReference(myHolder, typeDefinition.getNameIdentifierGroovy());
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.groovy
index dd5f6a0518e9..72ed84af5b4e 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.groovy
@@ -564,4 +564,14 @@ class A {
     myFixture.addClass("package junit.framework; public class TestCase {}")
     doTest(new JUnitTestClassNamingConventionInspection(), new JUnitAbstractTestClassNamingConventionInspection())
   }
+
+  void testDuplicateMethods() {
+    myFixture.configureByText('a.groovy', '''\
+class A {
+  <error descr="Method with signature foo() is already defined in the class 'A'">def foo()</error>{}
+  <error descr="Method with signature foo() is already defined in the class 'A'">def foo(def a=null)</error>{}
+}
+''')
+    myFixture.checkHighlighting(true, false, false)
+  }
 }
\ No newline at end of file