From 945786e628546cf6681c23b31d477117155f8336 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 28 Aug 2013 11:45:27 +0400 Subject: [PATCH] Rename --- .../jet/plugin/JetQuickDocumentationProvider.java | 2 +- .../codeInsight/DescriptorToDeclarationUtil.java | 2 +- .../references/BuiltInsReferenceResolver.java | 13 ++++++++----- .../JetPropertyDelegationMethodsReference.java | 6 +++--- .../jet/plugin/references/JetPsiReference.java | 2 +- .../references/BuiltInsReferenceResolverTest.java | 2 +- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java index 94ec8fec1f2..bca42f196c0 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/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 elements = libraryReferenceResolver.resolveStandardLibrarySymbol(descriptor); + Collection elements = libraryReferenceResolver.resolveBuiltInSymbol(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 d914eba74f2..6f3353644d8 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.java +++ b/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()) { diff --git a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index a905b297aa2..4d0d7c4cb24 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/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 jetBuiltInsFiles = getJetBuiltinsFiles(); + List jetBuiltInsFiles = getJetBuiltInsFiles(); TopDownAnalyzer.processStandardLibraryNamespace(myProject, context, scope, jetNamespace, jetBuiltInsFiles); builtInsSources = Sets.newHashSet(jetBuiltInsFiles); bindingContext = context.getBindingContext(); } - private List getJetBuiltinsFiles() { + private List 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 resolveStandardLibrarySymbol(@NotNull BindingContext originalContext, @Nullable JetReferenceExpression referenceExpression) { + public Collection 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.emptyList(); + return declarationDescriptor != null ? resolveBuiltInSymbol(declarationDescriptor) : Collections.emptyList(); } @NotNull - public Collection resolveStandardLibrarySymbol(@NotNull DeclarationDescriptor declarationDescriptor) { + public Collection resolveBuiltInSymbol(@NotNull DeclarationDescriptor declarationDescriptor) { if (bindingContext == null) { assert DumbService.getInstance(myProject).isDumb() : "Builtins component wasn't initialized properly"; return Collections.emptyList(); diff --git a/idea/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.java b/idea/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.java index ee1df58da4b..b7565fa8dab 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.java +++ b/idea/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.java @@ -101,10 +101,10 @@ public class JetPropertyDelegationMethodsReference implements PsiPolyVariantRefe results.add(new PsiElementResolveResult(declarationInDecompiledFile)); } - Collection stdlibSymbols = - project.getComponent(BuiltInsReferenceResolver.class).resolveStandardLibrarySymbol(resultingDescriptor); + Collection builtInSymbols = + project.getComponent(BuiltInsReferenceResolver.class).resolveBuiltInSymbol(resultingDescriptor); - for (PsiElement symbol : stdlibSymbols) { + for (PsiElement symbol : builtInSymbols) { results.add(new PsiElementResolveResult(symbol)); } } diff --git a/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java b/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java index 459e975f7a8..91ac4f4a0ad 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java +++ b/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java @@ -163,6 +163,6 @@ public abstract class JetPsiReference implements PsiPolyVariantReference { private Collection resolveStandardLibrarySymbol(@NotNull BindingContext bindingContext) { return myExpression.getProject().getComponent(BuiltInsReferenceResolver.class) - .resolveStandardLibrarySymbol(bindingContext, myExpression); + .resolveBuiltInSymbol(bindingContext, myExpression); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java b/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java index ccfd43a74f1..09fc66b1b52 100644 --- a/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java +++ b/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)); } }