Rename

idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java

@@ -110,7 +110,7 @@ public class JetQuickDocumentationProvider extends AbstractDocumentationProvider
         if (declaration == null) {
             BuiltInsReferenceResolver libraryReferenceResolver = project
                     .getComponent(BuiltInsReferenceResolver.class);
-            Collection<PsiElement> elements = libraryReferenceResolver.resolveStandardLibrarySymbol(descriptor);
+            Collection<PsiElement> elements = libraryReferenceResolver.resolveBuiltInSymbol(descriptor);
             return !elements.isEmpty();
         }
 

idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.java

@@ -40,7 +40,7 @@ public final class DescriptorToDeclarationUtil {
         if (elements.isEmpty()) {
             BuiltInsReferenceResolver libraryReferenceResolver =
                     project.getComponent(BuiltInsReferenceResolver.class);
-            elements = libraryReferenceResolver.resolveStandardLibrarySymbol(descriptor);
+            elements = libraryReferenceResolver.resolveBuiltInSymbol(descriptor);
         }
 
         if (!elements.isEmpty()) {

idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java

@@ -85,14 +85,14 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent {
         scope.changeLockLevel(WritableScope.LockLevel.BOTH);
         jetNamespace.setMemberScope(scope);
 
-        List<JetFile> jetBuiltInsFiles = getJetBuiltinsFiles();
+        List<JetFile> jetBuiltInsFiles = getJetBuiltInsFiles();
         TopDownAnalyzer.processStandardLibraryNamespace(myProject, context, scope, jetNamespace, jetBuiltInsFiles);
 
         builtInsSources = Sets.newHashSet(jetBuiltInsFiles);
         bindingContext = context.getBindingContext();
     }
 
-    private List<JetFile> getJetBuiltinsFiles() {
+    private List<JetFile> getJetBuiltInsFiles() {
         URL url = LightClassUtil.getBuiltInsDirUrl();
         VirtualFile vf = VfsUtil.findFileByURL(url);
         assert vf != null : "Virtual file not found by URL: " + url;
@@ -167,7 +167,10 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent {
     }
 
     @NotNull
-    public Collection<PsiElement> resolveStandardLibrarySymbol(@NotNull BindingContext originalContext, @Nullable JetReferenceExpression referenceExpression) {
+    public Collection<PsiElement> resolveBuiltInSymbol(
+            @NotNull BindingContext originalContext,
+            @Nullable JetReferenceExpression referenceExpression
+    ) {
         if (bindingContext == null) {
             assert DumbService.getInstance(myProject).isDumb() : "Builtins component wasn't initialized properly";
             return Collections.emptyList();
@@ -175,11 +178,11 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent {
 
         DeclarationDescriptor declarationDescriptor = originalContext.get(BindingContext.REFERENCE_TARGET, referenceExpression);
 
-        return declarationDescriptor != null ? resolveStandardLibrarySymbol(declarationDescriptor) : Collections.<PsiElement>emptyList();
+        return declarationDescriptor != null ? resolveBuiltInSymbol(declarationDescriptor) : Collections.<PsiElement>emptyList();
     }
 
     @NotNull
-    public Collection<PsiElement> resolveStandardLibrarySymbol(@NotNull DeclarationDescriptor declarationDescriptor) {
+    public Collection<PsiElement> resolveBuiltInSymbol(@NotNull DeclarationDescriptor declarationDescriptor) {
         if (bindingContext == null) {
             assert DumbService.getInstance(myProject).isDumb() : "Builtins component wasn't initialized properly";
             return Collections.emptyList();

idea/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.java

@@ -101,10 +101,10 @@ public class JetPropertyDelegationMethodsReference implements PsiPolyVariantRefe
             results.add(new PsiElementResolveResult(declarationInDecompiledFile));
         }
 
-        Collection<PsiElement> stdlibSymbols =
+        Collection<PsiElement> builtInSymbols =
-                project.getComponent(BuiltInsReferenceResolver.class).resolveStandardLibrarySymbol(resultingDescriptor);
+                project.getComponent(BuiltInsReferenceResolver.class).resolveBuiltInSymbol(resultingDescriptor);
 
-        for (PsiElement symbol : stdlibSymbols) {
+        for (PsiElement symbol : builtInSymbols) {
             results.add(new PsiElementResolveResult(symbol));
         }
     }

idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java

@@ -163,6 +163,6 @@ public abstract class JetPsiReference implements PsiPolyVariantReference {
 
     private Collection<PsiElement> resolveStandardLibrarySymbol(@NotNull BindingContext bindingContext) {
         return myExpression.getProject().getComponent(BuiltInsReferenceResolver.class)
-                .resolveStandardLibrarySymbol(bindingContext, myExpression);
+                .resolveBuiltInSymbol(bindingContext, myExpression);
     }
 }

idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java

@@ -75,7 +75,7 @@ public class BuiltInsReferenceResolverTest extends ResolveTestCase {
         BuiltInsReferenceResolver referenceResolver = getProject().getComponent(BuiltInsReferenceResolver.class);
         for (DeclarationDescriptor descriptor : getAllStandardDescriptors(KotlinBuiltIns.getInstance().getBuiltInsPackage())) {
             if (descriptor instanceof NamespaceDescriptor && "jet".equals(descriptor.getName().asString())) continue;
-            assertNotNull("Can't resolve " + descriptor, referenceResolver.resolveStandardLibrarySymbol(descriptor));
+            assertNotNull("Can't resolve " + descriptor, referenceResolver.resolveBuiltInSymbol(descriptor));
         }
     }