From c57dbb389538d0a0861cef966399821fca8ed792 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 21 May 2012 16:40:08 +0400 Subject: [PATCH] Reformatted JetSourceNavigationHelper --- .../libraries/JetSourceNavigationHelper.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java index ac8b9b55ed2..4e825cad36a 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java @@ -42,6 +42,7 @@ import org.jetbrains.jet.lang.resolve.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor; import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.plugin.project.AnalyzerFacadeProvider; import org.jetbrains.jet.resolve.DescriptorRenderer; import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; @@ -83,13 +84,16 @@ public class JetSourceNavigationHelper { @Nullable private static Tuple2 getBindingContextAndClassDescriptor(@NotNull JetClass decompiledClass) { - return getBindingContextAndClassOrNamespaceDescriptor(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, decompiledClass, JetPsiUtil.getFQName(decompiledClass)); + return getBindingContextAndClassOrNamespaceDescriptor(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, decompiledClass, + JetPsiUtil.getFQName(decompiledClass)); } @Nullable - private static Tuple2 getBindingContextAndNamespaceDescriptor(@NotNull JetDeclaration declaration) { + private static Tuple2 getBindingContextAndNamespaceDescriptor( + @NotNull JetDeclaration declaration) { JetFile file = (JetFile) declaration.getContainingFile(); - return getBindingContextAndClassOrNamespaceDescriptor(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, declaration, JetPsiUtil.getFQName(file)); + return getBindingContextAndClassOrNamespaceDescriptor(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, declaration, + JetPsiUtil.getFQName(file)); } @Nullable @@ -126,7 +130,8 @@ public class JetSourceNavigationHelper { Project project = jetDeclaration.getProject(); CacheManager cacheManager = CacheManager.SERVICE.getInstance(project); PsiFile[] filesWithWord = cacheManager.getFilesWithWord(name, - UsageSearchContext.IN_CODE, createLibrarySourcesScopeForFile(libraryFile, project), + UsageSearchContext.IN_CODE, + createLibrarySourcesScopeForFile(libraryFile, project), true); List jetFiles = new ArrayList(); for (PsiFile psiFile : filesWithWord) { @@ -149,7 +154,8 @@ public class JetSourceNavigationHelper { PsiElement declarationContainer = decompiledDeclaration.getParent(); if (declarationContainer instanceof JetFile) { - Tuple2 bindingContextAndNamespaceDescriptor = getBindingContextAndNamespaceDescriptor(decompiledDeclaration); + Tuple2 bindingContextAndNamespaceDescriptor = + getBindingContextAndNamespaceDescriptor(decompiledDeclaration); if (bindingContextAndNamespaceDescriptor == null) return null; BindingContext bindingContext = bindingContextAndNamespaceDescriptor._1; NamespaceDescriptor namespaceDescriptor = bindingContextAndNamespaceDescriptor._2; @@ -215,7 +221,8 @@ public class JetSourceNavigationHelper { @Nullable public static JetDeclaration getSourceProperty(final @NotNull JetProperty decompiledProperty) { - return getSourcePropertyOrFunction(decompiledProperty, decompiledProperty.getReceiverTypeRef(), new Matcher() { + return getSourcePropertyOrFunction(decompiledProperty, decompiledProperty.getReceiverTypeRef(), + new Matcher() { @Override public boolean areSame(JetProperty declaration, VariableDescriptor descriptor) { return true; @@ -230,7 +237,8 @@ public class JetSourceNavigationHelper { @Nullable public static JetDeclaration getSourceFunction(final @NotNull JetFunction decompiledFunction) { - return getSourcePropertyOrFunction(decompiledFunction, decompiledFunction.getReceiverTypeRef(), new Matcher() { + return getSourcePropertyOrFunction(decompiledFunction, decompiledFunction.getReceiverTypeRef(), + new Matcher() { @Override public boolean areSame(JetFunction declaration, FunctionDescriptor descriptor) { List declarationParameters = declaration.getValueParameters();