From 8a7548bc8400507e2082314f658b827f4e06d18f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 11 Jan 2013 18:22:38 +0400 Subject: [PATCH] Wiped traces of JetStandardLibrary class name. --- .../jetbrains/jet/cli/jvm/repl/ReplInterpreter.java | 2 +- .../jetbrains/jet/lang/resolve/TopDownAnalyzer.java | 2 +- .../resolve/lazy/LazyResolveBuiltinClassesTest.java | 6 +++--- idea/src/META-INF/plugin.xml | 4 ++-- ...ibraryInitializer.java => BuiltInsInitializer.java} | 6 +++--- .../jet/plugin/JetQuickDocumentationProvider.java | 6 +++--- .../codeInsight/DescriptorToDeclarationUtil.java | 6 +++--- ...nceResolver.java => BuiltInsReferenceResolver.java} | 10 +++++----- .../jet/plugin/references/JetPsiReference.java | 2 +- ...verTest.java => BuiltInsReferenceResolverTest.java} | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) rename idea/src/org/jetbrains/jet/plugin/{JetStandardLibraryInitializer.java => BuiltInsInitializer.java} (83%) rename idea/src/org/jetbrains/jet/plugin/references/{StandardLibraryReferenceResolver.java => BuiltInsReferenceResolver.java} (96%) rename idea/tests/org/jetbrains/jet/plugin/references/{StandardLibraryReferenceResolverTest.java => BuiltInsReferenceResolverTest.java} (96%) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java index 9d5ad08fdf0..9b70724949b 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java @@ -276,7 +276,7 @@ public class ReplInterpreter { NamespaceDescriptorImpl rootNs = injector.getNamespaceFactory().createNamespaceDescriptorPathIfNeeded(FqName.ROOT); - // map "jet" namespace into JetStandardLibrary/Classes + // map "jet" namespace into KotlinBuiltIns // @see DefaultModuleConfiguraiton#extendNamespaceScope injector.getNamespaceFactory().createNamespaceDescriptorPathIfNeeded(KotlinBuiltIns.getInstance().getBuiltInsPackageFqName()); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java index 5830e96b4ec..568355cf6a7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -241,7 +241,7 @@ public class TopDownAnalyzer { NamespaceDescriptorImpl rootNs = namespaceFactory.createNamespaceDescriptorPathIfNeeded(FqName.ROOT); - // map "jet" namespace into JetStandardLibrary/Classes + // map "jet" namespace into KotlinBuiltIns // @see DefaultModuleConfiguraiton#extendNamespaceScope namespaceFactory.createNamespaceDescriptorPathIfNeeded(KotlinBuiltIns.getInstance().getBuiltInsPackageFqName()); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java index c52e57f3ddc..6499553d068 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java @@ -20,12 +20,12 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.test.util.NamespaceComparator; import org.junit.Test; import java.io.File; -import static org.jetbrains.jet.test.util.NamespaceComparator.*; +import static org.jetbrains.jet.test.util.NamespaceComparator.RECURSIVE; +import static org.jetbrains.jet.test.util.NamespaceComparator.compareNamespaceWithFile; public class LazyResolveBuiltinClassesTest extends KotlinTestWithEnvironment { @Override @@ -34,7 +34,7 @@ public class LazyResolveBuiltinClassesTest extends KotlinTestWithEnvironment { } @Test - public void testJetStandardLibrary() throws Exception { + public void testBuiltIns() throws Exception { NamespaceDescriptor builtInsPackage = KotlinBuiltIns.getInstance().getBuiltInsPackage(); compareNamespaceWithFile(builtInsPackage, RECURSIVE, new File("compiler/testData/builtin-classes.txt")); } diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 41fae070bab..5c8a6afbb19 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -12,7 +12,7 @@ - org.jetbrains.jet.plugin.JetStandardLibraryInitializer + org.jetbrains.jet.plugin.BuiltInsInitializer org.jetbrains.jet.plugin.compiler.JetCompilerManager @@ -21,7 +21,7 @@ org.jetbrains.jet.plugin.caches.JetCacheManager - org.jetbrains.jet.plugin.references.StandardLibraryReferenceResolver + org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver org.jetbrains.jet.plugin.highlighter.DeclarationHintSupport diff --git a/idea/src/org/jetbrains/jet/plugin/JetStandardLibraryInitializer.java b/idea/src/org/jetbrains/jet/plugin/BuiltInsInitializer.java similarity index 83% rename from idea/src/org/jetbrains/jet/plugin/JetStandardLibraryInitializer.java rename to idea/src/org/jetbrains/jet/plugin/BuiltInsInitializer.java index 935adb88d51..8a5425f105f 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetStandardLibraryInitializer.java +++ b/idea/src/org/jetbrains/jet/plugin/BuiltInsInitializer.java @@ -22,11 +22,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; /** - * This project component initializes JetStandardLibrary so that throwing a ProcessCanceledException while + * This project component initializes KotlinBuiltIns so that throwing a ProcessCanceledException while * loading PSI from declaration files is prevented. */ -public class JetStandardLibraryInitializer { - public JetStandardLibraryInitializer(@NotNull final Project project) { +public class BuiltInsInitializer { + public BuiltInsInitializer(@NotNull final Project project) { ProgressManager.getInstance().executeNonCancelableSection(new Runnable() { @Override public void run() { diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java index 1b81dbc93a0..54e052a5a3f 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.plugin.libraries.JetDecompiledData; import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade; -import org.jetbrains.jet.plugin.references.StandardLibraryReferenceResolver; +import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; import org.jetbrains.jet.renderer.DescriptorRenderer; import java.util.Collection; @@ -92,8 +92,8 @@ public class JetQuickDocumentationProvider extends AbstractDocumentationProvider private static boolean isKotlinDeclaration(DeclarationDescriptor descriptor, BindingContext bindingContext, Project project) { PsiElement declaration = BindingContextUtils.descriptorToDeclaration(bindingContext, descriptor); if (declaration == null) { - StandardLibraryReferenceResolver libraryReferenceResolver = project - .getComponent(StandardLibraryReferenceResolver.class); + BuiltInsReferenceResolver libraryReferenceResolver = project + .getComponent(BuiltInsReferenceResolver.class); Collection elements = libraryReferenceResolver.resolveStandardLibrarySymbol(descriptor); return !elements.isEmpty(); } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.java index 5ea2f0bdcdb..61817ad8869 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.java @@ -5,7 +5,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.jet.plugin.references.StandardLibraryReferenceResolver; +import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; import java.util.Collection; @@ -17,8 +17,8 @@ public final class DescriptorToDeclarationUtil { Collection elements = BindingContextUtils.descriptorToDeclarations(bindingContext, descriptor); if (elements.isEmpty()) { - StandardLibraryReferenceResolver libraryReferenceResolver = - file.getProject().getComponent(StandardLibraryReferenceResolver.class); + BuiltInsReferenceResolver libraryReferenceResolver = + file.getProject().getComponent(BuiltInsReferenceResolver.class); elements = libraryReferenceResolver.resolveStandardLibrarySymbol(descriptor); } diff --git a/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java rename to idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index f92a6ab4d07..870654626f6 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java +++ b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java @@ -44,7 +44,7 @@ import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.plugin.JetStandardLibraryInitializer; +import org.jetbrains.jet.plugin.BuiltInsInitializer; import org.jetbrains.jet.renderer.DescriptorRenderer; import java.net.URL; @@ -52,15 +52,15 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -public class StandardLibraryReferenceResolver extends AbstractProjectComponent { +public class BuiltInsReferenceResolver extends AbstractProjectComponent { private BindingContext bindingContext = null; private final FqName TUPLE0_FQ_NAME = DescriptorUtils.getFQName(KotlinBuiltIns.getInstance().getTuple(0)).toSafe(); - public StandardLibraryReferenceResolver( + public BuiltInsReferenceResolver( Project project, // This parameter is needed to initialize built-ins before this component - JetStandardLibraryInitializer makeSureStandardLibraryIsInitialized + BuiltInsInitializer ignored ) { super(project); } @@ -113,7 +113,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent { } private List getJetFiles(String dir, final Predicate filter) { - URL url = StandardLibraryReferenceResolver.class.getResource("/" + dir + "/"); + URL url = BuiltInsReferenceResolver.class.getResource("/" + dir + "/"); VirtualFile vf = VfsUtil.findFileByURL(url); assert vf != null : "Virtual file not found by URL: " + url; diff --git a/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java b/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java index 448e596d784..8ec3374f7dd 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java +++ b/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java @@ -149,7 +149,7 @@ public abstract class JetPsiReference implements PsiPolyVariantReference { } private Collection resolveStandardLibrarySymbol(@NotNull BindingContext bindingContext) { - return myExpression.getProject().getComponent(StandardLibraryReferenceResolver.class) + return myExpression.getProject().getComponent(BuiltInsReferenceResolver.class) .resolveStandardLibrarySymbol(bindingContext, myExpression); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolverTest.java b/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolverTest.java rename to idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java index 9ae1c6db2c1..183393a09c8 100644 --- a/idea/tests/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolverTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -public class StandardLibraryReferenceResolverTest extends ResolveTestCase { +public class BuiltInsReferenceResolverTest extends ResolveTestCase { public void testAny() throws Exception { doTest(); } @@ -76,7 +76,7 @@ public class StandardLibraryReferenceResolverTest extends ResolveTestCase { } public void testAllReferencesResolved() { - StandardLibraryReferenceResolver referenceResolver = getProject().getComponent(StandardLibraryReferenceResolver.class); + BuiltInsReferenceResolver referenceResolver = getProject().getComponent(BuiltInsReferenceResolver.class); for (DeclarationDescriptor descriptor : getAllStandardDescriptors(KotlinBuiltIns.getInstance().getBuiltInsPackage())) { if (descriptor instanceof NamespaceDescriptor && "jet".equals(descriptor.getName().getName())) continue; assertNotNull("Can't resolve " + descriptor, referenceResolver.resolveStandardLibrarySymbol(descriptor));