Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 48 insertions, 0 deletions

diff --git a/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/CommentFilter.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/CommentFilter.java
new file mode 100644
index 000000000000..c2d974c9754e
--- /dev/null
+++ b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/filters/CommentFilter.java
@@ -0,0 +1,48 @@
+package com.intellij.structuralsearch.impl.matcher.filters;
+
+import com.intellij.dupLocator.util.NodeFilter;
+import com.intellij.psi.*;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: Maxim.Mossienko
+ * Date: Apr 22, 2004
+ * Time: 9:13:12 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class CommentFilter extends JavaElementVisitor implements NodeFilter {
+  protected boolean result;
+
+  @Override public void visitComment(PsiComment comment) {
+    result = true;
+  }
+
+  @Override public void visitField(PsiField field) {
+    result = true;
+  }
+
+  @Override public void visitMethod(PsiMethod method) {
+    result = true;
+  }
+
+  @Override public void visitClass(PsiClass clazz) {
+    result = true;
+  }
+
+  private static class NodeFilterHolder {
+    private static final NodeFilter instance = new CommentFilter();
+  }
+
+  public static NodeFilter getInstance() {
+    return NodeFilterHolder.instance;
+  }
+
+  private CommentFilter() {
+  }
+
+  public boolean accepts(PsiElement element) {
+    result = false;
+    if (element!=null) element.accept(this);
+    return result;
+  }
+}