azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wiped traces of JetStandardLibrary class name.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-01-11 18:22:38 +04:00
parent ab8bdf673d
commit 8a7548bc84
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
+1 -1
View File
@@ -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());
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
+1 -1
View File
@@ -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());
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java
+3 -3
View File
@@ -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"));
}
idea/src/META-INF/plugin.xml
+2 -2
View File
@@ -12,7 +12,7 @@
<project-components>
<component>
<implementation-class>org.jetbrains.jet.plugin.JetStandardLibraryInitializer</implementation-class>
<implementation-class>org.jetbrains.jet.plugin.BuiltInsInitializer</implementation-class>
</component>
<component>
<implementation-class>org.jetbrains.jet.plugin.compiler.JetCompilerManager</implementation-class>
@@ -21,7 +21,7 @@
<implementation-class>org.jetbrains.jet.plugin.caches.JetCacheManager</implementation-class>
</component>
<component>
<implementation-class>org.jetbrains.jet.plugin.references.StandardLibraryReferenceResolver</implementation-class>
<implementation-class>org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver</implementation-class>
</component>
<component>
<implementation-class>org.jetbrains.jet.plugin.highlighter.DeclarationHintSupport</implementation-class>
idea/src/org/jetbrains/jet/plugin/JetStandardLibraryInitializer.java → idea/src/org/jetbrains/jet/plugin/BuiltInsInitializer.java
+3 -3
View File
@@ -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() {
idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java
+3 -3
View File
@@ -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<PsiElement> elements = libraryReferenceResolver.resolveStandardLibrarySymbol(descriptor);
return !elements.isEmpty();
}
idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.java
+3 -3
View File
@@ -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<PsiElement> 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);
}
idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java → idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java
+5 -5
View File
@@ -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<JetFile> getJetFiles(String dir, final Predicate<JetFile> 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;
idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java
+1 -1
View File
@@ -149,7 +149,7 @@ public abstract class JetPsiReference implements PsiPolyVariantReference {
}
private Collection<PsiElement> resolveStandardLibrarySymbol(@NotNull BindingContext bindingContext) {
return myExpression.getProject().getComponent(StandardLibraryReferenceResolver.class)
return myExpression.getProject().getComponent(BuiltInsReferenceResolver.class)
.resolveStandardLibrarySymbol(bindingContext, myExpression);
}
}
idea/tests/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolverTest.java → idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java
+2 -2
View File
@@ -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));