MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

platform.core.impl — remove dependency on intellij.platform.util.ui and intellij.platform.core.ui

Browse Source 
java.psi.iml — remove dependency on intellij.platform.core.ui

GitOrigin-RevId: c1d4feb04c0471c7d17b5331b86738ee54a97f80
This commit is contained in:
Vladimir Krivosheev
2020-09-15 16:41:21 +02:00
committed by intellij-monorepo-bot
parent 3d32cf7775
commit a67c59c561
276 changed files with 897 additions and 975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/java-indexing-api/intellij.java.indexing.iml
View File

@@ -13,5 +13,6 @@
<orderEntry type="module" module-name="intellij.platform.indexing" />
<orderEntry type="module" module-name="intellij.platform.concurrency" />
<orderEntry type="library" name="Trove4j" level="project" />
<orderEntry type="library" name="fastutil-min" level="project" />
</component>
</module>

6
java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java
View File

@@ -13,7 +13,6 @@ import com.intellij.psi.SmartPointerManager;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.*;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
@@ -144,8 +143,9 @@ public final class ClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass
}
return AbstractQuery.wrapInReadAction(directQuery);
}
return INSTANCE.createUniqueResultsQuery(parameters, ContainerUtil.canonicalStrategy(),
psiClass -> ReadAction.compute(() -> SmartPointerManager.getInstance(psiClass.getProject()).createSmartPsiElementPointer(psiClass)));
return INSTANCE.createUniqueResultsQuery(parameters, psiClass -> {
return ReadAction.compute(() -> SmartPointerManager.getInstance(psiClass.getProject()).createSmartPsiElementPointer(psiClass));
});
}
/**

21
java/java-indexing-api/src/com/intellij/psi/search/searches/FunctionalExpressionSearch.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2014 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.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.psi.search.searches;
import com.intellij.openapi.application.ReadAction;
@@ -22,10 +8,9 @@ import com.intellij.psi.search.SearchScope;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.EmptyQuery;
import com.intellij.util.Query;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
public class FunctionalExpressionSearch extends ExtensibleQueryFactory<PsiFunctionalExpression, FunctionalExpressionSearch.SearchParameters> {
public final class FunctionalExpressionSearch extends ExtensibleQueryFactory<PsiFunctionalExpression, FunctionalExpressionSearch.SearchParameters> {
private static final FunctionalExpressionSearch INSTANCE = new FunctionalExpressionSearch();
public static class SearchParameters {
@@ -48,7 +33,7 @@ public class FunctionalExpressionSearch extends ExtensibleQueryFactory<PsiFuncti
}
public static Query<PsiFunctionalExpression> search(@NotNull final PsiClass aClass, @NotNull SearchScope scope) {
return INSTANCE.createUniqueResultsQuery(new SearchParameters(aClass, scope), ContainerUtil.canonicalStrategy(), SmartPointerManager::createPointer);
return INSTANCE.createUniqueResultsQuery(new SearchParameters(aClass, scope), SmartPointerManager::createPointer);
}
public static Query<PsiFunctionalExpression> search(@NotNull final PsiMethod psiMethod) {

9
java/java-indexing-api/src/com/intellij/psi/search/searches/ImplicitToStringSearch.java
View File

@@ -1,13 +1,12 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.psi.search.searches;
import com.intellij.psi.*;
import com.intellij.psi.search.SearchScope;
import com.intellij.util.Query;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
public class ImplicitToStringSearch extends ExtensibleQueryFactory<PsiExpression, ImplicitToStringSearch.SearchParameters> {
public final class ImplicitToStringSearch extends ExtensibleQueryFactory<PsiExpression, ImplicitToStringSearch.SearchParameters> {
public static final ImplicitToStringSearch INSTANCE = new ImplicitToStringSearch();
public static class SearchParameters {
@@ -32,9 +31,7 @@ public class ImplicitToStringSearch extends ExtensibleQueryFactory<PsiExpression
}
public static Query<PsiExpression> search(@NotNull PsiMethod targetMethod, @NotNull SearchScope scope) {
return INSTANCE.createUniqueResultsQuery(new SearchParameters(targetMethod, scope),
ContainerUtil.canonicalStrategy(),
SmartPointerManager::createPointer);
return INSTANCE.createUniqueResultsQuery(new SearchParameters(targetMethod, scope), SmartPointerManager::createPointer);
}
public static boolean isToStringMethod(@NotNull PsiElement element) {

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

@@ -9,12 +9,11 @@ import com.intellij.psi.PsiReference;
import com.intellij.psi.search.*;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.*;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public final class MethodReferencesSearch extends ExtensibleQueryFactory<PsiReference, MethodReferencesSearch.SearchParameters> {
public static final ExtensionPointName<QueryExecutor<PsiReference, MethodReferencesSearch.SearchParameters>> EP_NAME = ExtensionPointName.create("com.intellij.methodReferencesSearch");
public static final ExtensionPointName<QueryExecutor<PsiReference, MethodReferencesSearch.SearchParameters>> EP_NAME = new ExtensionPointName<>("com.intellij.methodReferencesSearch");
public static final MethodReferencesSearch INSTANCE = new MethodReferencesSearch();
public static class SearchParameters implements DumbAwareSearchParameters {
@@ -135,6 +134,6 @@ public final class MethodReferencesSearch extends ExtensibleQueryFactory<PsiRefe
}
private static UniqueResultsQuery<PsiReference, ReferenceDescriptor> uniqueResults(@NotNull Query<? extends PsiReference> composite) {
return new UniqueResultsQuery<>(composite, ContainerUtil.canonicalStrategy(), ReferenceDescriptor.MAPPER);
return new UniqueResultsQuery<>(composite, ReferenceDescriptor.MAPPER);
}
}