Skip to content

Localizing CSharpChangeSignatureUsageProcessor #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 1 commit into from
Dec 10, 2025
Merged

Localizing CSharpChangeSignatureUsageProcessor #601

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 25 additions & 28 deletions ...sulo/csharp/impl/ide/refactoring/changeSignature/CSharpChangeSignatureUsageProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,12 @@
import consulo.language.psi.PsiReference;
import consulo.language.psi.search.ReferencesSearch;
import consulo.language.psi.util.PsiTreeUtil;
import consulo.localize.LocalizeValue;
import consulo.usage.UsageInfo;
import consulo.util.collection.MultiMap;
import consulo.util.lang.StringUtil;
import consulo.util.lang.function.PairFunction;
import consulo.util.lang.ref.SimpleReference;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -58,11 +57,11 @@ public UsageInfo[] findUsages(@Nonnull final ChangeInfo info) {
}
final List<UsageInfo> list = new ArrayList<>();

final ReadActionProcessor<PsiReference> refProcessor = new ReadActionProcessor<>() {
@RequiredReadAction
ReadActionProcessor<PsiReference> refProcessor = new ReadActionProcessor<>() {
@Override
public boolean processInReadAction(final PsiReference ref) {
final PsiElement resolve = ref.resolve();
@RequiredReadAction
public boolean processInReadAction(PsiReference ref) {
PsiElement resolve = ref.resolve();
if (resolve != info.getMethod()) {
return true;
}
Expand All @@ -79,7 +78,7 @@ public boolean processInReadAction(final PsiReference ref) {

@Nonnull
@Override
public MultiMap<PsiElement, String> findConflicts(@Nonnull ChangeInfo info, SimpleReference<UsageInfo[]> refUsages) {
public MultiMap<PsiElement, LocalizeValue> findConflicts(@Nonnull ChangeInfo info, SimpleReference<UsageInfo[]> refUsages) {
return MultiMap.empty();
}

Expand All @@ -91,31 +90,29 @@ public boolean processUsage(
boolean beforeMethodChange,
@Nonnull UsageInfo[] usages
) {
if (!(changeInfo instanceof CSharpChangeInfo)) {
if (!(changeInfo instanceof CSharpChangeInfo sharpChangeInfo)) {
return false;
}
PsiElement element = usageInfo.getElement();
if (!(element instanceof DotNetReferenceExpression)) {
if (!(usageInfo.getElement() instanceof DotNetReferenceExpression refExpr)) {
return false;
}

if (!beforeMethodChange) {
return true;
}

if (changeInfo.isNameChanged()) {
((DotNetReferenceExpression)element).handleElementRename(changeInfo.getNewName());
if (sharpChangeInfo.isNameChanged()) {
refExpr.handleElementRename(sharpChangeInfo.getNewName());
}

if (((CSharpChangeInfo)changeInfo).isParametersChanged()) {
PsiElement parent = element.getParent();
if (parent instanceof CSharpCallArgumentListOwner) {
CSharpCallArgumentList parameterList = ((CSharpCallArgumentListOwner)parent).getParameterList();
if (sharpChangeInfo.isParametersChanged()) {
if (refExpr.getParent() instanceof CSharpCallArgumentListOwner argListOwner) {
CSharpCallArgumentList parameterList = argListOwner.getParameterList();
if (parameterList == null) {
return true;
}

CSharpParameterInfo[] newParameters = ((CSharpChangeInfo)changeInfo).getNewParameters();
CSharpParameterInfo[] newParameters = sharpChangeInfo.getNewParameters();

DotNetExpression[] expressions = parameterList.getExpressions();
String[] newArguments = new String[newParameters.length];
Expand Down Expand Up @@ -145,10 +142,9 @@ public boolean processUsage(
@Override
@RequiredWriteAction
public boolean processPrimaryMethod(@Nonnull ChangeInfo changeInfo) {
if (!(changeInfo instanceof CSharpChangeInfo)) {
if (!(changeInfo instanceof CSharpChangeInfo sharpChangeInfo)) {
return false;
}
CSharpChangeInfo sharpChangeInfo = (CSharpChangeInfo)changeInfo;

DotNetLikeMethodDeclaration method = sharpChangeInfo.getMethod();

Expand All @@ -164,8 +160,8 @@ public boolean processPrimaryMethod(@Nonnull ChangeInfo changeInfo) {
builder.append(newVisibility.getPresentableText()).append(" ");
}
if (method instanceof CSharpMethodDeclaration) {
if (changeInfo.isReturnTypeChanged()) {
builder.append(((CSharpChangeInfo)changeInfo).getNewReturnType()).append(" ");
if (sharpChangeInfo.isReturnTypeChanged()) {
builder.append(sharpChangeInfo.getNewReturnType()).append(" ");
}
else {
builder.append(CSharpTypeRefPresentationUtil.buildShortText(method.getReturnTypeRef())).append(" ");
Expand All @@ -174,10 +170,10 @@ public boolean processPrimaryMethod(@Nonnull ChangeInfo changeInfo) {
builder.append(method.getName());
builder.append("(");

StubBlockUtil.join(builder, sharpChangeInfo.getNewParameters(), new PairFunction<>() {
@Nullable
@Override
public Void fun(StringBuilder stringBuilder, CSharpParameterInfo parameterInfo) {
StubBlockUtil.join(
builder,
sharpChangeInfo.getNewParameters(),
(stringBuilder, parameterInfo) -> {
CSharpModifier modifier = parameterInfo.getModifier();
if (modifier != null) {
stringBuilder.append(modifier.getPresentableText()).append(" ");
Expand All @@ -186,8 +182,9 @@ public Void fun(StringBuilder stringBuilder, CSharpParameterInfo parameterInfo)
stringBuilder.append(" ");
stringBuilder.append(parameterInfo.getName());
return null;
}
}, ", ");
},
", "
);

builder.append(");");

Expand Down Expand Up @@ -215,7 +212,7 @@ public Void fun(StringBuilder stringBuilder, CSharpParameterInfo parameterInfo)
if (sharpChangeInfo.isParametersChanged()) {
CSharpParameterInfo[] newParameters = sharpChangeInfo.getNewParameters();

for (final CSharpParameterInfo newParameter : newParameters) {
for (CSharpParameterInfo newParameter : newParameters) {
DotNetParameter originalParameter = newParameter.getParameter();
if (originalParameter != null) {
ReferencesSearch.SearchParameters searchParameters =
Expand Down
Loading