From 1cf3938f13692e407475911a308192b15a2838e9 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 20 Nov 2014 18:27:00 +0300 Subject: [PATCH] Rename: JetElement#getBindingContext() -> analyzeFully --- .../jet/plugin/caches/resolve/KotlinResolveCache.kt | 2 +- .../jetbrains/jet/plugin/caches/resolve/resolutionApi.kt | 2 +- .../jet/plugin/highlighter/DebugInfoAnnotator.java | 2 +- .../highlighter/DuplicateJvmSignatureAnnotator.java | 2 +- .../jet/plugin/actions/ShowExpressionTypeAction.java | 2 +- .../actions/internal/CopyAsDiagnosticTestAction.java | 2 +- .../plugin/codeInsight/JetTypeDeclarationProvider.java | 2 +- .../jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java | 2 +- .../jet/plugin/highlighter/DeclarationHintSupport.java | 2 +- .../intentions/MoveLambdaInsideParenthesesIntention.kt | 4 ++-- .../intentions/ReplaceWithInfixFunctionCallIntention.kt | 4 ++-- .../plugin/intentions/SpecifyTypeExplicitlyAction.java | 4 ++-- .../intentions/declarations/ConvertMemberToExtension.java | 2 +- .../jet/plugin/quickfix/AddFunctionParametersFix.java | 3 +-- .../jet/plugin/quickfix/AddNameToArgumentFix.java | 2 +- .../quickfix/AddOverrideToEqualsHashCodeToStringFix.java | 2 +- .../jetbrains/jet/plugin/quickfix/CastExpressionFix.java | 2 +- .../quickfix/ChangeFunctionLiteralReturnTypeFix.java | 2 +- .../quickfix/ChangeFunctionLiteralSignatureFix.java | 2 +- .../jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java | 8 ++++---- .../jet/plugin/quickfix/ChangeFunctionSignatureFix.java | 4 ++-- .../plugin/quickfix/ChangeMemberFunctionSignatureFix.java | 2 +- .../plugin/quickfix/ChangeToConstructorInvocationFix.java | 2 +- .../jet/plugin/quickfix/ChangeVariableMutabilityFix.java | 2 +- .../jet/plugin/quickfix/ChangeVariableTypeFix.java | 4 ++-- .../jet/plugin/quickfix/ChangeVisibilityModifierFix.java | 2 +- .../jet/plugin/quickfix/MapPlatformClassToKotlinFix.java | 4 ++-- .../quickfix/QuickFixFactoryForTypeMismatchError.java | 2 +- .../org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java | 2 +- .../jet/plugin/quickfix/RemoveFunctionParametersFix.java | 2 +- .../RenameParameterToMatchOverriddenMethodFix.java | 2 +- .../createFunction/CreateIteratorFunctionActionFactory.kt | 4 ++-- .../createVariable/CreateParameterActionFactory.kt | 2 +- .../ideaExtensions/KotlinAnnotatedElementsSearcher.java | 2 +- .../jetbrains/jet/plugin/DirectiveBasedActionUtils.java | 2 +- .../codeInsight/AbstractInsertImportOnPasteTest.java | 2 +- .../jet/plugin/highlighter/NoErrorsInStdlibTest.kt | 4 ++-- .../jet/plugin/refactoring/rename/AbstractRenameTest.kt | 4 ++-- .../jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt | 2 +- 39 files changed, 51 insertions(+), 52 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt index ab82259de3f..58a9a8f3216 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt @@ -292,7 +292,7 @@ private object KotlinResolveDataProvider { else { if (contextElement !is JetExpression) return BindingContext.EMPTY - val contextForElement = contextElement.getBindingContext() + val contextForElement = contextElement.analyzeFully() scopeForContextElement = contextForElement[BindingContext.RESOLUTION_SCOPE, contextElement] dataFlowInfo = contextForElement.getDataFlowInfo(contextElement) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt index 12d404412fe..78538f83c6b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt @@ -49,7 +49,7 @@ public fun JetElement.getAnalysisResults(vararg extraFiles: JetFile): AnalysisRe return KotlinCacheService.getInstance(getProject()).getAnalysisResults(listOf(this) + extraFiles.toList()) } -public fun JetElement.getBindingContext(): BindingContext { +public fun JetElement.analyzeFully(): BindingContext { return getAnalysisResults().bindingContext } diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java index fe6646eb5d7..910836f6c44 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java @@ -48,7 +48,7 @@ public class DebugInfoAnnotator implements Annotator { if (element instanceof JetFile && !(element instanceof JetCodeFragment)) { JetFile file = (JetFile) element; try { - BindingContext bindingContext = ResolvePackage.getBindingContext(file); + BindingContext bindingContext = ResolvePackage.analyzeFully(file); DebugInfoUtil.markDebugAnnotations(file, bindingContext, new DebugInfoUtil.DebugInfoReporter() { @Override public void reportElementWithErrorType(@NotNull JetReferenceExpression expression) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java index de7e56e019c..bd87d60797f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java @@ -44,7 +44,7 @@ public class DuplicateJvmSignatureAnnotator implements Annotator { PsiFile file = element.getContainingFile(); if (!(file instanceof JetFile) || TargetPlatformDetector.getPlatform((JetFile) file) != TargetPlatform.JVM) return; - Diagnostics otherDiagnostics = ResolvePackage.getBindingContext((JetElement) element).getDiagnostics(); + Diagnostics otherDiagnostics = ResolvePackage.analyzeFully((JetElement) element).getDiagnostics(); GlobalSearchScope moduleScope = getModuleInfo(element).contentScope(); Diagnostics diagnostics = AsJavaPackage.getJvmSignatureDiagnostics(element, otherDiagnostics, moduleScope); diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java index 37c2ff5c18e..ad0ffa76b78 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.getBindingContext((JetFile) psiFile); + BindingContext bindingContext = ResolvePackage.analyzeFully((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/actions/internal/CopyAsDiagnosticTestAction.java b/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java index 1c3b7575d71..4fbbb68be4e 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java @@ -40,7 +40,7 @@ public class CopyAsDiagnosticTestAction extends AnAction { PsiFile psiFile = e.getData(CommonDataKeys.PSI_FILE); assert editor != null && psiFile != null; - BindingContext bindingContext = ResolvePackage.getBindingContext((JetFile) psiFile); + BindingContext bindingContext = ResolvePackage.analyzeFully((JetFile) psiFile); List diagnostics = CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(bindingContext, psiFile); String result = CheckerTestUtil.addDiagnosticMarkersToText(psiFile, diagnostics).toString(); diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java index 47a9d1da449..43775fcbe29 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.getBindingContext((JetFile) symbol.getContainingFile()); + ResolvePackage.analyzeFully((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/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java index 621af519278..817bbd66e5d 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java @@ -69,7 +69,7 @@ public class KotlinTypeHierarchyProvider extends JavaTypeHierarchyProvider { else if (target instanceof JetNamedFunction) { JetNamedFunction function = (JetNamedFunction) target; String functionName = function.getName(); - FunctionDescriptor functionDescriptor = ResolvePackage.getBindingContext(function) + FunctionDescriptor functionDescriptor = ResolvePackage.analyzeFully(function) .get(BindingContext.FUNCTION, target); if (functionDescriptor != null) { JetType type = functionDescriptor.getReturnType(); diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java index 0827ea50973..158619e816b 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java @@ -193,7 +193,7 @@ public class DeclarationHintSupport extends AbstractProjectComponent { DeclarationDescriptor descriptor = null; try { BindingContext bindingContext = - ResolvePackage.getBindingContext(jetFile); + ResolvePackage.analyzeFully(jetFile); descriptor = bindingContext.getDiagnostics().forElement(declaration).isEmpty() ? bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration) : null; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt index 7b1ef01e95d..857fc0f3fe9 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.jet.lang.psi.JetFunctionLiteralArgument import org.jetbrains.jet.plugin.util.psiModificationUtil.moveInsideParentheses -import org.jetbrains.jet.plugin.caches.resolve.getBindingContext +import org.jetbrains.jet.plugin.caches.resolve.analyzeFully public class MoveLambdaInsideParenthesesIntention : JetSelfTargetingIntention( "move.lambda.inside.parentheses", javaClass()) { @@ -27,7 +27,7 @@ public class MoveLambdaInsideParenthesesIntention : JetSelfTargetingIntention { JetCallElement callElement = PsiTreeUtil.getParentOfType(argument, JetCallElement.class); assert callElement != null : "The argument has to be inside a function or constructor call"; - BindingContext context = ResolvePackage.getBindingContext(argument.getContainingJetFile()); + BindingContext context = ResolvePackage.analyzeFully(argument.getContainingJetFile()); ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(callElement, context); 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 06c96862f80..48eecc800d4 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java @@ -82,7 +82,7 @@ public class AddOverrideToEqualsHashCodeToStringFix extends JetIntentionAction

