Skip to content

Commit e261fd3

Browse files
VISTALLVISTALL
committed
fixed migration to localize value
1 parent 602bfbd commit e261fd3

43 files changed

Lines changed: 1493 additions & 1408 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/PostHighlightingVisitor.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -311,15 +311,15 @@ private HighlightInfo processLocalVariable(
311311
? QuickFixFactory.getInstance().createRenameToIgnoredFix(variable)
312312
: QuickFixFactory.getInstance().createRemoveUnusedVariableFix(variable);
313313
return UnusedSymbolUtil.createUnusedSymbolInfo(identifier, message, myDeadCodeInfoType)
314-
.registerFix(fix, null, null, null, myDeadCodeKey)
314+
.registerFix(fix, null, LocalizeValue.of(), null, myDeadCodeKey)
315315
.create();
316316
}
317317

318318
boolean referenced = myRefCountHolder.isReferencedForRead(variable);
319319
if (!referenced && !UnusedSymbolUtil.isImplicitRead(myProject, variable, progress)) {
320320
LocalizeValue message = JavaErrorLocalize.localVariableIsNotUsedForReading(identifier.getText());
321321
return UnusedSymbolUtil.createUnusedSymbolInfo(identifier, message, myDeadCodeInfoType)
322-
.registerFix(QuickFixFactory.getInstance().createRemoveUnusedVariableFix(variable), null, null, null, myDeadCodeKey)
322+
.registerFix(QuickFixFactory.getInstance().createRemoveUnusedVariableFix(variable), null, LocalizeValue.of(), null, myDeadCodeKey)
323323
.create();
324324
}
325325

