From 97435a4266e41e4a7de92fa027083e579f0cb221 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 20 Sep 2013 18:14:32 +0400 Subject: [PATCH] Rename class: AbstractDiagnosticFactory -> DiagnosticFactory --- .../jet/checkers/CheckerTestUtil.java | 12 +++++----- .../jetbrains/jet/checkers/DebugInfoUtil.java | 8 +++---- .../lang/cfg/JetFlowInformationProvider.java | 23 +++++++++---------- .../jet/lang/diagnostics/Diagnostic.java | 2 +- ...ticFactory.java => DiagnosticFactory.java} | 2 +- .../DiagnosticFactoryWithPsiElement.java | 2 +- .../jet/lang/diagnostics/Errors.java | 12 +++++----- .../rendering/DefaultErrorMessages.java | 8 +++---- .../DiagnosticFactoryToRendererMap.java | 6 ++--- .../CompileTimeConstantResolver.java | 6 ++--- .../expressions/ExpressionTypingUtils.java | 4 ++-- .../checkers/AbstractJetDiagnosticsTest.java | 2 +- .../jet/plugin/quickfix/QuickFixes.java | 10 ++++---- .../inline/KotlinInlineValHandler.java | 4 ++-- .../highlighter/DiagnosticMessageTest.java | 6 ++--- 15 files changed, 53 insertions(+), 54 deletions(-) rename compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/{AbstractDiagnosticFactory.java => DiagnosticFactory.java} (95%) diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java index aca6b961cc9..2c2fe61cb1a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java @@ -28,7 +28,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.containers.Stack; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.AbstractDiagnosticFactory; +import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Severity; import org.jetbrains.jet.lang.psi.JetReferenceExpression; @@ -329,16 +329,16 @@ public class CheckerTestUtil { public static class AbstractDiagnosticForTests implements Diagnostic { private final PsiElement element; - private final AbstractDiagnosticFactory factory; + private final DiagnosticFactory factory; - public AbstractDiagnosticForTests(@NotNull PsiElement element, @NotNull AbstractDiagnosticFactory factory) { + public AbstractDiagnosticForTests(@NotNull PsiElement element, @NotNull DiagnosticFactory factory) { this.element = element; this.factory = factory; } @NotNull @Override - public AbstractDiagnosticFactory getFactory() { + public DiagnosticFactory getFactory() { return factory; } @@ -372,7 +372,7 @@ public class CheckerTestUtil { } } - public static class SyntaxErrorDiagnosticFactory extends AbstractDiagnosticFactory { + public static class SyntaxErrorDiagnosticFactory extends DiagnosticFactory { public static final SyntaxErrorDiagnosticFactory INSTANCE = new SyntaxErrorDiagnosticFactory(); private SyntaxErrorDiagnosticFactory() {} @@ -390,7 +390,7 @@ public class CheckerTestUtil { } } - public static class DebugInfoDiagnosticFactory extends AbstractDiagnosticFactory { + public static class DebugInfoDiagnosticFactory extends DiagnosticFactory { public static final DebugInfoDiagnosticFactory ELEMENT_WITH_ERROR_TYPE = new DebugInfoDiagnosticFactory("ELEMENT_WITH_ERROR_TYPE"); public static final DebugInfoDiagnosticFactory UNRESOLVED_WITH_TARGET = new DebugInfoDiagnosticFactory("UNRESOLVED_WITH_TARGET"); public static final DebugInfoDiagnosticFactory MISSING_UNRESOLVED = new DebugInfoDiagnosticFactory("MISSING_UNRESOLVED"); diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java index ef3a9488617..d076310cc14 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java @@ -24,7 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.diagnostics.AbstractDiagnosticFactory; +import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.psi.*; @@ -58,9 +58,9 @@ public class DebugInfoUtil { @NotNull final BindingContext bindingContext, @NotNull final DebugInfoReporter debugInfoReporter ) { - final Map markedWithErrorElements = Maps.newHashMap(); + final Map markedWithErrorElements = Maps.newHashMap(); for (Diagnostic diagnostic : bindingContext.getDiagnostics()) { - AbstractDiagnosticFactory factory = diagnostic.getFactory(); + DiagnosticFactory factory = diagnostic.getFactory(); if (Errors.UNRESOLVED_REFERENCE_DIAGNOSTICS.contains(diagnostic.getFactory())) { markedWithErrorElements.put((JetReferenceExpression) diagnostic.getPsiElement(), factory); } @@ -131,7 +131,7 @@ public class DebugInfoUtil { boolean resolved = target != null; boolean markedWithError = markedWithErrorElements.containsKey(expression); JetType expressionType = bindingContext.get(EXPRESSION_TYPE, expression); - AbstractDiagnosticFactory factory = markedWithErrorElements.get(expression); + DiagnosticFactory factory = markedWithErrorElements.get(expression); if (declarationDescriptor != null && (ErrorUtils.isError(declarationDescriptor) || ErrorUtils.containsErrorType(expressionType))) { if (factory != Errors.EXPRESSION_EXPECTED_NAMESPACE_FOUND) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java index 8531dfc3f1a..96a26fd797e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.cfg.PseudocodeTraverser.*; import org.jetbrains.jet.lang.cfg.PseudocodeVariablesData.VariableInitState; import org.jetbrains.jet.lang.cfg.PseudocodeVariablesData.VariableUseState; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.AbstractDiagnosticFactory; +import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.psi.*; @@ -49,7 +49,6 @@ import static org.jetbrains.jet.lang.cfg.PseudocodeTraverser.TraversalOrder.FORW import static org.jetbrains.jet.lang.cfg.PseudocodeVariablesData.VariableUseState.*; import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.CAPTURED_IN_CLOSURE; -import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; import static org.jetbrains.jet.lang.types.TypeUtils.noExpectedType; public class JetFlowInformationProvider { @@ -187,7 +186,7 @@ public class JetFlowInformationProvider { Map>> initializers = pseudocodeVariablesData.getVariableInitializers(); final Set declaredVariables = pseudocodeVariablesData.getDeclaredVariables(pseudocode, true); - final Map reportedDiagnosticMap = Maps.newHashMap(); + final Map reportedDiagnosticMap = Maps.newHashMap(); PseudocodeTraverser.traverse(pseudocode, FORWARD, initializers, new InstructionDataAnalyzeStrategy>() { @Override @@ -436,7 +435,7 @@ public class JetFlowInformationProvider { public void markUnusedVariables() { Map>> variableStatusData = pseudocodeVariablesData.getVariableUseStatusData(); - final Map reportedDiagnosticMap = Maps.newHashMap(); + final Map reportedDiagnosticMap = Maps.newHashMap(); InstructionDataAnalyzeStrategy> variableStatusAnalyzeStrategy = new InstructionDataAnalyzeStrategy>() { @Override @@ -519,7 +518,7 @@ public class JetFlowInformationProvider { public void markUnusedLiteralsInBlock() { assert pseudocode != null; - final Map reportedDiagnosticMap = Maps.newHashMap(); + final Map reportedDiagnosticMap = Maps.newHashMap(); PseudocodeTraverser.traverse( pseudocode, FORWARD, new InstructionAnalyzeStrategy() { @Override @@ -565,13 +564,13 @@ public class JetFlowInformationProvider { trace.report(diagnostic); return; } - Map previouslyReported = ctxt.reportedDiagnosticMap; + Map previouslyReported = ctxt.reportedDiagnosticMap; previouslyReported.put(instruction, diagnostic.getFactory()); boolean alreadyReported = false; boolean sameErrorForAllCopies = true; for (Instruction copy : instruction.getCopies()) { - AbstractDiagnosticFactory previouslyReportedErrorFactory = previouslyReported.get(copy); + DiagnosticFactory previouslyReportedErrorFactory = previouslyReported.get(copy); if (previouslyReportedErrorFactory != null) { alreadyReported = true; } @@ -594,7 +593,7 @@ public class JetFlowInformationProvider { } } - private static boolean mustBeReportedOnAllCopies(@NotNull AbstractDiagnosticFactory diagnosticFactory) { + private static boolean mustBeReportedOnAllCopies(@NotNull DiagnosticFactory diagnosticFactory) { return diagnosticFactory == UNUSED_VARIABLE || diagnosticFactory == UNUSED_PARAMETER || diagnosticFactory == UNUSED_CHANGED_VALUE; @@ -603,13 +602,13 @@ public class JetFlowInformationProvider { private class VariableContext { - final Map reportedDiagnosticMap; + final Map reportedDiagnosticMap; final Instruction instruction; final VariableDescriptor variableDescriptor; private VariableContext( @NotNull Instruction instruction, - @NotNull Map map + @NotNull Map map ) { this.instruction = instruction; reportedDiagnosticMap = map; @@ -623,7 +622,7 @@ public class JetFlowInformationProvider { private VariableInitContext( @NotNull Instruction instruction, - @NotNull Map map, + @NotNull Map map, @NotNull Map in, @NotNull Map out ) { @@ -640,7 +639,7 @@ public class JetFlowInformationProvider { private VariableUseContext( @NotNull Instruction instruction, - @NotNull Map map, + @NotNull Map map, @NotNull Map in, @NotNull Map out ) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Diagnostic.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Diagnostic.java index 425f3a8f109..289ab29be31 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Diagnostic.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Diagnostic.java @@ -26,7 +26,7 @@ import java.util.List; public interface Diagnostic { @NotNull - AbstractDiagnosticFactory getFactory(); + DiagnosticFactory getFactory(); @NotNull Severity getSeverity(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnosticFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnosticFactory.java rename to compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory.java index 023b2fbe7d0..3367d4f4ff0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnosticFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactory.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.diagnostics; import org.jetbrains.annotations.NotNull; -public abstract class AbstractDiagnosticFactory { +public abstract class DiagnosticFactory { private String name = null; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactoryWithPsiElement.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactoryWithPsiElement.java index afa67d7d2ba..5ecd61ed04b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactoryWithPsiElement.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticFactoryWithPsiElement.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import java.util.List; -public abstract class DiagnosticFactoryWithPsiElement extends AbstractDiagnosticFactory { +public abstract class DiagnosticFactoryWithPsiElement extends DiagnosticFactory { protected final Severity severity; protected final PositioningStrategy positioningStrategy; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java index 81b6ef06602..a9b3bd9e629 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java @@ -560,13 +560,13 @@ public interface Errors { // Error sets - ImmutableSet UNRESOLVED_REFERENCE_DIAGNOSTICS = ImmutableSet.of( + ImmutableSet UNRESOLVED_REFERENCE_DIAGNOSTICS = ImmutableSet.of( UNRESOLVED_REFERENCE, NAMED_PARAMETER_NOT_FOUND, UNRESOLVED_REFERENCE_WRONG_RECEIVER); - ImmutableSet UNUSED_ELEMENT_DIAGNOSTICS = ImmutableSet.of( + ImmutableSet UNUSED_ELEMENT_DIAGNOSTICS = ImmutableSet.of( UNUSED_VARIABLE, UNUSED_PARAMETER, ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE); - ImmutableSet REDECLARATION_DIAGNOSTICS = ImmutableSet.of( + ImmutableSet REDECLARATION_DIAGNOSTICS = ImmutableSet.of( REDECLARATION, NAME_SHADOWING); - ImmutableSet TYPE_INFERENCE_ERRORS = ImmutableSet.of( + ImmutableSet TYPE_INFERENCE_ERRORS = ImmutableSet.of( TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER, TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS, TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH, TYPE_INFERENCE_UPPER_BOUND_VIOLATED, TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH); @@ -584,8 +584,8 @@ public interface Errors { if (Modifier.isStatic(field.getModifiers())) { try { Object value = field.get(null); - if (value instanceof AbstractDiagnosticFactory) { - AbstractDiagnosticFactory factory = (AbstractDiagnosticFactory)value; + if (value instanceof DiagnosticFactory) { + DiagnosticFactory factory = (DiagnosticFactory)value; factory.setName(field.getName()); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java index d3e6f09462d..d24359c5ad5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.diagnostics.rendering; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.diagnostics.AbstractDiagnosticFactory; +import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.psi.JetExpression; @@ -474,9 +474,9 @@ public class DefaultErrorMessages { if (Modifier.isStatic(field.getModifiers())) { try { Object fieldValue = field.get(null); - if (fieldValue instanceof AbstractDiagnosticFactory) { - if (MAP.get((AbstractDiagnosticFactory) fieldValue) == null) { - throw new IllegalStateException("No default diagnostic renderer is provided for " + ((AbstractDiagnosticFactory)fieldValue).getName()); + if (fieldValue instanceof DiagnosticFactory) { + if (MAP.get((DiagnosticFactory) fieldValue) == null) { + throw new IllegalStateException("No default diagnostic renderer is provided for " + ((DiagnosticFactory)fieldValue).getName()); } } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java index 7509cd0dc51..35bb44dcd3f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticFactoryToRendererMap.java @@ -26,8 +26,8 @@ import java.util.HashMap; import java.util.Map; public final class DiagnosticFactoryToRendererMap { - private final Map> map = - new HashMap>(); + private final Map> map = + new HashMap>(); private boolean immutable = false; private void checkMutability() { @@ -64,7 +64,7 @@ public final class DiagnosticFactoryToRendererMap { } @Nullable - public DiagnosticRenderer get(@NotNull AbstractDiagnosticFactory factory) { + public DiagnosticRenderer get(@NotNull DiagnosticFactory factory) { return map.get(factory); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java index d414b379599..2e63f34d085 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java @@ -22,7 +22,7 @@ import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.diagnostics.AbstractDiagnosticFactory; +import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.jet.lang.psi.JetConstantExpression; @@ -50,8 +50,8 @@ public class CompileTimeConstantResolver { @NotNull JetType expectedType ) { CompileTimeConstant compileTimeConstant = getCompileTimeConstant(expression, expectedType); - Set errorsThatDependOnExpectedType = - Sets.newHashSet(CONSTANT_EXPECTED_TYPE_MISMATCH, NULL_FOR_NONNULL_TYPE); + Set errorsThatDependOnExpectedType = + Sets.newHashSet(CONSTANT_EXPECTED_TYPE_MISMATCH, NULL_FOR_NONNULL_TYPE); if (compileTimeConstant instanceof ErrorValueWithDiagnostic) { Diagnostic diagnostic = ((ErrorValueWithDiagnostic) compileTimeConstant).getDiagnostic(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java index 4e3a7cd0ad3..72786fd03f7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.diagnostics.AbstractDiagnosticFactory; +import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.psi.*; @@ -459,7 +459,7 @@ public class ExpressionTypingUtils { @Override public void report(@NotNull Diagnostic diagnostic) { - AbstractDiagnosticFactory factory = diagnostic.getFactory(); + DiagnosticFactory factory = diagnostic.getFactory(); if ((factory == TYPE_MISMATCH || factory == CONSTANT_EXPECTED_TYPE_MISMATCH || factory == NULL_FOR_NONNULL_TYPE) && diagnostic.getPsiElement() == expressionToWatch) { mismatchFound[0] = true; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index cfe715843ef..f447a2d6bb6 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -52,7 +52,7 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture { public static final String DIAGNOSTICS_DIRECTIVE = "DIAGNOSTICS"; public static final Pattern DIAGNOSTICS_PATTERN = Pattern.compile("([\\+\\-!])(\\w+)\\s*"); - public static final ImmutableSet DIAGNOSTICS_TO_INCLUDE_ANYWAY = + public static final ImmutableSet DIAGNOSTICS_TO_INCLUDE_ANYWAY = ImmutableSet.of( Errors.UNRESOLVED_REFERENCE, Errors.UNRESOLVED_REFERENCE_WRONG_RECEIVER, diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java index 21b034f15a4..2c7dc69ac0a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.quickfix; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.intellij.codeInsight.intention.IntentionAction; -import org.jetbrains.jet.lang.diagnostics.AbstractDiagnosticFactory; +import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.psi.JetClass; import org.jetbrains.jet.plugin.codeInsight.ImplementMethodsHandler; @@ -30,14 +30,14 @@ import static org.jetbrains.jet.lexer.JetTokens.*; public class QuickFixes { - private static final Multimap factories = HashMultimap.create(); - private static final Multimap actions = HashMultimap.create(); + private static final Multimap factories = HashMultimap.create(); + private static final Multimap actions = HashMultimap.create(); - public static Collection getActionsFactories(AbstractDiagnosticFactory diagnosticFactory) { + public static Collection getActionsFactories(DiagnosticFactory diagnosticFactory) { return factories.get(diagnosticFactory); } - public static Collection getActions(AbstractDiagnosticFactory diagnosticFactory) { + public static Collection getActions(DiagnosticFactory diagnosticFactory) { return actions.get(diagnosticFactory); } diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java index e6fcb661305..dd43888f40a 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java @@ -49,7 +49,7 @@ import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.diagnostics.AbstractDiagnosticFactory; +import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.psi.*; @@ -303,7 +303,7 @@ public class KotlinInlineValHandler extends InlineActionHandler { JetFunctionLiteral functionLiteral = functionLiteralExpression.getFunctionLiteral(); BindingContext context = cancelableResolveSession.resolveToElement(functionLiteralExpression); for (Diagnostic diagnostic : context.getDiagnostics()) { - AbstractDiagnosticFactory factory = diagnostic.getFactory(); + DiagnosticFactory factory = diagnostic.getFactory(); PsiElement element = diagnostic.getPsiElement(); boolean hasCantInferParameter = factory == Errors.CANNOT_INFER_PARAMETER_TYPE && element.getParent().getParent() == functionLiteral; boolean hasUnresolvedItOrThis = factory == Errors.UNRESOLVED_REFERENCE && element.getText().equals("it") && diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTest.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTest.java index 640bc054dd6..3a330edeb1b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTest.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.lang.diagnostics.AbstractDiagnosticFactory; +import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; @@ -48,14 +48,14 @@ public class DiagnosticMessageTest extends JetLiteFixture { return PluginTestCaseBase.getTestDataPathBase() + "/diagnosticMessage/"; } - public void doTest(String name, int diagnosticNumber, AbstractDiagnosticFactory... diagnosticFactories) throws Exception { + public void doTest(String name, int diagnosticNumber, DiagnosticFactory... diagnosticFactories) throws Exception { String fileName = name + ".kt"; JetFile psiFile = createPsiFile(null, fileName, loadFile(fileName)); AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(psiFile, Collections.emptyList()); BindingContext bindingContext = analyzeExhaust.getBindingContext(); - final Set factoriesSet = Sets.newHashSet(diagnosticFactories); + final Set factoriesSet = Sets.newHashSet(diagnosticFactories); List diagnostics = ContainerUtil.filter(bindingContext.getDiagnostics().all(), new Condition() { @Override public boolean value(Diagnostic diagnostic) {