files = PluginJetFilesProvider.allFilesInProject(file.getProject()); for (JetFile jetFile : files) { - for (Diagnostic diagnostic : ResolvePackage.getBindingContext(jetFile).getDiagnostics()) { + for (Diagnostic diagnostic : ResolvePackage.analyzeFully(jetFile).getDiagnostics()) { if (diagnostic.getFactory() != Errors.VIRTUAL_MEMBER_HIDDEN) continue; JetModifierListOwner element = (JetModifierListOwner) 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 f437a57980b..f53aa8393ee 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java @@ -63,7 +63,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.getBindingContext((JetFile) file); + BindingContext context = ResolvePackage.analyzeFully((JetFile) file); JetType expressionType = context.get(BindingContext.EXPRESSION_TYPE, element); return expressionType != null && JetTypeChecker.DEFAULT.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 72e43009c67..29a9e7b5a74 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java @@ -55,7 +55,7 @@ public class ChangeFunctionLiteralReturnTypeFix extends JetIntentionAction @Override public IntentionAction createAction(@NotNull Diagnostic diagnostic) { JetMultiDeclarationEntry entry = getMultiDeclarationEntryThatTypeMismatchComponentFunction(diagnostic); - BindingContext context = ResolvePackage.getBindingContext((JetFile) entry.getContainingFile().getContainingFile()); + BindingContext context = ResolvePackage.analyzeFully((JetFile) entry.getContainingFile().getContainingFile()); ResolvedCall resolvedCall = context.get(BindingContext.COMPONENT_RESOLVED_CALL, entry); if (resolvedCall == null) return null; JetFunction componentFunction = (JetFunction) DescriptorToSourceUtils @@ -155,7 +155,7 @@ public class ChangeFunctionReturnTypeFix extends JetIntentionAction public IntentionAction createAction(@NotNull 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.getBindingContext(expression.getContainingJetFile()); + BindingContext context = ResolvePackage.analyzeFully(expression.getContainingJetFile()); ResolvedCall resolvedCall = context.get(BindingContext.LOOP_RANGE_HAS_NEXT_RESOLVED_CALL, expression); if (resolvedCall == null) return null; JetFunction hasNextFunction = (JetFunction) DescriptorToSourceUtils @@ -176,7 +176,7 @@ public class ChangeFunctionReturnTypeFix extends JetIntentionAction public IntentionAction createAction(@NotNull 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.getBindingContext(expression.getContainingJetFile()); + BindingContext context = ResolvePackage.analyzeFully(expression.getContainingJetFile()); ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(expression, context); if (resolvedCall == null) return null; PsiElement compareTo = DescriptorToSourceUtils.descriptorToDeclaration(resolvedCall.getCandidateDescriptor()); @@ -196,7 +196,7 @@ public class ChangeFunctionReturnTypeFix extends JetIntentionAction JetFunction function = QuickFixUtil.getParentElementOfType(diagnostic, JetFunction.class); if (function != null) { - BindingContext context = ResolvePackage.getBindingContext(function); + BindingContext context = ResolvePackage.analyzeFully(function); JetType matchingReturnType = QuickFixUtil.findLowerBoundOfOverriddenCallablesReturnTypes(context, function); if (matchingReturnType != null) { actions.add(new ChangeFunctionReturnTypeFix(function, matchingReturnType)); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java index a3659a40f31..e5648d5d867 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java @@ -168,7 +168,7 @@ public abstract class ChangeFunctionSignatureFix extends JetIntentionAction superFunctions = getPossibleSuperFunctionsDescriptors(functionDescriptor); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java index 4bb1fa6f418..c08d21b068d 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java @@ -61,7 +61,7 @@ public class ChangeToConstructorInvocationFix extends JetIntentionAction resolvedCall = context.get(BindingContext.COMPONENT_RESOLVED_CALL, entry); if (resolvedCall == null) return null; JetFunction componentFunction = (JetFunction) DescriptorToSourceUtils @@ -133,7 +133,7 @@ public class ChangeVariableTypeFix extends JetIntentionAction diagnostics = context.getDiagnostics(); List imports = new ArrayList(); List usages = new ArrayList(); @@ -196,7 +196,7 @@ public class MapPlatformClassToKotlinFix extends JetIntentionAction diagnostics = ResolvePackage.getBindingContext(file).getDiagnostics().all(); + Collection diagnostics = ResolvePackage.analyzeFully(file).getDiagnostics().all(); Collection errorDiagnostics = Collections2.filter(diagnostics, new Predicate() { @Override public boolean apply(@Nullable Diagnostic diagnostic) { diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java index 0260de79efc..29ac2de5b33 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java @@ -98,7 +98,7 @@ public abstract class AbstractInsertImportOnPasteTest extends JetLightCodeInsigh } private static void checkNoUnresolvedReferences(@NotNull final JetFile file) { - BindingContext bindingContext = ResolvePackage.getBindingContext(file); + BindingContext bindingContext = ResolvePackage.analyzeFully(file); for (Diagnostic diagnostic : bindingContext.getDiagnostics()) { if (Errors.UNRESOLVED_REFERENCE_DIAGNOSTICS.contains(diagnostic.getFactory())) { List textRanges = diagnostic.getTextRanges(); diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt b/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt index 8c4958c255a..8dba4a66adb 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt @@ -26,7 +26,7 @@ import org.jetbrains.jet.cli.common.messages.MessageCollectorPlainTextToStream import com.intellij.openapi.projectRoots.Sdk import org.jetbrains.jet.plugin.PluginTestCaseBase import kotlin.test.assertEquals -import org.jetbrains.jet.plugin.caches.resolve.getBindingContext +import org.jetbrains.jet.plugin.caches.resolve.analyzeFully import org.jetbrains.jet.lang.diagnostics.Severity import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.jet.JetTestUtils @@ -46,7 +46,7 @@ public class NoErrorsInStdlibTest : LightCodeInsightFixtureTestCase() { val psiFile = psiManager.findFile(file) if (psiFile is JetFile) { hasAtLeastOneFile = true - val bindingContext = psiFile.getBindingContext() + val bindingContext = psiFile.analyzeFully() val errors = bindingContext.getDiagnostics().all().filter { it.getSeverity() == Severity.ERROR } if (errors.isNotEmpty()) { diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt index 7513744cbe7..11a26b42a89 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt @@ -46,7 +46,7 @@ import org.jetbrains.jet.lang.resolve.name.isSubpackageOf import org.jetbrains.jet.getString import org.jetbrains.jet.getNullableString import org.jetbrains.jet.plugin.search.allScope -import org.jetbrains.jet.plugin.caches.resolve.getBindingContext +import org.jetbrains.jet.plugin.caches.resolve.analyzeFully import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException import com.intellij.refactoring.util.CommonRefactoringUtil.RefactoringErrorHintException @@ -192,7 +192,7 @@ public abstract class AbstractRenameTest : MultiFileTestCase() { val document = FileDocumentManager.getInstance()!!.getDocument(mainFile)!! val jetFile = PsiDocumentManager.getInstance(context.project).getPsiFile(document) as JetFile - val bindingContext = jetFile.getBindingContext() + val bindingContext = jetFile.analyzeFully() val classDescriptor = bindingContext.get(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, classFqName)!! val psiElement = DescriptorToSourceUtils.descriptorToDeclaration(findDescriptorToRename(classDescriptor))!! diff --git a/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt b/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt index 3a5ea4e0cc9..348070e576e 100644 --- a/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt +++ b/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.psi.psiUtil.parents import com.intellij.openapi.util.TextRange import org.jetbrains.jet.lang.psi.JetElement import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiUnifier -import org.jetbrains.jet.plugin.caches.resolve.getBindingContext +import org.jetbrains.jet.plugin.caches.resolve.analyzeFully import org.jetbrains.jet.plugin.util.psi.patternMatching.toRange import java.io.File import org.jetbrains.jet.JetTestUtils