From d3e2dd59424b4a5efad06c39e44fb97254259cf7 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 16 Oct 2015 13:53:23 +0300 Subject: [PATCH] Dropping package facades: drop package facades not cleaned up automatically --- .../decompiler/navigation/JetSourceNavigationHelper.java | 4 ++-- .../JetChangeSignatureUsageProcessor.java | 9 ++++++--- .../KotlinIntroduceVariableHandler.java | 4 ++-- .../reference/QualifiedExpressionTranslator.java | 2 -- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java index 4272c153b11..6d58f654abd 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java @@ -46,7 +46,7 @@ import org.jetbrains.kotlin.context.MutableModuleContext; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptorKt; import org.jetbrains.kotlin.fileClasses.NoResolveFileClassesProvider; -import org.jetbrains.kotlin.frontend.di.DiPackage; +import org.jetbrains.kotlin.frontend.di.InjectionKt; import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex; import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope; import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex; @@ -256,7 +256,7 @@ public class JetSourceNavigationHelper { getContainingFiles(candidates) ); - ResolveSession resolveSession = DiPackage.createLazyResolveSession( + ResolveSession resolveSession = InjectionKt.createLazyResolveSession( newModuleContext, providerFactory, new BindingTraceContext(), diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java index a56457e4807..f9ecaf7279c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java @@ -38,7 +38,10 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import com.intellij.util.containers.MultiMap; -import kotlin.*; +import kotlin.ArraysKt; +import kotlin.CollectionsKt; +import kotlin.MapsKt; +import kotlin.StringsKt; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -46,7 +49,7 @@ import org.jetbrains.kotlin.asJava.KotlinLightMethod; import org.jetbrains.kotlin.asJava.LightClassUtilsKt; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.idea.JetFileType; -import org.jetbrains.kotlin.idea.analysis.AnalysisPackage; +import org.jetbrains.kotlin.idea.analysis.AnalyzerUtilKt; import org.jetbrains.kotlin.idea.caches.resolve.JavaResolutionUtils; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde; @@ -739,7 +742,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro JetThisExpression newExpr = (JetThisExpression) psiFactory.createExpression(newExprText); - BindingContext newContext = AnalysisPackage.analyzeInContext(newExpr, scope, originalExpr); + BindingContext newContext = AnalyzerUtilKt.analyzeInContext(newExpr, scope, originalExpr); JetSimpleNameExpression labelExpr = newExpr.getTargetLabel(); if (labelExpr != null && newContext.get(BindingContext.AMBIGUOUS_LABEL_TARGET, labelExpr) != null) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java index e73cb166109..cddfc255974 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java @@ -37,7 +37,7 @@ import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.analyzer.AnalysisResult; -import org.jetbrains.kotlin.idea.analysis.AnalysisPackage; +import org.jetbrains.kotlin.idea.analysis.AnalyzerUtilKt; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils; import org.jetbrains.kotlin.idea.core.KotlinNameSuggester; @@ -143,7 +143,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { DataFlowInfo dataFlowInfo = BindingContextUtilsKt.getDataFlowInfo(bindingContext, expression); ObservableBindingTrace bindingTrace = new ObservableBindingTrace(new BindingTraceContext()); - JetType typeNoExpectedType = AnalysisPackage.computeTypeInfoInContext( + JetType typeNoExpectedType = AnalyzerUtilKt.computeTypeInfoInContext( expression, scope, expression, bindingTrace, dataFlowInfo ).getType(); if (expressionType != null && typeNoExpectedType != null && !JetTypeChecker.DEFAULT.equalTypes(expressionType, diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java index cbae2bc95da..8a7a1709de6 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java @@ -27,10 +27,8 @@ import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; import static org.jetbrains.kotlin.js.translate.general.Translation.translateAsExpression; -import static org.jetbrains.kotlin.js.translate.reference.CallExpressionTranslator.shouldBeInlined; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getNotNullSimpleNameSelector; import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getSelector;