From 1f7c9f5693a187d465c5b30d7c8004e9e092a05a Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 19 Nov 2014 15:04:54 +0300 Subject: [PATCH] Use KotlinCacheService directly in IDELightClassGenerationSupport --- .../caches/resolve/IDELightClassGenerationSupport.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java index be903346422..aacd14612b5 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java @@ -71,7 +71,8 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport List sortedFiles = new ArrayList(files); Collections.sort(sortedFiles, jetFileComparator); - ResolveSessionForBodies session = ResolvePackage.getLazyResolveSession(sortedFiles.get(0)); + JetFile file = sortedFiles.get(0); + ResolveSessionForBodies session = KotlinCacheService.OBJECT$.getInstance(file.getProject()).getLazyResolveSession(file); forceResolvePackageDeclarations(files, session); return new LightClassConstructionContext(session.getBindingContext(), session.getModuleDescriptor()); } @@ -79,7 +80,8 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport @NotNull @Override public LightClassConstructionContext getContextForClassOrObject(@NotNull JetClassOrObject classOrObject) { - ResolveSessionForBodies session = ResolvePackage.getLazyResolveSession(classOrObject); + ResolveSessionForBodies session = + KotlinCacheService.OBJECT$.getInstance(classOrObject.getProject()).getLazyResolveSession(classOrObject); if (classOrObject.isLocal()) { BindingContext bindingContext = session.resolveToElement(classOrObject);