From 8b5b2ce6313e61f9c094484adb585857360f8703 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 20 Jul 2012 14:18:26 +0400 Subject: [PATCH] Seemingly more appropriate logic in BuiltinScopeExtensionMode. --- .../org/jetbrains/jet/lang/DefaultModuleConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java b/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java index 01f3a60aeca..ac023f1884d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java @@ -61,10 +61,10 @@ public class DefaultModuleConfiguration implements ModuleConfiguration { if (DescriptorUtils.getFQName(namespaceDescriptor).equalsTo(JetStandardClasses.STANDARD_CLASSES_FQNAME)) { switch (builtinsScopeExtensionMode) { case ALL: - namespaceMemberScope.importScope(JetStandardClasses.STANDARD_CLASSES); + namespaceMemberScope.importScope(JetStandardLibrary.getInstance().getLibraryScope()); break; case ONLY_STANDARD_CLASSES: - namespaceMemberScope.importScope(JetStandardLibrary.getInstance().getLibraryScope()); + namespaceMemberScope.importScope(JetStandardClasses.STANDARD_CLASSES); break; }