From 7516a1301dff90be4fe442f2f86373abc7c566c7 Mon Sep 17 00:00:00 2001
From: "peter.gromov" <peter@jetbrains.com>
Date: Wed, 17 Nov 2010 17:51:46 +0300
Subject: [PATCH] remove read action

---
 .../ExpressionSmartCompletionContributor.java     |  2 +-
 .../completion/AbstractCompletionContributor.java | 15 ---------------
 .../completion/CompletionContributor.java         |  4 ++--
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ExpressionSmartCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/ExpressionSmartCompletionContributor.java
index ef9a1de0b794..026625166d4c 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/ExpressionSmartCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/ExpressionSmartCompletionContributor.java
@@ -38,7 +38,7 @@ public abstract class ExpressionSmartCompletionContributor extends AbstractCompl
   public void fillCompletionVariants(final JavaSmartCompletionParameters parameters, CompletionResultSet result) {
     for (final Pair<ElementPattern<? extends PsiElement>, CompletionProvider<JavaSmartCompletionParameters>> pair : myList) {
       final ProcessingContext context = new ProcessingContext();
-      if (isPatternSuitable(pair.first, parameters, context)) {
+      if (pair.first.accepts(parameters.getPosition(), context)) {
         pair.second.addCompletionVariants(parameters, context, result);
       }
     }
diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/AbstractCompletionContributor.java b/platform/lang-api/src/com/intellij/codeInsight/completion/AbstractCompletionContributor.java
index 8eab3559f61f..649b0ed437b7 100644
--- a/platform/lang-api/src/com/intellij/codeInsight/completion/AbstractCompletionContributor.java
+++ b/platform/lang-api/src/com/intellij/codeInsight/completion/AbstractCompletionContributor.java
@@ -15,12 +15,6 @@
  */
 package com.intellij.codeInsight.completion;
 
-import com.intellij.psi.PsiElement;
-import com.intellij.patterns.ElementPattern;
-import com.intellij.util.ProcessingContext;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.util.Computable;
-
 /**
  * @author peter
  */
@@ -37,13 +31,4 @@ public abstract class AbstractCompletionContributor<Params extends CompletionPar
    * @see CompletionService#getVariantsFromContributors(com.intellij.openapi.extensions.ExtensionPointName, CompletionParameters, AbstractCompletionContributor , com.intellij.util.Consumer)
    */
   public abstract void fillCompletionVariants(Params parameters, CompletionResultSet result);
-
-  protected static boolean isPatternSuitable(final ElementPattern<? extends PsiElement> pattern, final CompletionParameters parameters,
-                                             final ProcessingContext context) {
-    return ApplicationManager.getApplication().runReadAction(new Computable<Boolean>() {
-      public Boolean compute() {
-        return pattern.accepts(parameters.getPosition(), context);
-      }
-    }).booleanValue();
-  }
 }
diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java
index ed0758c99a9e..9ad079f101ee 100644
--- a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java
+++ b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java
@@ -152,7 +152,7 @@ public abstract class CompletionContributor extends AbstractCompletionContributo
   public void fillCompletionVariants(final CompletionParameters parameters, CompletionResultSet result) {
     for (final Pair<ElementPattern<? extends PsiElement>, CompletionProvider<CompletionParameters>> pair : myMap.get(parameters.getCompletionType())) {
       final ProcessingContext context = new ProcessingContext();
-      if (isPatternSuitable(pair.first, parameters, context)) {
+      if (pair.first.accepts(parameters.getPosition(), context)) {
         pair.second.addCompletionVariants(parameters, context, result);
         if (result.isStopped()) {
           return;
@@ -161,7 +161,7 @@ public abstract class CompletionContributor extends AbstractCompletionContributo
     }
     for (final Pair<ElementPattern<? extends PsiElement>, CompletionProvider<CompletionParameters>> pair : myMap.get(null)) {
       final ProcessingContext context = new ProcessingContext();
-      if (isPatternSuitable(pair.first, parameters, context)) {
+      if (pair.first.accepts(parameters.getPosition(), context)) {
         pair.second.addCompletionVariants(parameters, context, result);
         if (result.isStopped()) {
           return;