GROOVY-5364

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/StaticInferencingTests.java

@@ -369,7 +369,8 @@ public void testStaticReference13() {
 
     @Test
     public void testStaticReference14() {
-        String contents = "class C {\n" +
+        String contents =
+            "class C {\n" +
             "  static Number x() {\n" +
             "    42\n" +
             "  }\n" +
@@ -380,7 +381,8 @@ public void testStaticReference14() {
 
     @Test
     public void testStaticReference15() {
-        String contents = "class C {\n" +
+        String contents =
+            "class C {\n" +
             "  static Number x() {\n" +
             "    42\n" +
             "  }\n" +
@@ -419,12 +421,12 @@ public void testStaticReference17() {
     public void testStaticReference18() {
         String contents =
             "class Parent {\n" +
-            "    static p() {}\n" +
+            "  static p() {}\n" +
             "}\n" +
             "class Child extends Parent {\n" +
-            "    def c() {\n" +
-            "        p()\n" +
-            "    }\n" +
+            "  def c() {\n" +
+            "    p()\n" +
+            "  }\n" +
             "}\n";
         assertDeclaringType(contents, "p()", "Parent");
     }
@@ -433,13 +435,13 @@ public void testStaticReference18() {
     public void testStaticReference19() {
         createUnit("Parent",
             "class Parent {\n" +
-            "    static p() {}\n" +
+            "  static p() {}\n" +
             "}\n");
         String contents =
             "class Child extends Parent {\n" +
-            "    def c() {\n" +
-            "        p()\n" +
-            "    }\n" +
+            "  def c() {\n" +
+            "    p()\n" +
+            "  }\n" +
             "}\n";
         assertDeclaringType(contents, "p()", "Parent");
     }
@@ -560,6 +562,30 @@ public void testStaticReference27() {
         assertKnown(contents, "name", "C", "java.lang.Object");
     }
 
+    @Test
+    public void testStaticReference28() {
+        String contents =
+            "static getStaticProperty() {}\n" +
+            "static staticMethod() {\n" +
+            "  getStaticProperty()\n" +
+            "  staticProperty\n" +
+            "}\n";
+        assertKnown(contents, "getStaticProperty", "Search", "java.lang.Object");
+        assertKnown(contents, "staticProperty", "Search", "java.lang.Object");
+    }
+
+    @Test
+    public void testStaticReference29() {
+        String contents =
+            "static getStaticProperty() {}\n" +
+            "def scriptMethod() {\n" +
+            "  getStaticProperty()\n" +
+            "  staticProperty\n" +
+            "}\n";
+        assertKnown(contents, "getStaticProperty", "Search", "java.lang.Object");
+        assertKnown(contents, "staticProperty", "Search", "java.lang.Object");
+    }
+
     //
 
     @Test // GRECLIPSE-855: should be able to find the type, but with unknown confidence

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java

@@ -944,6 +944,23 @@ public void testStaticProperty10() {
         runConformTest(sources, "3");
     }
 
+    @Test // GROOVY-5364
+    public void testStaticProperty11() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "static getStaticProperty() { '!' }\n" +
+            "static staticMethod() {\n" +
+            "  print getStaticProperty()\n" +
+            "  print staticProperty\n" +
+            "}\n" +
+            "staticMethod()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "!!");
+    }
+
     @Test
     public void testClash_GRE1076() {
         //@formatter:off

base/org.codehaus.groovy25/.checkstyle

@@ -42,6 +42,7 @@
         <file-match-pattern match-pattern="groovy/classgen/ExtendedVerifier.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/InnerClass(CompletionVisitor|Visitor(Helper)?).java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/ReturnAdder.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/classgen/VariableScopeVisitor.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/Verifier.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/BinaryExpressionHelper.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/BytecodeHelper.java" include-pattern="false" />