From 64f60b3458500c3c97543d1e1b4d72b4dae043ae Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 23 Apr 2014 15:51:38 +0400 Subject: [PATCH] Minor. getAnalysisResults(x).getBindingContext() replaced by getBindingContext(x) --- .../jet/plugin/actions/CopyAsDiagnosticTestAction.java | 2 +- .../jet/plugin/actions/ShowExpressionTypeAction.java | 2 +- .../jet/plugin/codeInsight/JetTypeDeclarationProvider.java | 2 +- .../jet/plugin/highlighter/DebugInfoAnnotator.java | 2 +- .../jet/plugin/highlighter/DeclarationHintSupport.java | 2 +- .../jet/plugin/highlighter/JetLineMarkerProvider.java | 2 +- .../jet/plugin/intentions/SpecifyTypeExplicitlyAction.java | 4 ++-- .../plugin/internal/resolvewindow/ResolveToolWindow.java | 2 +- .../jet/plugin/quickfix/AddFunctionParametersFix.java | 2 +- .../jet/plugin/quickfix/AddNameToArgumentFix.java | 2 +- .../quickfix/AddOverrideToEqualsHashCodeToStringFix.java | 2 +- .../jetbrains/jet/plugin/quickfix/CastExpressionFix.java | 2 +- .../quickfix/ChangeFunctionLiteralReturnTypeFix.java | 2 +- .../plugin/quickfix/ChangeFunctionLiteralSignatureFix.java | 2 +- .../jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java | 7 +++---- .../jet/plugin/quickfix/ChangeFunctionSignatureFix.java | 6 +++--- .../jet/plugin/quickfix/ChangeVariableMutabilityFix.java | 2 +- .../jet/plugin/quickfix/ChangeVariableTypeFix.java | 4 ++-- .../jet/plugin/quickfix/ChangeVisibilityModifierFix.java | 2 +- .../quickfix/QuickFixFactoryForTypeMismatchError.java | 2 +- .../org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java | 4 ++-- .../jet/plugin/quickfix/RemoveFunctionParametersFix.java | 2 +- .../jet/plugin/structureView/JetStructureViewElement.java | 2 +- 23 files changed, 30 insertions(+), 31 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/actions/CopyAsDiagnosticTestAction.java b/idea/src/org/jetbrains/jet/plugin/actions/CopyAsDiagnosticTestAction.java index 9933509aac9..88d92c95f32 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/CopyAsDiagnosticTestAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/CopyAsDiagnosticTestAction.java @@ -43,7 +43,7 @@ public class CopyAsDiagnosticTestAction extends AnAction { PsiFile psiFile = e.getData(LangDataKeys.PSI_FILE); assert editor != null && psiFile != null; - BindingContext bindingContext = ResolvePackage.getAnalysisResults((JetFile) psiFile).getBindingContext(); + BindingContext bindingContext = ResolvePackage.getBindingContext((JetFile) psiFile); List diagnostics = CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(bindingContext, psiFile); String result = CheckerTestUtil.addDiagnosticMarkersToText(psiFile, diagnostics).toString(); diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java index a2570532c37..37c2ff5c18e 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java @@ -40,7 +40,7 @@ public class ShowExpressionTypeAction extends AnAction { PsiFile psiFile = e.getData(LangDataKeys.PSI_FILE); assert editor != null && psiFile != null; JetExpression expression; - BindingContext bindingContext = ResolvePackage.getAnalysisResults((JetFile) psiFile).getBindingContext(); + BindingContext bindingContext = ResolvePackage.getBindingContext((JetFile) psiFile); if (editor.getSelectionModel().hasSelection()) { int startOffset = editor.getSelectionModel().getSelectionStart(); int endOffset = editor.getSelectionModel().getSelectionEnd(); diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java index 2615721dbc6..fe41382bfa3 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java @@ -33,7 +33,7 @@ public class JetTypeDeclarationProvider implements TypeDeclarationProvider { public PsiElement[] getSymbolTypeDeclarations(PsiElement symbol) { if (symbol instanceof JetElement && symbol.getContainingFile() instanceof JetFile) { BindingContext bindingContext = - ResolvePackage.getAnalysisResults((JetFile) symbol.getContainingFile()).getBindingContext(); + ResolvePackage.getBindingContext((JetFile) symbol.getContainingFile()); DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, symbol); if (descriptor instanceof CallableDescriptor) { JetType type = ((CallableDescriptor) descriptor).getReturnType(); diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java index c2f6200af45..9a6cf2c7161 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java @@ -50,7 +50,7 @@ public class DebugInfoAnnotator implements Annotator { if (element instanceof JetFile && !(element instanceof JetCodeFragmentImpl)) { JetFile file = (JetFile) element; try { - BindingContext bindingContext = ResolvePackage.getAnalysisResults(file).getBindingContext(); + BindingContext bindingContext = ResolvePackage.getBindingContext(file); DebugInfoUtil.markDebugAnnotations(file, bindingContext, new DebugInfoUtil.DebugInfoReporter() { @Override public void reportElementWithErrorType(@NotNull JetReferenceExpression expression) { diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java index 3adc97da3de..86ffdf551b8 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java @@ -195,7 +195,7 @@ public class DeclarationHintSupport extends AbstractProjectComponent { DeclarationDescriptor descriptor = null; try { BindingContext bindingContext = - ResolvePackage.getAnalysisResults(jetFile).getBindingContext(); + ResolvePackage.getBindingContext(jetFile); descriptor = bindingContext.getDiagnostics().forElement(declaration).isEmpty() ? bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration) : null; diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java index 20e69ff8dc5..9589ff59444 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java @@ -328,7 +328,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider { JetFile file = (JetFile)element.getContainingFile(); if (file == null) return ""; - BindingContext bindingContext = ResolvePackage.getAnalysisResults(file).getBindingContext(); + BindingContext bindingContext = ResolvePackage.getBindingContext(file); DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element); if (!(descriptor instanceof CallableMemberDescriptor)) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java index b69b6cb6e90..88b20d96bba 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java @@ -140,7 +140,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction { private static boolean hasPublicMemberDiagnostic(@NotNull JetNamedDeclaration declaration) { - BindingContext bindingContext = ResolvePackage.getAnalysisResults(declaration.getContainingJetFile()).getBindingContext(); + BindingContext bindingContext = ResolvePackage.getBindingContext(declaration.getContainingJetFile()); for (Diagnostic diagnostic : bindingContext.getDiagnostics()) { //noinspection ConstantConditions if (Errors.PUBLIC_MEMBER_SHOULD_SPECIFY_TYPE == diagnostic.getFactory() && declaration == diagnostic.getPsiElement()) { @@ -152,7 +152,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction { @NotNull public static JetType getTypeForDeclaration(@NotNull JetNamedDeclaration declaration) { - BindingContext bindingContext = ResolvePackage.getAnalysisResults(declaration.getContainingJetFile()).getBindingContext(); + BindingContext bindingContext = ResolvePackage.getBindingContext(declaration.getContainingJetFile()); DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration); JetType type; diff --git a/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolWindow.java b/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolWindow.java index f8aafbd9fe3..75d490eb27d 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolWindow.java +++ b/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolWindow.java @@ -104,7 +104,7 @@ public class ResolveToolWindow extends JPanel implements Disposable { int startOffset = requestInfo.getStartOffset(); int endOffset = requestInfo.getEndOffset(); - BindingContext bindingContext = ResolvePackage.getAnalysisResults(jetFile).getBindingContext(); + BindingContext bindingContext = ResolvePackage.getBindingContext(jetFile); PsiElement elementAtOffset; if (startOffset == endOffset) { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java index 0898cc43441..dd64bfbeff5 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java @@ -106,7 +106,7 @@ public class AddFunctionParametersFix extends ChangeFunctionSignatureFix { @Override protected void invoke(@NotNull Project project, Editor editor, JetFile file) { - BindingContext bindingContext = ResolvePackage.getAnalysisResults((JetFile) callElement.getContainingFile()).getBindingContext(); + BindingContext bindingContext = ResolvePackage.getBindingContext((JetFile) callElement.getContainingFile()); runChangeSignature(project, functionDescriptor, addParameterConfiguration(), bindingContext, callElement, getText()); } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java index f273b19db46..4a60dc9aefb 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java @@ -65,7 +65,7 @@ public class AddNameToArgumentFix extends JetIntentionAction { JetExpression callee = callElement.getCalleeExpression(); if (!(callee instanceof JetReferenceExpression)) return Collections.emptyList(); - BindingContext context = ResolvePackage.getAnalysisResults(argument.getContainingJetFile()).getBindingContext(); + BindingContext context = ResolvePackage.getBindingContext(argument.getContainingJetFile()); ResolvedCall resolvedCall = context.get(BindingContext.RESOLVED_CALL, (JetReferenceExpression) callee); if (resolvedCall == null) return Collections.emptyList(); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java index 28452bda238..4cc30992aea 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java @@ -87,7 +87,7 @@ public class AddOverrideToEqualsHashCodeToStringFix extends JetIntentionAction

files = PluginJetFilesProvider.allFilesInProject(file); for (JetFile jetFile : files) { - for (Diagnostic diagnostic : ResolvePackage.getAnalysisResults(jetFile).getBindingContext().getDiagnostics()) { + for (Diagnostic diagnostic : ResolvePackage.getBindingContext(jetFile).getDiagnostics()) { if (diagnostic.getFactory() != Errors.VIRTUAL_MEMBER_HIDDEN) continue; PsiElement element = diagnostic.getPsiElement(); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java index 991bf0de415..ed76f015423 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java @@ -59,7 +59,7 @@ public class CastExpressionFix extends JetIntentionAction { @Override public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { if (!super.isAvailable(project, editor, file)) return false; - BindingContext context = ResolvePackage.getAnalysisResults((JetFile) file).getBindingContext(); + BindingContext context = ResolvePackage.getBindingContext((JetFile) file); JetType expressionType = context.get(BindingContext.EXPRESSION_TYPE, element); return expressionType != null && JetTypeChecker.INSTANCE.isSubtypeOf(type, expressionType); } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java index 49d51029f4c..d72d5ef61fa 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java @@ -50,7 +50,7 @@ public class ChangeFunctionLiteralReturnTypeFix extends JetIntentionAction @Override public IntentionAction createAction(Diagnostic diagnostic) { JetMultiDeclarationEntry entry = getMultiDeclarationEntryThatTypeMismatchComponentFunction(diagnostic); - BindingContext context = ResolvePackage.getAnalysisResults((JetFile) entry.getContainingFile().getContainingFile()) - .getBindingContext(); + BindingContext context = ResolvePackage.getBindingContext((JetFile) entry.getContainingFile().getContainingFile()); ResolvedCall resolvedCall = context.get(BindingContext.COMPONENT_RESOLVED_CALL, entry); if (resolvedCall == null) return null; JetFunction componentFunction = (JetFunction) BindingContextUtils.descriptorToDeclaration(context, resolvedCall.getCandidateDescriptor()); @@ -164,7 +163,7 @@ public class ChangeFunctionReturnTypeFix extends JetIntentionAction public IntentionAction createAction(Diagnostic diagnostic) { JetExpression expression = QuickFixUtil.getParentElementOfType(diagnostic, JetExpression.class); assert expression != null : "HAS_NEXT_FUNCTION_TYPE_MISMATCH reported on element that is not within any expression"; - BindingContext context = ResolvePackage.getAnalysisResults(expression.getContainingJetFile()).getBindingContext(); + BindingContext context = ResolvePackage.getBindingContext(expression.getContainingJetFile()); ResolvedCall resolvedCall = context.get(BindingContext.LOOP_RANGE_HAS_NEXT_RESOLVED_CALL, expression); if (resolvedCall == null) return null; JetFunction hasNextFunction = (JetFunction) BindingContextUtils.descriptorToDeclaration(context, resolvedCall.getCandidateDescriptor()); @@ -184,7 +183,7 @@ public class ChangeFunctionReturnTypeFix extends JetIntentionAction public IntentionAction createAction(Diagnostic diagnostic) { JetBinaryExpression expression = QuickFixUtil.getParentElementOfType(diagnostic, JetBinaryExpression.class); assert expression != null : "COMPARE_TO_TYPE_MISMATCH reported on element that is not within any expression"; - BindingContext context = ResolvePackage.getAnalysisResults(expression.getContainingJetFile()).getBindingContext(); + BindingContext context = ResolvePackage.getBindingContext(expression.getContainingJetFile()); ResolvedCall resolvedCall = context.get(BindingContext.RESOLVED_CALL, expression.getOperationReference()); if (resolvedCall == null) return null; PsiElement compareTo = BindingContextUtils.descriptorToDeclaration(context, resolvedCall.getCandidateDescriptor()); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java index ff7760b48fa..5f0e610ed8f 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java @@ -77,7 +77,7 @@ public abstract class ChangeFunctionSignatureFix extends JetIntentionAction declarations = BindingContextUtils.callableDescriptorToDeclarations(bindingContext, functionDescriptor); if (declarations.isEmpty()) { return false; @@ -164,7 +164,7 @@ public abstract class ChangeFunctionSignatureFix extends JetIntentionAction>) diagnostic; JetFunctionLiteral functionLiteral = diagnosticWithParameters.getPsiElement(); BindingContext bindingContext = - ResolvePackage.getAnalysisResults(functionLiteral.getContainingJetFile()).getBindingContext(); + ResolvePackage.getBindingContext(functionLiteral.getContainingJetFile()); DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, functionLiteral); if (descriptor instanceof FunctionDescriptor) { @@ -219,7 +219,7 @@ public abstract class ChangeFunctionSignatureFix extends JetIntentionAction resolvedCall = context.get(BindingContext.COMPONENT_RESOLVED_CALL, entry); if (resolvedCall == null) return null; JetFunction componentFunction = (JetFunction) BindingContextUtils.descriptorToDeclaration(context, resolvedCall.getCandidateDescriptor()); @@ -130,7 +130,7 @@ public class ChangeVariableTypeFix extends JetIntentionAction resolvedCall = context.get(BindingContext.RESOLVED_CALL, callExpression.getCalleeExpression()); if (resolvedCall == null) return null; PsiElement declaration = BindingContextUtils.descriptorToDeclaration(context, resolvedCall.getCandidateDescriptor()); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java index 3508aec6f32..cc5b97ae6cf 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java @@ -54,7 +54,7 @@ public class RemoveFunctionParametersFix extends ChangeFunctionSignatureFix { @Override protected void invoke(@NotNull Project project, Editor editor, JetFile file) { - BindingContext bindingContext = ResolvePackage.getAnalysisResults(file).getBindingContext(); + BindingContext bindingContext = ResolvePackage.getBindingContext(file); runChangeSignature(project, functionDescriptor, new JetChangeSignatureConfiguration() { @Override public void configure( diff --git a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java index 565827cf874..b35300afe2b 100644 --- a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java +++ b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java @@ -119,7 +119,7 @@ public class JetStructureViewElement implements StructureViewTreeElement { public TreeElement[] getChildren() { if (myElement instanceof JetFile) { JetFile jetFile = (JetFile) myElement; - context = ResolvePackage.getAnalysisResults(jetFile).getBindingContext(); + context = ResolvePackage.getBindingContext(jetFile); return wrapDeclarations(jetFile.getDeclarations()); } else if (myElement instanceof JetClass) {