diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AdditionalCheckerProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AdditionalCheckerProvider.kt index d0e9d40608f..5ac8b152c88 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AdditionalCheckerProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AdditionalCheckerProvider.kt @@ -31,5 +31,5 @@ public abstract class AdditionalCheckerProvider( public val callCheckers: List = DEFAULT_CALL_CHECKERS + additionalCallCheckers - public object Empty : AdditionalCheckerProvider(listOf(), listOf()) {} + public object DefaultProvider : AdditionalCheckerProvider(listOf(), listOf()) {} } diff --git a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt index 2835631f491..c1ddf9d28e4 100644 --- a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt +++ b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt @@ -105,7 +105,7 @@ private fun generatorForLazyTopDownAnalyzerBasic() = publicField() - field() + field() } private fun generatorForLazyBodyResolve() = @@ -217,7 +217,7 @@ private fun generatorForMacro() = field(useAsContext = true, init = GivenExpression("org.jetbrains.kotlin.context.ContextPackage.GlobalContext()")) - field() + field() } private fun generatorForTests() = 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 5211e76547b..954583cd8f1 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 @@ -264,7 +264,7 @@ public class JetSourceNavigationHelper { moduleDescriptor, providerFactory, new BindingTraceContext(), - AdditionalCheckerProvider.Empty.INSTANCE$, + AdditionalCheckerProvider.DefaultProvider.INSTANCE$, new DynamicTypesSettings()).getResolveSession(); moduleDescriptor.initialize(resolveSession.getPackageFragmentProvider());