get rid of ParentMatcher and Matcher altogether

python/src/com/jetbrains/python/validation/ImportAnnotator.java

@@ -1,22 +1,18 @@
 package com.jetbrains.python.validation;
 
+import com.intellij.psi.util.PsiTreeUtil;
 import com.jetbrains.python.PyBundle;
 import com.jetbrains.python.psi.PyClass;
 import com.jetbrains.python.psi.PyFromImportStatement;
 import com.jetbrains.python.psi.PyFunction;
-import com.jetbrains.python.psi.patterns.Matcher;
-import com.jetbrains.python.psi.patterns.ParentMatcher;
 
 /**
  * Checks for non-top-level star imports.
  */
 public class ImportAnnotator extends PyAnnotator {
-
-  private static Matcher INAPPROPRIATE = new ParentMatcher(PyClass.class, PyFunction.class);
-
   @Override
   public void visitPyFromImportStatement(final PyFromImportStatement node) {
-    if (node.isStarImport() && INAPPROPRIATE.search(node) != null) {
+    if (node.isStarImport() && PsiTreeUtil.getParentOfType(node, PyFunction.class, PyClass.class) != null) {
       getHolder().createWarningAnnotation(node, PyBundle.message("ANN.star.import.at.top.only"));
     }
   }

python/testData/highlighting/importStarAtTopLevel.py

@@ -0,0 +1,2 @@
+def foo():
+    <warning descr="'import *' only allowed at module level">from sys import *</warning>

python/testSrc/com/jetbrains/python/PythonHighlightingTest.java

@@ -88,6 +88,10 @@ public class PythonHighlightingTest extends PyLightFixtureTestCase {
   public void testYieldOutsideOfFunction() {
     doTest();
   }
+  
+  public void testImportStarAtTopLevel() {
+    doTest(true, false);
+  }
 
   public void testMalformedStringUnterminated() {
     doTest();