Merge branch 'upsource-master'

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java

@@ -24,7 +24,6 @@ import com.intellij.codeInsight.generation.PsiFieldMember;
 import com.intellij.codeInsight.generation.PsiMethodMember;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInsight.intention.impl.AssignFieldFromParameterAction;
-import com.intellij.codeInsight.intention.impl.CreateFieldFromParameterAction;
 import com.intellij.codeInsight.intention.impl.FieldFromParameterUtils;
 import com.intellij.ide.util.MemberChooser;
 import com.intellij.openapi.application.ApplicationManager;

java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java

@@ -47,7 +47,6 @@ import org.jetbrains.annotations.Nullable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class JavaDocInfoGenerator {

java/java-impl/src/com/intellij/psi/impl/search/SimpleAccessorScopeProvider.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.psi.impl.search;
+
+import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.search.SearchScope;
+
+public class SimpleAccessorScopeProvider implements CustomPropertyScopeProvider {
+  public SearchScope getScope(final Project project) {
+    return GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.allScope(project),
+                                                           StdFileTypes.JSP, StdFileTypes.JSPX,
+                                                           StdFileTypes.XML, StdFileTypes.XHTML);
+  }
+}

java/java-indexing-api/java-indexing-api.iml

@@ -9,6 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core-api" />
     <orderEntry type="module" module-name="java-psi-api" />
+    <orderEntry type="module" module-name="indexing-api" />
   </component>
 </module>
 

java/java-indexing-api/src/com/intellij/psi/search/searches/AllClassesSearch.java

@@ -19,13 +19,16 @@
  */
 package com.intellij.psi.search.searches;
 
