Skip to content

Commit 4d36195

Browse files
authored
Merge pull request #602 from unv-unv/compilation-fix
Localizing refactoring handlers after platform update
2 parents a250ce8 + 5456fc5 commit 4d36195

File tree

2 files changed

+389
-448
lines changed

2 files changed

+389
-448
lines changed

csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInspection/matchNamespace/ChangeNamespaceProcessor.java

Lines changed: 78 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import consulo.language.psi.PsiElement;
2727
import consulo.language.psi.PsiReference;
2828
import consulo.language.psi.search.ReferencesSearch;
29+
import consulo.localize.LocalizeValue;
2930
import consulo.project.Project;
3031
import consulo.usage.UsageInfo;
3132
import consulo.usage.UsageViewDescriptor;
@@ -42,90 +43,81 @@
4243
* @author VISTALL
4344
* @since 2019-07-24
4445
*/
45-
public class ChangeNamespaceProcessor extends BaseRefactoringProcessor
46-
{
47-
class UsageViewDescriptorImpl implements UsageViewDescriptor
48-
{
49-
@Nonnull
50-
@Override
51-
public PsiElement[] getElements()
52-
{
53-
return new PsiElement[] {myNamespaceProvider};
54-
}
55-
56-
@Override
57-
public String getProcessedElementsHeader()
58-
{
59-
return getCommandName();
60-
}
61-
62-
@Override
63-
public String getCodeReferencesText(int usagesCount, int filesCount)
64-
{
65-
return null;
66-
}
67-
68-
@Nullable
69-
@Override
70-
public String getCommentReferencesText(int usagesCount, int filesCount)
71-
{
72-
return null;
73-
}
74-
}
75-
76-
@Nonnull
77-
private final CSharpNamespaceProvider myNamespaceProvider;
78-
@Nonnull
79-
private final String myExpectedNamespace;
80-
81-
protected ChangeNamespaceProcessor(@Nonnull Project project, @Nonnull CSharpNamespaceProvider namespaceProvider, @Nonnull String expectedNamespace)
82-
{
83-
super(project);
84-
myNamespaceProvider = namespaceProvider;
85-
myExpectedNamespace = expectedNamespace;
86-
}
87-
88-
@Nonnull
89-
@Override
90-
protected UsageViewDescriptor createUsageViewDescriptor(@Nonnull UsageInfo[] usages)
91-
{
92-
return new UsageViewDescriptorImpl();
93-
}
94-
95-
@Nonnull
96-
@Override
97-
@RequiredReadAction
98-
protected UsageInfo[] findUsages()
99-
{
100-
List<UsageInfo> result = new ArrayList<>();
101-
Set<Couple<DotNetNamedElement>> children = CSharpMoveClassesUtil.findTypesAndNamespaces(myNamespaceProvider);
102-
103-
for(Couple<DotNetNamedElement> couple : children)
104-
{
105-
DotNetNamedElement second = couple.getSecond();
106-
107-
for(PsiReference reference : ReferencesSearch.search(second, CSharpClassesMoveProcessor.mapScope(second)))
108-
{
109-
result.add(new CSharpClassesMoveProcessor.MyUsageInfo(reference.getElement(), couple, reference));
110-
}
111-
}
112-
113-
return result.toArray(new UsageInfo[result.size()]);
114-
}
115-
116-
@Override
117-
@RequiredWriteAction
118-
protected void performRefactoring(@Nonnull UsageInfo[] usages)
119-
{
120-
myNamespaceProvider.setNamespace(myExpectedNamespace);
121-
122-
CSharpClassesMoveProcessor.retargetUsages(usages);
123-
}
124-
125-
@Nonnull
126-
@Override
127-
protected String getCommandName()
128-
{
129-
return "Change namespace to '" + myExpectedNamespace + "'";
130-
}
46+
public class ChangeNamespaceProcessor extends BaseRefactoringProcessor {
47+
class UsageViewDescriptorImpl implements UsageViewDescriptor {
48+
@Nonnull
49+
@Override
50+
public PsiElement[] getElements() {
51+
return new PsiElement[]{myNamespaceProvider};
52+
}
53+
54+
@Override
55+
public String getProcessedElementsHeader() {
56+
return getCommandName().get();
57+
}
58+
59+
@Override
60+
public String getCodeReferencesText(int usagesCount, int filesCount) {
61+
return null;
62+
}
63+
64+
@Nullable
65+
@Override
66+
public String getCommentReferencesText(int usagesCount, int filesCount) {
67+
return null;
68+
}
69+
}
70+
71+
@Nonnull
72+
private final CSharpNamespaceProvider myNamespaceProvider;
73+
@Nonnull
74+
private final String myExpectedNamespace;
75+
76+
protected ChangeNamespaceProcessor(
77+
@Nonnull Project project,
78+
@Nonnull CSharpNamespaceProvider namespaceProvider,
79+
@Nonnull String expectedNamespace
80+
) {
81+
super(project);
82+
myNamespaceProvider = namespaceProvider;
83+
myExpectedNamespace = expectedNamespace;
84+
}
85+
86+
@Nonnull
87+
@Override
88+
protected UsageViewDescriptor createUsageViewDescriptor(@Nonnull UsageInfo[] usages) {
89+
return new UsageViewDescriptorImpl();
90+
}
91+
92+
@Nonnull
93+
@Override
94+
@RequiredReadAction
95+
protected UsageInfo[] findUsages() {
96+
List<UsageInfo> result = new ArrayList<>();
97+
Set<Couple<DotNetNamedElement>> children = CSharpMoveClassesUtil.findTypesAndNamespaces(myNamespaceProvider);
98+
99+
for (Couple<DotNetNamedElement> couple : children) {
100+
DotNetNamedElement second = couple.getSecond();
101+
102+
for (PsiReference reference : ReferencesSearch.search(second, CSharpClassesMoveProcessor.mapScope(second))) {
103+
result.add(new CSharpClassesMoveProcessor.MyUsageInfo(reference.getElement(), couple, reference));
104+
}
105+
}
106+
107+
return result.toArray(new UsageInfo[result.size()]);
108+
}
109+
110+
@Override
111+
@RequiredWriteAction
112+
protected void performRefactoring(@Nonnull UsageInfo[] usages) {
113+
myNamespaceProvider.setNamespace(myExpectedNamespace);
114+
115+
CSharpClassesMoveProcessor.retargetUsages(usages);
116+
}
117+
118+
@Nonnull
119+
@Override
120+
protected LocalizeValue getCommandName() {
121+
return LocalizeValue.localizeTODO("Change namespace to '" + myExpectedNamespace + "'");
122+
}
131123
}

0 commit comments

Comments
 (0)