From 4bbde707c08c65ceaab8c7acd9bb808f2041063b Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Wed, 23 Apr 2014 15:55:41 +0400
Subject: [PATCH] Minor. Unneeded getContainingJetFile() calls removed

---
 .../plugin/caches/resolve/IDELightClassGenerationSupport.java | 2 +-
 .../jet/plugin/completion/JetPackagesContributor.java         | 2 +-
 .../jet/plugin/intentions/RemoveExplicitTypeArguments.kt      | 2 +-
 idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt         | 4 ++--
 .../jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java | 2 +-
 idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java | 2 +-
 .../introduceVariable/KotlinIntroduceVariableHandler.java     | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java b/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java
index 6a91a02964c..a1a589a95b3 100644
--- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java
+++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java
@@ -94,7 +94,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport
     @NotNull
     @Override
     public LightClassConstructionContext getContextForClassOrObject(@NotNull JetClassOrObject classOrObject) {
-        ResolveSessionForBodies session = ResolvePackage.getLazyResolveSession(classOrObject.getContainingJetFile());
+        ResolveSessionForBodies session = ResolvePackage.getLazyResolveSession(classOrObject);
 
         if (JetPsiUtil.isLocal(classOrObject)) {
             BindingContext bindingContext = session.resolveToElement(classOrObject);
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java
index 6d15da11df2..8340ca40c19 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java
+++ b/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java
@@ -72,7 +72,7 @@ public class JetPackagesContributor extends CompletionContributor {
                                result = result.withPrefixMatcher(new PlainPrefixMatcher(name.substring(0, prefixLength)));
 
                                ResolveSessionForBodies resolveSession =
-                                       ResolvePackage.getLazyResolveSession(simpleNameReference.getExpression().getContainingJetFile());
+                                       ResolvePackage.getLazyResolveSession(simpleNameReference.getExpression());
                                BindingContext bindingContext = resolveSession.resolveToElement(simpleNameReference.getExpression());
 
                                for (LookupElement variant : DescriptorLookupConverter.collectLookupElements(
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt b/idea/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt
index 00bf63762de..6e443936ce2 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt
@@ -40,7 +40,7 @@ public class RemoveExplicitTypeArguments : JetSelfTargetingIntention<JetCallExpr
         val context = AnalyzerFacadeWithCache.getContextForElement(element)
         if (element.getTypeArguments().isEmpty()) return false
 
-        val resolveSession = element.getContainingJetFile().getLazyResolveSession()
+        val resolveSession = element.getLazyResolveSession()
         val injector = InjectorForMacros(element.getProject(), resolveSession.getModuleDescriptor())
 
         val scope = context[BindingContext.RESOLUTION_SCOPE, element]
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt b/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt
index 5fd2a8eb61d..d1644d173d2 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt
@@ -29,13 +29,13 @@ fun specifyTypeExplicitly(declaration: JetNamedFunction, typeReference: JetTypeR
 }
 
 fun expressionType(expression: JetExpression): JetType? {
-    val resolveSession = expression.getContainingJetFile().getLazyResolveSession()
+    val resolveSession = expression.getLazyResolveSession()
     val bindingContext = resolveSession.resolveToElement(expression)
     return bindingContext.get(BindingContext.EXPRESSION_TYPE, expression)
 }
 
 fun functionReturnType(function: JetNamedFunction): JetType? {
-    val resolveSession = function.getContainingJetFile().getLazyResolveSession()
+    val resolveSession = function.getLazyResolveSession()
     val bindingContext = resolveSession.resolveToElement(function)
     val descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, function)
     if (descriptor == null) return null
diff --git a/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java b/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java
index 4816307d9d3..8fa52475f2b 100644
--- a/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java
+++ b/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java
@@ -28,7 +28,7 @@ public final class AnalyzerFacadeWithCache {
 
     @NotNull
     public static BindingContext getContextForElement(@NotNull JetElement jetElement) {
-        ResolveSessionForBodies resolveSessionForBodies = ResolvePackage.getLazyResolveSession(jetElement.getContainingJetFile());
+        ResolveSessionForBodies resolveSessionForBodies = ResolvePackage.getLazyResolveSession(jetElement);
         return resolveSessionForBodies.resolveToElement(jetElement);
     }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java
index d922365af58..8207fa3b336 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java
@@ -93,7 +93,7 @@ public class AutoImportFix extends JetHintAction<JetSimpleNameExpression> implem
         }
 
         ResolveSessionForBodies resolveSessionForBodies =
-                ResolvePackage.getLazyResolveSession(element.getContainingJetFile());
+                ResolvePackage.getLazyResolveSession(element);
 
         List<FqName> result = Lists.newArrayList();
         if (!isSuppressedTopLevelImportInPosition(element)) {
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
index f5f80eedefc..40abbf8cdab 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
@@ -125,7 +125,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
             }
         }
         ResolveSessionForBodies resolveSession =
-                ResolvePackage.getLazyResolveSession(expression.getContainingJetFile());
+                ResolvePackage.getLazyResolveSession(expression);
         BindingContext bindingContext = resolveSession.resolveToElement(expression);
         final JetType expressionType = bindingContext.get(BindingContext.EXPRESSION_TYPE, expression); //can be null or error type
         JetScope scope = bindingContext.get(BindingContext.RESOLUTION_SCOPE, expression);