@@ -328,7 +328,7 @@ private HighlightInfo processLocalVariable(
328328
if (!referenced && !UnusedSymbolUtil.isImplicitWrite(myProject, variable, progress)) {
329329
LocalizeValue message = JavaErrorLocalize.localVariableIsNotAssigned(identifier.getText());
330330
return UnusedSymbolUtil.createUnusedSymbolInfo(identifier, message, myDeadCodeInfoType)
331-
.registerFix(new EmptyIntentionAction(UnusedSymbolLocalInspectionBase.DISPLAY_NAME), null, null, null, myDeadCodeKey)
331+
.registerFix(new EmptyIntentionAction(UnusedSymbolLocalInspectionBase.DISPLAY_NAME), null, LocalizeValue.of(), null, myDeadCodeKey)
332332
.create();
333333
}
334334
}
@@ -377,7 +377,7 @@ private HighlightInfo processField(
377377
LocalizeValue message = JavaErrorLocalize.privateFieldIsNotAssigned(identifier.getText());
378378
HighlightInfo.Builder hlBuilder = UnusedSymbolUtil.createUnusedSymbolInfo(identifier, message, myDeadCodeInfoType);
379379

380-
hlBuilder.registerFix(quickFixFactory.createCreateGetterOrSetterFix(false, true, field), null, null, null, myDeadCodeKey);
380+
hlBuilder.registerFix(quickFixFactory.createCreateGetterOrSetterFix(false, true, field), null, LocalizeValue.of(), null, myDeadCodeKey);
381381
if (!field.isFinal()) {
382382
hlBuilder.registerFix(
383383
quickFixFactory.createCreateConstructorParameterFromFieldFix(field),
@@ -402,7 +402,7 @@ else if (UnusedSymbolUtil.isFieldUnused(myProject, myFile, field, progress, help
402402
if (UnusedSymbolUtil.isImplicitWrite(myProject, field, progress)) {
403403
LocalizeValue message = JavaErrorLocalize.privateFieldIsNotUsedForReading(identifier.getText());
404404
return UnusedSymbolUtil.createUnusedSymbolInfo(identifier, message, myDeadCodeInfoType)
405-
.registerFix(QuickFixFactory.getInstance().createSafeDeleteFix(field), null, null, null, myDeadCodeKey)
405+
.registerFix(QuickFixFactory.getInstance().createSafeDeleteFix(field), null, LocalizeValue.of(), null, myDeadCodeKey)
406406
.create();
407407
}
408408
return formatUnusedSymbolHighlightInfo(
@@ -427,10 +427,10 @@ private HighlightInfo.Builder suggestionsToMakeFieldUsed(
427427
) {
428428
QuickFixFactory fixFactory = QuickFixFactory.getInstance();
429429
return UnusedSymbolUtil.createUnusedSymbolInfo(identifier, message, myDeadCodeInfoType)
430-
.registerFix(fixFactory.createRemoveUnusedVariableFix(field), null, null, null, myDeadCodeKey)
431-
.registerFix(fixFactory.createCreateGetterOrSetterFix(true, false, field), null, null, null, myDeadCodeKey)
432-
.registerFix(fixFactory.createCreateGetterOrSetterFix(false, true, field), null, null, null, myDeadCodeKey)
433-
.registerFix(fixFactory.createCreateGetterOrSetterFix(true, true, field), null, null, null, myDeadCodeKey);
430+
.registerFix(fixFactory.createRemoveUnusedVariableFix(field), null, LocalizeValue.of(), null, myDeadCodeKey)
431+
.registerFix(fixFactory.createCreateGetterOrSetterFix(true, false, field), null, LocalizeValue.of(), null, myDeadCodeKey)
432+
.registerFix(fixFactory.createCreateGetterOrSetterFix(false, true, field), null, LocalizeValue.of(), null, myDeadCodeKey)
433+
.registerFix(fixFactory.createCreateGetterOrSetterFix(true, true, field), null, LocalizeValue.of(), null, myDeadCodeKey);
434434
}
435435

436436
private final Map<PsiMethod, Boolean> isOverriddenOrOverrides = ConcurrentFactoryMap.createMap(method -> {
@@ -477,7 +477,7 @@ else if (declarationScope instanceof PsiForeachStatement && !PsiUtil.isIgnoredNa
477477
HighlightInfo.Builder hlBuilder = checkUnusedParameter(parameter, identifier, progress);
478478
if (hlBuilder != null) {
479479
return hlBuilder
480-
.registerFix(QuickFixFactory.getInstance().createRenameToIgnoredFix(parameter), null, null, null, myDeadCodeKey)
480+
.registerFix(QuickFixFactory.getInstance().createRenameToIgnoredFix(parameter), null, LocalizeValue.of(), null, myDeadCodeKey)
481481
.create();
482482
}
483483
}
@@ -521,7 +521,7 @@ private HighlightInfo processMethod(
521521
LocalizeValue symbolName = HighlightMessageUtil.getSymbolName(method, PsiSubstitutor.EMPTY);
522522
LocalizeValue message = key.apply(symbolName);
523523
HighlightInfo.Builder hlBuilder = UnusedSymbolUtil.createUnusedSymbolInfo(identifier, message, myDeadCodeInfoType);
524-
hlBuilder.registerFix(QuickFixFactory.getInstance().createSafeDeleteFix(method), null, null, null, myDeadCodeKey);
524+
hlBuilder.registerFix(QuickFixFactory.getInstance().createSafeDeleteFix(method), null, LocalizeValue.of(), null, myDeadCodeKey);
525525
SpecialAnnotationsUtilBase.createAddToSpecialAnnotationFixes(
526526
method,
527527
annoName -> {
@@ -578,7 +578,7 @@ private static HighlightInfo.Builder formatUnusedSymbolHighlightInfo(
578578
LocalizeValue message = pattern.apply(symbolName);
579579
HighlightInfo.Builder hlBuilder = UnusedSymbolUtil.createUnusedSymbolInfo(identifier, message, highlightInfoType);
580580
QuickFixFactory fixFactory = QuickFixFactory.getInstance();
581-
hlBuilder.registerFix(fixFactory.createSafeDeleteFix(aClass), null, null, null, highlightDisplayKey);
581+
hlBuilder.registerFix(fixFactory.createSafeDeleteFix(aClass), null, LocalizeValue.of(), null, highlightDisplayKey);
582582
SpecialAnnotationsUtilBase.createAddToSpecialAnnotationFixes(
583583
(PsiModifierListOwner)aClass,
584584
annoName -> {
@@ -640,8 +640,8 @@ private HighlightInfo registerRedundantImport(
640640
HighlightInfo info = HighlightInfo.newHighlightInfo(JavaHighlightInfoTypes.UNUSED_IMPORT)
641641
.range(importStatement)
642642
.descriptionAndTooltip(InspectionLocalize.unusedImportStatement())
643-
.registerFix(QuickFixFactory.getInstance().createOptimizeImportsFix(false), null, null, null, unusedImportKey)
644-
.registerFix(QuickFixFactory.getInstance().createEnableOptimizeImportsOnTheFlyFix(), null, null, null, unusedImportKey)
643+
.registerFix(QuickFixFactory.getInstance().createOptimizeImportsFix(false), null, LocalizeValue.of(), null, unusedImportKey)
644+
.registerFix(QuickFixFactory.getInstance().createEnableOptimizeImportsOnTheFlyFix(), null, LocalizeValue.of(), null, unusedImportKey)
645645
.create();
646646

647647
myHasRedundantImports = true;

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.intellij.java.language.impl.refactoring.util.RefactoringChangeUtil;
2020
import com.intellij.java.language.psi.*;
2121
import com.intellij.java.language.psi.util.PsiUtil;
22-
import consulo.java.analysis.impl.JavaQuickFixBundle;
2322
import consulo.java.analysis.impl.localize.JavaQuickFixLocalize;
2423
import consulo.language.psi.PsiElement;
2524
import consulo.language.util.IncorrectOperationException;

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/VariableArrayTypeFix.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager;
2020
import consulo.application.WriteAction;
2121
import consulo.application.presentation.TypePresentationService;
22-
import consulo.java.analysis.impl.JavaQuickFixBundle;
2322
import consulo.java.analysis.impl.localize.JavaQuickFixLocalize;
2423
import consulo.language.editor.FileModificationService;
2524
import consulo.language.editor.inspection.LocalQuickFixOnPsiElement;

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/WrapArrayToArraysAsListFix.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.intellij.java.language.psi.*;
1919
import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager;
2020
import com.intellij.java.language.psi.util.InheritanceUtil;
21-
import consulo.java.analysis.impl.JavaQuickFixBundle;
2221
import consulo.java.analysis.impl.localize.JavaQuickFixLocalize;
2322
import consulo.language.psi.PsiElement;
2423
import consulo.language.util.IncorrectOperationException;

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/WrapStringWithFileFix.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.intellij.java.language.psi.*;
1919
import com.intellij.java.language.psi.util.PsiUtil;
2020
import consulo.codeEditor.Editor;
21-
import consulo.java.analysis.impl.JavaQuickFixBundle;
2221
import consulo.java.analysis.impl.localize.JavaQuickFixLocalize;
2322
import consulo.language.editor.inspection.LocalQuickFixAndIntentionActionOnPsiElement;
2423
import consulo.language.editor.intention.HighPriorityAction;

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/RemoveAnnotationQuickFix.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @author yole
3333
*/
3434
public class RemoveAnnotationQuickFix implements LocalQuickFix {
35-
private static final Logger LOG = Logger.getInstance("com.intellij.codeInsight.i18n.AnnotateNonNlsQuickfix");
35+
private static final Logger LOG = Logger.getInstance(RemoveAnnotationQuickFix.class);
3636
private final PsiAnnotation myAnnotation;
3737
private final PsiModifierListOwner myListOwner;
3838

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/ex/EntryPointsManagerBase.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import consulo.component.persist.PersistentStateComponent;
3030
import consulo.disposer.Disposer;
3131
import consulo.ide.ServiceManager;
32-
import consulo.java.analysis.impl.JavaQuickFixBundle;
3332
import consulo.java.analysis.impl.localize.JavaQuickFixLocalize;
3433
import consulo.language.editor.impl.inspection.reference.RefElementImpl;
3534
import consulo.language.editor.impl.inspection.reference.SmartRefElementPointerImpl;

0 commit comments

Comments
 (0)