+import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Condition;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.util.Query;
+import com.intellij.util.QueryExecutor;
 
 public class AllClassesSearch extends ExtensibleQueryFactory<PsiClass, AllClassesSearch.SearchParameters> {
+  public static ExtensionPointName<QueryExecutor> EP_NAME = ExtensionPointName.create("com.intellij.allClassesSearch");
   public static final AllClassesSearch INSTANCE = new AllClassesSearch();
 
   public static class SearchParameters {

java/java-indexing-api/src/com/intellij/psi/search/searches/AllOverridingMethodsSearch.java

@@ -16,6 +16,7 @@
 
 package com.intellij.psi.search.searches;
 
+import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiMethod;
@@ -24,6 +25,7 @@ import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.EmptyQuery;
 import com.intellij.util.Query;
+import com.intellij.util.QueryExecutor;
 
 /**
  * @author ven
@@ -31,6 +33,7 @@ import com.intellij.util.Query;
  * (method in original class, overriding method)
  */
 public class AllOverridingMethodsSearch extends ExtensibleQueryFactory<Pair<PsiMethod, PsiMethod>, AllOverridingMethodsSearch.SearchParameters> {
+  public static ExtensionPointName<QueryExecutor> EP_NAME = ExtensionPointName.create("com.intellij.allOverridingMethodsSearch");
   public static final AllOverridingMethodsSearch INSTANCE = new AllOverridingMethodsSearch();
 
   public static class SearchParameters {

java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotatedElementsSearch.java

@@ -15,13 +15,16 @@
  */
 package com.intellij.psi.search.searches;
 
+import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.psi.*;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.util.InstanceofQuery;
 import com.intellij.util.Query;
+import com.intellij.util.QueryExecutor;
 import org.jetbrains.annotations.NotNull;
 
 public class AnnotatedElementsSearch extends ExtensibleQueryFactory<PsiModifierListOwner, AnnotatedElementsSearch.Parameters> {
+  public static ExtensionPointName<QueryExecutor> EP_NAME = ExtensionPointName.create("com.intellij.annotatedElementsSearch");
   public static final AnnotatedElementsSearch INSTANCE = new AnnotatedElementsSearch();
 
   public static class Parameters {

java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java

@@ -15,6 +15,7 @@
  */
 package com.intellij.psi.search.searches;
 
+import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.search.*;
@@ -27,6 +28,7 @@ import org.jetbrains.annotations.Nullable;
  * @author max
  */
 public class MethodReferencesSearch extends ExtensibleQueryFactory<PsiReference, MethodReferencesSearch.SearchParameters> {
+  public static ExtensionPointName<QueryExecutor> EP_NAME = ExtensionPointName.create("com.intellij.methodReferencesSearch");
   public static final MethodReferencesSearch INSTANCE = new MethodReferencesSearch();
 
   public static class SearchParameters {

java/java-indexing-impl/src/com/intellij/psi/impl/search/AllClassesSearchExecutor.java

@@ -21,9 +21,11 @@ package com.intellij.psi.impl.search;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.progress.ProgressIndicator;
-import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.ProgressIndicatorProvider;
 import com.intellij.openapi.util.Computable;
-import com.intellij.psi.*;
+import com.intellij.psi.JavaRecursiveElementWalkingVisitor;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.LocalSearchScope;
 import com.intellij.psi.search.PsiShortNamesCache;
@@ -64,7 +66,7 @@ public class AllClassesSearchExecutor implements QueryExecutor<PsiClass, AllClas
       }
     });
 
-    final ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator();
+    final ProgressIndicator indicator = ProgressIndicatorProvider.getInstance().getProgressIndicator();
     if (indicator != null) {
       indicator.checkCanceled();
     }
@@ -92,7 +94,7 @@ public class AllClassesSearchExecutor implements QueryExecutor<PsiClass, AllClas
     });
 
     for (final String name : sorted) {
-      ProgressManager.checkCanceled();
+      ProgressIndicatorProvider.checkCanceled();
       final PsiClass[] classes = ApplicationManager.getApplication().runReadAction(new Computable<PsiClass[]>() {
         @Override
         public PsiClass[] compute() {
@@ -100,7 +102,7 @@ public class AllClassesSearchExecutor implements QueryExecutor<PsiClass, AllClas
         }
       });
       for (PsiClass psiClass : classes) {
-        ProgressManager.checkCanceled();
+        ProgressIndicatorProvider.checkCanceled();
         if (!processor.process(psiClass)) {
           return false;
         }

java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java

@@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
  * @author max
  */
 public class MethodUsagesSearcher extends QueryExecutorBase<PsiReference, MethodReferencesSearch.SearchParameters> {
-  protected MethodUsagesSearcher() {
+  public MethodUsagesSearcher() {
     super(true);
   }
 

java/java-indexing-impl/src/com/intellij/psi/impl/search/SimpleAccessorReferenceSearcher.java

@@ -17,7 +17,6 @@ package com.intellij.psi.impl.search;
 
 import com.intellij.openapi.application.QueryExecutorBase;
 import com.intellij.openapi.extensions.Extensions;
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiMethod;
@@ -51,10 +50,7 @@ public class SimpleAccessorReferenceSearcher extends QueryExecutorBase<PsiRefere
   static void addPropertyAccessUsages(PsiMethod method, SearchScope scope, SearchRequestCollector collector) {
     final String propertyName = PropertyUtil.getPropertyName(method);
     if (StringUtil.isNotEmpty(propertyName)) {
-      SearchScope additional = GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.allScope(method.getProject()),
-                                                                               StdFileTypes.JSP, StdFileTypes.JSPX,
-                                                                               StdFileTypes.XML, StdFileTypes.XHTML);
-
+      SearchScope additional = GlobalSearchScope.EMPTY_SCOPE;
       for (CustomPropertyScopeProvider provider : Extensions.getExtensions(CustomPropertyScopeProvider.EP_NAME)) {
         additional = additional.union(provider.getScope(method.getProject()));
       }

java/java-psi-api/java-psi-api.iml

@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core-api" exported="" />
+    <orderEntry type="module" module-name="projectModel-api" />
   </component>
 </module>
 

java/java-psi-api/src/com/intellij/psi/search/searches/DeepestSuperMethodsSearch.java

@@ -15,13 +15,16 @@
  */
 package com.intellij.psi.search.searches;
 
+import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.psi.PsiMethod;
 import com.intellij.util.Query;
+import com.intellij.util.QueryExecutor;
 
 /**
  * @author max
  */
 public class DeepestSuperMethodsSearch extends ExtensibleQueryFactory<PsiMethod, PsiMethod> {
+  public static ExtensionPointName<QueryExecutor> EP_NAME = ExtensionPointName.create("com.intellij.deepestSuperMethodsSearch");
   public static final DeepestSuperMethodsSearch DEEPEST_SUPER_METHODS_SEARCH_INSTANCE = new DeepestSuperMethodsSearch();
 
   private DeepestSuperMethodsSearch() {

resources/src/META-INF/IdeaPlugin.xml

@@ -181,6 +181,8 @@
     <codeInsight.lineMarkerProvider language="" implementationClass="com.intellij.ui.ColorLineMarkerProvider"/>
     <!--<expectedTypesProvider implementation="com.intellij.codeInsight.JavaExpectedTypesProvider"/>-->
 
+    <customPropertyScopeProvider implementation="com.intellij.psi.impl.search.SimpleAccessorScopeProvider"/>
+
     <referencesSearch implementation="com.intellij.psi.impl.search.PsiAnnotationMethodReferencesSearcher"/>
     <referencesSearch implementation="com.intellij.psi.impl.search.ConstructorReferencesSearcher"/>
     <referencesSearch implementation="com.intellij.psi.impl.search.SimpleAccessorReferenceSearcher"/>