Skip to content

Commit 9500e27

Browse files
VISTALLVISTALL
committed
compile fix after update
1 parent aa1960a commit 9500e27

7 files changed

Lines changed: 221 additions & 302 deletions

File tree

‎csharp-impl/src/main/java/consulo/csharp/impl/ide/findUsage/referenceSearch/AdditionalReferenceSearch.java‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,36 @@
1717
package consulo.csharp.impl.ide.findUsage.referenceSearch;
1818

1919
import consulo.annotation.component.ExtensionImpl;
20+
import consulo.application.util.function.Processor;
21+
import consulo.csharp.lang.impl.psi.source.resolve.util.CSharpResolveUtil;
2022
import consulo.language.psi.PsiElement;
2123
import consulo.language.psi.PsiReference;
2224
import consulo.language.psi.search.ReferencesSearch;
23-
import consulo.application.util.function.Processor;
24-
import consulo.csharp.lang.impl.psi.source.resolve.util.CSharpResolveUtil;
2525
import consulo.language.psi.search.ReferencesSearchQueryExecutor;
2626
import consulo.project.util.query.QueryExecutorBase;
27-
2827
import jakarta.annotation.Nonnull;
2928

29+
import java.util.function.Predicate;
30+
3031
/**
3132
* @author VISTALL
3233
* @since 27.10.14
3334
*/
3435
@ExtensionImpl
35-
public class AdditionalReferenceSearch extends QueryExecutorBase<PsiReference, ReferencesSearch.SearchParameters> implements ReferencesSearchQueryExecutor
36-
{
37-
@Override
38-
public void processQuery(@Nonnull ReferencesSearch.SearchParameters queryParameters, @Nonnull Processor<? super PsiReference> consumer)
39-
{
40-
PsiElement elementToSearch = queryParameters.getElementToSearch();
36+
public class AdditionalReferenceSearch extends QueryExecutorBase<PsiReference, ReferencesSearch.SearchParameters> implements ReferencesSearchQueryExecutor {
37+
@Override
38+
public void processQuery(@Nonnull ReferencesSearch.SearchParameters queryParameters, @Nonnull Predicate<? super PsiReference> consumer) {
39+
PsiElement elementToSearch = queryParameters.getElementToSearch();
4140

42-
PsiElement declaration = elementToSearch.getUserData(CSharpResolveUtil.EXTENSION_METHOD_WRAPPER);
43-
if(declaration == null)
44-
{
45-
declaration = elementToSearch.getUserData(CSharpResolveUtil.ACCESSOR_VALUE_VARIABLE_OWNER);
46-
}
41+
PsiElement declaration = elementToSearch.getUserData(CSharpResolveUtil.EXTENSION_METHOD_WRAPPER);
42+
if (declaration == null) {
43+
declaration = elementToSearch.getUserData(CSharpResolveUtil.ACCESSOR_VALUE_VARIABLE_OWNER);
44+
}
4745

48-
if(declaration == null)
49-
{
50-
return;
51-
}
46+
if (declaration == null) {
47+
return;
48+
}
5249

53-
ReferencesSearch.search(declaration, queryParameters.getEffectiveSearchScope(), queryParameters.isIgnoreAccessScope()).forEach(consumer);
54-
}
50+
ReferencesSearch.search(declaration, queryParameters.getEffectiveSearchScope(), queryParameters.isIgnoreAccessScope()).forEach(consumer);
51+
}
5552
}

‎csharp-impl/src/main/java/consulo/csharp/impl/ide/findUsage/referenceSearch/CSharpConstructorPlusTypeReferenceSearch.java‎

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import consulo.annotation.component.ExtensionImpl;
2020
import consulo.application.AccessRule;
21-
import consulo.application.util.function.Processor;
2221
import consulo.csharp.lang.impl.psi.light.builder.CSharpLightConstructorDeclarationBuilder;
2322
import consulo.csharp.lang.impl.psi.resolve.additionalMembersImpl.StructOrGenericParameterConstructorProvider;
2423
import consulo.csharp.lang.psi.CSharpConstructorDeclaration;
@@ -29,42 +28,37 @@
2928
import consulo.language.psi.search.ReferencesSearch;
3029
import consulo.language.psi.search.ReferencesSearchQueryExecutor;
3130
import consulo.project.util.query.QueryExecutorBase;
32-
3331
import jakarta.annotation.Nonnull;
3432

33+
import java.util.function.Predicate;
34+
3535
/**
3636
* @author VISTALL
3737
* @since 16.04.2015
3838
*/
3939
@ExtensionImpl
40-
public class CSharpConstructorPlusTypeReferenceSearch extends QueryExecutorBase<PsiReference, ReferencesSearch.SearchParameters> implements ReferencesSearchQueryExecutor
41-
{
42-
@Override
43-
public void processQuery(@Nonnull ReferencesSearch.SearchParameters queryParameters, @Nonnull Processor<? super PsiReference> consumer)
44-
{
45-
PsiElement elementToSearch = queryParameters.getElementToSearch();
40+
public class CSharpConstructorPlusTypeReferenceSearch extends QueryExecutorBase<PsiReference, ReferencesSearch.SearchParameters> implements ReferencesSearchQueryExecutor {
41+
@Override
42+
public void processQuery(@Nonnull ReferencesSearch.SearchParameters queryParameters, @Nonnull Predicate<? super PsiReference> consumer) {
43+
PsiElement elementToSearch = queryParameters.getElementToSearch();
4644

47-
if(elementToSearch instanceof CSharpTypeDeclaration)
48-
{
49-
String name = AccessRule.read(((CSharpTypeDeclaration) elementToSearch)::getName);
50-
if(name == null)
51-
{
52-
return;
53-
}
45+
if (elementToSearch instanceof CSharpTypeDeclaration) {
46+
String name = AccessRule.read(((CSharpTypeDeclaration) elementToSearch)::getName);
47+
if (name == null) {
48+
return;
49+
}
5450

55-
for(DotNetNamedElement member : AccessRule.read(((CSharpTypeDeclaration) elementToSearch)::getMembers))
56-
{
57-
if(member instanceof CSharpConstructorDeclaration)
58-
{
59-
queryParameters.getOptimizer().searchWord(name, queryParameters.getEffectiveSearchScope(), true, member);
60-
}
61-
}
51+
for (DotNetNamedElement member : AccessRule.read(((CSharpTypeDeclaration) elementToSearch)::getMembers)) {
52+
if (member instanceof CSharpConstructorDeclaration) {
53+
queryParameters.getOptimizer().searchWord(name, queryParameters.getEffectiveSearchScope(), true, member);
54+
}
55+
}
6256

63-
CSharpLightConstructorDeclarationBuilder constructor = AccessRule.read(() -> StructOrGenericParameterConstructorProvider.buildDefaultConstructor((DotNetNamedElement) elementToSearch, name));
57+
CSharpLightConstructorDeclarationBuilder constructor = AccessRule.read(() -> StructOrGenericParameterConstructorProvider.buildDefaultConstructor((DotNetNamedElement) elementToSearch, name));
6458

65-
queryParameters.getOptimizer().searchWord(name, queryParameters.getEffectiveSearchScope(), true, constructor);
66-
} /*
67-
else if(elementToSearch instanceof CSharpConstructorDeclaration)
59+
queryParameters.getOptimizer().searchWord(name, queryParameters.getEffectiveSearchScope(), true, constructor);
60+
} /*
61+
else if(elementToSearch instanceof CSharpConstructorDeclaration)
6862
{
6963
PsiElement parent = elementToSearch.getParent();
7064
if(parent instanceof CSharpTypeDeclaration)
@@ -74,6 +68,6 @@ else if(elementToSearch instanceof CSharpConstructorDeclaration)
7468
}
7569
} */
7670

77-
}
71+
}
7872

7973
}

‎csharp-impl/src/main/java/consulo/csharp/impl/ide/findUsage/referenceSearch/CSharpImplementedReferenceSearch.java‎

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,56 +17,45 @@
1717
package consulo.csharp.impl.ide.findUsage.referenceSearch;
1818

1919
import consulo.annotation.component.ExtensionImpl;
20-
import consulo.application.util.function.Processor;
21-
import consulo.language.psi.PsiReference;
2220
import consulo.application.ApplicationManager;
23-
import consulo.application.util.function.Computable;
24-
import consulo.csharp.lang.psi.CSharpMethodDeclaration;
2521
import consulo.csharp.lang.impl.psi.source.resolve.overrideSystem.OverrideUtil;
22+
import consulo.csharp.lang.psi.CSharpMethodDeclaration;
2623
import consulo.dotnet.psi.DotNetModifier;
2724
import consulo.dotnet.psi.DotNetVirtualImplementOwner;
2825
import consulo.language.psi.PsiElement;
26+
import consulo.language.psi.PsiReference;
2927
import consulo.language.psi.search.ReferencesSearch;
3028
import consulo.language.psi.search.ReferencesSearchQueryExecutor;
3129
import consulo.project.util.query.QueryExecutorBase;
32-
3330
import jakarta.annotation.Nonnull;
31+
3432
import java.util.Collection;
3533
import java.util.Collections;
34+
import java.util.function.Predicate;
35+
import java.util.function.Supplier;
3636

3737
/**
3838
* @author VISTALL
3939
* @since 17-May-16
4040
*/
4141
@ExtensionImpl
42-
public class CSharpImplementedReferenceSearch extends QueryExecutorBase<PsiReference, ReferencesSearch.SearchParameters> implements ReferencesSearchQueryExecutor
43-
{
44-
@Override
45-
public void processQuery(@Nonnull ReferencesSearch.SearchParameters queryParameters, @Nonnull Processor<? super PsiReference> consumer)
46-
{
47-
final PsiElement elementToSearch = queryParameters.getElementToSearch();
48-
if(elementToSearch instanceof CSharpMethodDeclaration)
49-
{
50-
Collection<DotNetVirtualImplementOwner> targets = ApplicationManager.getApplication().runReadAction(new Computable<Collection<DotNetVirtualImplementOwner>>()
51-
{
52-
@Override
53-
public Collection<DotNetVirtualImplementOwner> compute()
54-
{
55-
if(((CSharpMethodDeclaration) elementToSearch).hasModifier(DotNetModifier.ABSTRACT))
56-
{
57-
return OverrideUtil.collectOverridenMembers((DotNetVirtualImplementOwner) elementToSearch);
58-
}
59-
return Collections.emptyList();
60-
}
61-
});
42+
public class CSharpImplementedReferenceSearch extends QueryExecutorBase<PsiReference, ReferencesSearch.SearchParameters> implements ReferencesSearchQueryExecutor {
43+
@Override
44+
public void processQuery(@Nonnull ReferencesSearch.SearchParameters queryParameters, @Nonnull Predicate<? super PsiReference> consumer) {
45+
final PsiElement elementToSearch = queryParameters.getElementToSearch();
46+
if (elementToSearch instanceof CSharpMethodDeclaration) {
47+
Collection<DotNetVirtualImplementOwner> targets = ApplicationManager.getApplication().runReadAction((Supplier<Collection<DotNetVirtualImplementOwner>>) () -> {
48+
if (((CSharpMethodDeclaration) elementToSearch).hasModifier(DotNetModifier.ABSTRACT)) {
49+
return OverrideUtil.collectOverridenMembers((DotNetVirtualImplementOwner) elementToSearch);
50+
}
51+
return Collections.emptyList();
52+
});
6253

63-
for(DotNetVirtualImplementOwner target : targets)
64-
{
65-
if(!ReferencesSearch.search(target, queryParameters.getEffectiveSearchScope()).forEach(consumer))
66-
{
67-
return;
68-
}
69-
}
70-
}
71-
}
54+
for (DotNetVirtualImplementOwner target : targets) {
55+
if (!ReferencesSearch.search(target, queryParameters.getEffectiveSearchScope()).forEach(consumer)) {
56+
return;
57+
}
58+
}
59+
}
60+
}
7261
}

‎csharp-impl/src/main/java/consulo/csharp/impl/ide/navigation/CSharpMethodImplementationsSearcher.java‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,30 @@
1818

1919
import consulo.annotation.component.ExtensionImpl;
2020
import consulo.application.ReadAction;
21-
import consulo.application.util.function.Processor;
2221
import consulo.csharp.lang.impl.psi.source.resolve.overrideSystem.OverrideUtil;
2322
import consulo.dotnet.psi.DotNetVirtualImplementOwner;
2423
import consulo.language.psi.PsiElement;
2524
import consulo.language.psi.search.DefinitionsScopedSearch;
2625
import consulo.language.psi.search.DefinitionsScopedSearchExecutor;
2726
import consulo.util.collection.ContainerUtil;
28-
2927
import jakarta.annotation.Nonnull;
28+
3029
import java.util.Collection;
30+
import java.util.function.Predicate;
3131

3232
/**
3333
* @author VISTALL
3434
* @since 17-May-16
3535
*/
3636
@ExtensionImpl
37-
public class CSharpMethodImplementationsSearcher implements DefinitionsScopedSearchExecutor
38-
{
39-
@Override
40-
public boolean execute(@Nonnull DefinitionsScopedSearch.SearchParameters queryParameters, @Nonnull Processor<? super PsiElement> consumer)
41-
{
42-
PsiElement element = queryParameters.getElement();
43-
if(element instanceof DotNetVirtualImplementOwner)
44-
{
45-
Collection<DotNetVirtualImplementOwner> members = ReadAction.compute(() -> OverrideUtil.collectOverridenMembers((DotNetVirtualImplementOwner) element));
46-
return ContainerUtil.process(members, consumer);
47-
}
48-
return true;
49-
}
37+
public class CSharpMethodImplementationsSearcher implements DefinitionsScopedSearchExecutor {
38+
@Override
39+
public boolean execute(@Nonnull DefinitionsScopedSearch.SearchParameters queryParameters, @Nonnull Predicate<? super PsiElement> consumer) {
40+
PsiElement element = queryParameters.getElement();
41+
if (element instanceof DotNetVirtualImplementOwner) {
42+
Collection<DotNetVirtualImplementOwner> members = ReadAction.compute(() -> OverrideUtil.collectOverridenMembers((DotNetVirtualImplementOwner) element));
43+
return ContainerUtil.process(members, consumer);
44+
}
45+
return true;
46+
}
5047
}

‎csharp-impl/src/main/java/consulo/csharp/impl/ide/navigation/CSharpTypeImplementationSearcher.java‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,28 @@
1717
package consulo.csharp.impl.ide.navigation;
1818

1919
import consulo.annotation.component.ExtensionImpl;
20-
import consulo.application.util.function.Processor;
2120
import consulo.csharp.lang.impl.psi.msil.CSharpTransform;
2221
import consulo.dotnet.psi.DotNetTypeDeclaration;
2322
import consulo.dotnet.psi.search.searches.TypeInheritorsSearch;
2423
import consulo.language.psi.PsiElement;
2524
import consulo.language.psi.search.DefinitionsScopedSearch;
2625
import consulo.language.psi.search.DefinitionsScopedSearchExecutor;
27-
2826
import jakarta.annotation.Nonnull;
2927

28+
import java.util.function.Predicate;
29+
3030
/**
3131
* @author VISTALL
3232
* @since 17-May-16
3333
*/
3434
@ExtensionImpl
35-
public class CSharpTypeImplementationSearcher implements DefinitionsScopedSearchExecutor
36-
{
37-
@Override
38-
public boolean execute(@Nonnull DefinitionsScopedSearch.SearchParameters queryParameters, @Nonnull final Processor<? super PsiElement> consumer)
39-
{
40-
final PsiElement element = queryParameters.getElement();
41-
if(element instanceof DotNetTypeDeclaration)
42-
{
43-
return TypeInheritorsSearch.search((DotNetTypeDeclaration) element, queryParameters.getScope(), queryParameters.isCheckDeep(), true,
44-
CSharpTransform.INSTANCE).forEach(new Processor<DotNetTypeDeclaration>()
45-
46-
{
47-
@Override
48-
public boolean process(DotNetTypeDeclaration typeDeclaration)
49-
{
50-
return consumer.process(typeDeclaration);
51-
}
52-
});
53-
}
54-
return true;
55-
}
35+
public class CSharpTypeImplementationSearcher implements DefinitionsScopedSearchExecutor {
36+
@Override
37+
public boolean execute(@Nonnull DefinitionsScopedSearch.SearchParameters queryParameters, @Nonnull final Predicate<? super PsiElement> consumer) {
38+
final PsiElement element = queryParameters.getElement();
39+
if (element instanceof DotNetTypeDeclaration) {
40+
return TypeInheritorsSearch.search((DotNetTypeDeclaration) element, queryParameters.getScope(), queryParameters.isCheckDeep(), true, CSharpTransform.INSTANCE).forEach(consumer);
41+
}
42+
return true;
43+
}
5644
}

0 commit comments

Comments
 (0)