From 99b5fa1f4765ce00642e0e4ba0a7c8a6761aa472 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 18 Apr 2014 23:11:30 +0400 Subject: [PATCH] Minor. Method replaced by a more convenient one from the same class --- .../jet/plugin/caches/resolve/KotlinCacheManagerUtil.java | 6 ------ .../jet/plugin/quickfix/AddFunctionToSupertypeFix.java | 4 ++-- .../plugin/quickfix/ChangeMemberFunctionSignatureFix.java | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheManagerUtil.java b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheManagerUtil.java index a26da30f374..10a5206b0b4 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheManagerUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheManagerUtil.java @@ -26,12 +26,6 @@ public class KotlinCacheManagerUtil { private KotlinCacheManagerUtil() { } - @NotNull - public static KotlinDeclarationsCache getDeclarationsFromProject(@NotNull JetElement element) { - JetFile jetFile = element.getContainingJetFile(); - return KotlinCacheManager.getInstance(jetFile.getProject()).getDeclarationsFromProject(TargetPlatformDetector.getPlatform(jetFile)); - } - @NotNull public static BindingContext getDeclarationsBindingContext(@NotNull JetElement element) { JetFile jetFile = element.getContainingJetFile(); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java index 38ae51dc991..0b4f906c582 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java @@ -52,7 +52,7 @@ public class AddFunctionToSupertypeFix extends JetHintAction { } private static List generateFunctionsToAdd(JetNamedFunction functionElement) { - BindingContext context = KotlinCacheManagerUtil.getDeclarationsFromProject(functionElement).getBindingContext(); + BindingContext context = KotlinCacheManagerUtil.getDeclarationsBindingContext(functionElement); FunctionDescriptor functionDescriptor = context.get(BindingContext.FUNCTION, functionElement); if (functionDescriptor == null) return Collections.emptyList(); @@ -154,7 +154,7 @@ public class AddFunctionToSupertypeFix extends JetHintAction { @NotNull private JetAddFunctionToClassifierAction createAction(Project project, Editor editor) { - BindingContext bindingContext = KotlinCacheManagerUtil.getDeclarationsFromProject(element).getBindingContext(); + BindingContext bindingContext = KotlinCacheManagerUtil.getDeclarationsBindingContext(element); return new JetAddFunctionToClassifierAction(project, editor, bindingContext, functionsToAdd); } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java index 5ca64f952eb..79c5233ce8c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java @@ -108,7 +108,7 @@ public class ChangeMemberFunctionSignatureFix extends JetHintAction computePossibleSignatures(JetNamedFunction functionElement) { - BindingContext context = KotlinCacheManagerUtil.getDeclarationsFromProject(functionElement).getBindingContext(); + BindingContext context = KotlinCacheManagerUtil.getDeclarationsBindingContext(functionElement); FunctionDescriptor functionDescriptor = context.get(BindingContext.FUNCTION, functionElement); if (functionDescriptor == null) return Lists.newArrayList(); List superFunctions = getPossibleSuperFunctionsDescriptors(functionDescriptor);