From d3d22094527d03da88975db539b599f54b7a9d67 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 30 Jan 2014 20:49:43 +0400 Subject: [PATCH] Rename: CancelableResolveSession -> ResolveSessionForBodies --- .../jet/plugin/caches/JetShortNamesCache.java | 8 ++++---- .../resolve/DeclarationsCacheProvider.java | 12 ++++++------ .../plugin/codeInsight/ShortenReferences.kt | 6 +++--- .../plugin/completion/CompletionSession.java | 6 +++--- .../completion/JetCompletionResultSet.java | 10 +++++----- .../completion/JetPackagesContributor.java | 4 ++-- .../jet/plugin/completion/SmartCompletion.kt | 10 +++++----- .../JetFunctionParameterInfoHandler.java | 14 +++++++------- .../project/AnalyzerFacadeWithCache.java | 18 +++++++++--------- ...sion.java => ResolveSessionForBodies.java} | 10 +++++----- .../jet/plugin/quickfix/AutoImportFix.java | 14 +++++++------- .../quickfix/MakeOverriddenMemberOpenFix.java | 4 ++-- .../inline/KotlinInlineValHandler.java | 19 +++++++++---------- .../references/JetSimpleNameReference.java | 6 ------ .../JetFunctionParameterInfoTest.java | 4 ++-- 15 files changed, 69 insertions(+), 76 deletions(-) rename idea/src/org/jetbrains/jet/plugin/project/{CancelableResolveSession.java => ResolveSessionForBodies.java} (84%) diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java b/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java index 1f739c0233b..9b56f6cdc0d 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java @@ -48,7 +48,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; import org.jetbrains.jet.plugin.caches.resolve.IDELightClassGenerationSupport; -import org.jetbrains.jet.plugin.project.CancelableResolveSession; +import org.jetbrains.jet.plugin.project.ResolveSessionForBodies; import org.jetbrains.jet.plugin.stubindex.*; import java.util.*; @@ -181,7 +181,7 @@ public class JetShortNamesCache extends PsiShortNamesCache { public Collection getTopLevelObjectsByName( @NotNull String name, @NotNull JetSimpleNameExpression expression, - @NotNull CancelableResolveSession resolveSession, + @NotNull ResolveSessionForBodies resolveSession, @NotNull GlobalSearchScope scope ) { BindingContext context = resolveSession.resolveToElement(expression); @@ -216,7 +216,7 @@ public class JetShortNamesCache extends PsiShortNamesCache { public Collection getTopLevelFunctionDescriptorsByName( @NotNull String name, @NotNull JetSimpleNameExpression expression, - @NotNull CancelableResolveSession resolveSession, + @NotNull ResolveSessionForBodies resolveSession, @NotNull GlobalSearchScope scope ) { // name parameter can differ from expression.getReferenceName() when expression contains completion suffix @@ -288,7 +288,7 @@ public class JetShortNamesCache extends PsiShortNamesCache { public Collection getJetCallableExtensions( @NotNull final Condition acceptedNameCondition, @NotNull JetSimpleNameExpression expression, - @NotNull CancelableResolveSession resolveSession, + @NotNull ResolveSessionForBodies resolveSession, @NotNull GlobalSearchScope searchScope ) { BindingContext context = resolveSession.resolveToElement(expression); diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/DeclarationsCacheProvider.java b/idea/src/org/jetbrains/jet/plugin/caches/resolve/DeclarationsCacheProvider.java index 75c8a5411bd..fde49f88a61 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/DeclarationsCacheProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/DeclarationsCacheProvider.java @@ -28,13 +28,13 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.JetFilesProvider; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.plugin.project.AnalyzerFacadeProvider; -import org.jetbrains.jet.plugin.project.CancelableResolveSession; +import org.jetbrains.jet.plugin.project.ResolveSessionForBodies; import org.jetbrains.jet.plugin.project.TargetPlatform; import java.util.Collection; public abstract class DeclarationsCacheProvider { - private final CachedValue lazyResolveCache; + private final CachedValue lazyResolveCache; protected final TargetPlatform platform; protected final Project project; @@ -50,7 +50,7 @@ public abstract class DeclarationsCacheProvider { public abstract KotlinDeclarationsCache getDeclarations(boolean allowIncomplete); @NotNull - public CancelableResolveSession getLazyResolveSession() { + public ResolveSessionForBodies getLazyResolveSession() { return lazyResolveCache.getValue(); } @@ -58,7 +58,7 @@ public abstract class DeclarationsCacheProvider { return JetFilesProvider.getInstance(project).isFileInScope(jetFile, GlobalSearchScope.allScope(project)); } - private static class CancelableResolveSessionValueProvider implements CachedValueProvider { + private static class CancelableResolveSessionValueProvider implements CachedValueProvider { private final Project project; private final TargetPlatform platform; @@ -69,10 +69,10 @@ public abstract class DeclarationsCacheProvider { @Nullable @Override - public synchronized Result compute() { + public synchronized Result compute() { Collection files = JetFilesProvider.getInstance(project).allInScope(GlobalSearchScope.allScope(project)); ResolveSession resolveSession = AnalyzerFacadeProvider.getAnalyzerFacade(platform).getLazyResolveSession(project, files); - return Result.create(new CancelableResolveSession(project, resolveSession), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT); + return Result.create(new ResolveSessionForBodies(project, resolveSession), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT); } } } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt index 05c157f7c94..a38f81bb9a2 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt @@ -7,7 +7,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache; -import org.jetbrains.jet.plugin.project.CancelableResolveSession; +import org.jetbrains.jet.plugin.project.ResolveSessionForBodies; import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; import org.jetbrains.jet.renderer.DescriptorRenderer; @@ -76,7 +76,7 @@ public object ShortenReferences { } private class ShortenTypesVisitor(val file: JetFile, val resolveMap: Map) : JetVisitorVoid() { - private val resolveSession : CancelableResolveSession + private val resolveSession : ResolveSessionForBodies get() = AnalyzerFacadeWithCache.getLazyResolveSessionForFile(file) private val typesToShorten = ArrayList() @@ -142,7 +142,7 @@ public object ShortenReferences { } private class ShortenQualifiedExpressionsVisitor(val file: JetFile, val resolveMap: Map) : JetVisitorVoid() { - private val resolveSession : CancelableResolveSession + private val resolveSession : ResolveSessionForBodies get() = AnalyzerFacadeWithCache.getLazyResolveSessionForFile(file) private fun bindingContext(expression: JetReferenceExpression): BindingContext diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.java b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.java index 477250d81f6..8d32ed66235 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.java @@ -40,7 +40,7 @@ import org.jetbrains.jet.plugin.caches.JetShortNamesCache; import org.jetbrains.jet.plugin.codeInsight.TipsManager; import org.jetbrains.jet.plugin.completion.weigher.WeigherPackage; import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache; -import org.jetbrains.jet.plugin.project.CancelableResolveSession; +import org.jetbrains.jet.plugin.project.ResolveSessionForBodies; import org.jetbrains.jet.plugin.references.JetSimpleNameReference; import java.util.Collection; @@ -61,7 +61,7 @@ class CompletionSession { this.parameters = parameters; this.jetReference = jetReference; - CancelableResolveSession resolveSession = + ResolveSessionForBodies resolveSession = AnalyzerFacadeWithCache.getLazyResolveSessionForFile((JetFile) position.getContainingFile()); BindingContext expressionBindingContext = resolveSession.resolveToElement(jetReference.getExpression()); JetScope scope = expressionBindingContext.get(BindingContext.RESOLUTION_SCOPE, jetReference.getExpression()); @@ -274,7 +274,7 @@ class CompletionSession { return jetResult.getBindingContext(); } - private CancelableResolveSession getResolveSession() { + private ResolveSessionForBodies getResolveSession() { return jetResult.getResolveSession(); } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionResultSet.java b/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionResultSet.java index a70f08d09f5..2a027273caf 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionResultSet.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionResultSet.java @@ -23,10 +23,10 @@ import com.intellij.openapi.util.Conditions; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.plugin.project.CancelableResolveSession; +import org.jetbrains.jet.plugin.project.ResolveSessionForBodies; public class JetCompletionResultSet { - private final CancelableResolveSession resolveSession; + private final ResolveSessionForBodies resolveSession; private final BindingContext bindingContext; private final Condition descriptorFilter; private final CompletionResultSet result; @@ -34,14 +34,14 @@ public class JetCompletionResultSet { public JetCompletionResultSet( @NotNull CompletionResultSet result, - @NotNull CancelableResolveSession resolveSession, + @NotNull ResolveSessionForBodies resolveSession, @NotNull BindingContext bindingContext) { this(result, resolveSession, bindingContext, Conditions.alwaysTrue()); } public JetCompletionResultSet( @NotNull CompletionResultSet result, - @NotNull CancelableResolveSession resolveSession, + @NotNull ResolveSessionForBodies resolveSession, @NotNull BindingContext bindingContext, @NotNull Condition descriptorFilter) { this.result = result; @@ -50,7 +50,7 @@ public class JetCompletionResultSet { this.descriptorFilter = descriptorFilter; } - public CancelableResolveSession getResolveSession() { + public ResolveSessionForBodies getResolveSession() { return resolveSession; } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java index 926c2464074..d88d0d49119 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.psi.JetPackageDirective; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.codeInsight.TipsManager; import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache; -import org.jetbrains.jet.plugin.project.CancelableResolveSession; +import org.jetbrains.jet.plugin.project.ResolveSessionForBodies; import org.jetbrains.jet.plugin.references.JetSimpleNameReference; /** @@ -71,7 +71,7 @@ public class JetPackagesContributor extends CompletionContributor { int prefixLength = parameters.getOffset() - simpleNameReference.getExpression().getTextOffset(); result = result.withPrefixMatcher(new PlainPrefixMatcher(name.substring(0, prefixLength))); - CancelableResolveSession resolveSession = AnalyzerFacadeWithCache + ResolveSessionForBodies resolveSession = AnalyzerFacadeWithCache .getLazyResolveSessionForFile((JetFile) simpleNameReference.getExpression().getContainingFile()); BindingContext bindingContext = resolveSession.resolveToElement(simpleNameReference.getExpression()); diff --git a/idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt index 427c77210b8..bce2df51b4d 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt @@ -4,7 +4,7 @@ import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.resolve.* import org.jetbrains.jet.lang.psi.* import org.jetbrains.jet.lexer.JetTokens -import org.jetbrains.jet.plugin.project.CancelableResolveSession +import org.jetbrains.jet.plugin.project.ResolveSessionForBodies import org.jetbrains.jet.lang.types.* import org.jetbrains.jet.lang.types.checker.JetTypeChecker import com.intellij.codeInsight.lookup.* @@ -38,7 +38,7 @@ trait SmartCompletionData{ val additionalElements: Iterable } -fun buildSmartCompletionData(expression: JetSimpleNameExpression, resolveSession: CancelableResolveSession): SmartCompletionData? { +fun buildSmartCompletionData(expression: JetSimpleNameExpression, resolveSession: ResolveSessionForBodies): SmartCompletionData? { val parent = expression.getParent() val expressionWithType: JetExpression; val receiver: JetExpression? @@ -102,7 +102,7 @@ fun buildSmartCompletionData(expression: JetSimpleNameExpression, resolveSession } } -private fun calcItemsToSkip(expression: JetExpression, resolveSession: CancelableResolveSession): Collection { +private fun calcItemsToSkip(expression: JetExpression, resolveSession: ResolveSessionForBodies): Collection { val parent = expression.getParent() when(parent) { is JetProperty -> { @@ -124,7 +124,7 @@ private fun calcItemsToSkip(expression: JetExpression, resolveSession: Cancelabl return listOf() } -private fun typeInstantiationItems(expectedType: JetType, resolveSession: CancelableResolveSession, bindingContext: BindingContext): Iterable { +private fun typeInstantiationItems(expectedType: JetType, resolveSession: ResolveSessionForBodies, bindingContext: BindingContext): Iterable { val typeConstructor: TypeConstructor = expectedType.getConstructor() val classifier: ClassifierDescriptor? = typeConstructor.getDeclarationDescriptor() if (!(classifier is ClassDescriptor)) return listOf() @@ -299,7 +299,7 @@ private fun processDataFlowInfo(dataFlowInfo: DataFlowInfo?, receiver: JetExpres } // adds java static members, enum members and members from class object -private fun staticMembers(context: JetExpression, expectedType: JetType, resolveSession: CancelableResolveSession, bindingContext: BindingContext): Iterable { +private fun staticMembers(context: JetExpression, expectedType: JetType, resolveSession: ResolveSessionForBodies, bindingContext: BindingContext): Iterable { val classDescriptor = TypeUtils.getClassDescriptor(expectedType) if (classDescriptor == null) return listOf() if (classDescriptor.getName().isSpecial()) return listOf() diff --git a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java index 1a024ebe3ab..3a459e720fa 100644 --- a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java @@ -45,7 +45,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.plugin.codeInsight.TipsManager; import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache; -import org.jetbrains.jet.plugin.project.CancelableResolveSession; +import org.jetbrains.jet.plugin.project.ResolveSessionForBodies; import org.jetbrains.jet.renderer.DescriptorRenderer; import java.awt.*; @@ -54,7 +54,7 @@ import java.util.List; public class JetFunctionParameterInfoHandler implements ParameterInfoHandlerWithTabActionSupport< JetValueArgumentList, - Pair, + Pair, JetValueArgument> { public final static Color GREEN_BACKGROUND = new JBColor(new Color(231, 254, 234), Gray._100); @@ -108,7 +108,7 @@ public class JetFunctionParameterInfoHandler implements ParameterInfoHandlerWith @Nullable @Override - public Object[] getParametersForDocumentation(Pair p, ParameterInfoContext context) { + public Object[] getParametersForDocumentation(Pair p, ParameterInfoContext context) { return ArrayUtil.EMPTY_OBJECT_ARRAY; //todo: ? } @@ -196,7 +196,7 @@ public class JetFunctionParameterInfoHandler implements ParameterInfoHandlerWith } @Override - public void updateUI(Pair itemToShow, ParameterInfoUIContext context) { + public void updateUI(Pair itemToShow, ParameterInfoUIContext context) { //todo: when we will have ability to pass Array as vararg, implement such feature here too? if (context == null || context.getParameterOwner() == null || !context.getParameterOwner().isValid()) { context.setUIComponentEnabled(false); @@ -212,7 +212,7 @@ public class JetFunctionParameterInfoHandler implements ParameterInfoHandlerWith JetValueArgumentList argumentList = (JetValueArgumentList) parameterOwner; FunctionDescriptor functionDescriptor = itemToShow.first; - CancelableResolveSession resolveSession = itemToShow.second; + ResolveSessionForBodies resolveSession = itemToShow.second; List valueParameters = functionDescriptor.getValueParameters(); List valueArguments = argumentList.getArguments(); @@ -378,7 +378,7 @@ public class JetFunctionParameterInfoHandler implements ParameterInfoHandlerWith return null; } - CancelableResolveSession resolveSession = + ResolveSessionForBodies resolveSession = AnalyzerFacadeWithCache.getLazyResolveSessionForFile((JetFile) callNameExpression.getContainingFile()); BindingContext bindingContext = resolveSession.resolveToElement(callNameExpression); @@ -392,7 +392,7 @@ public class JetFunctionParameterInfoHandler implements ParameterInfoHandlerWith Name refName = callNameExpression.getReferencedNameAsName(); - Collection> itemsToShow = new ArrayList>(); + Collection> itemsToShow = new ArrayList>(); for (DeclarationDescriptor variant : variants) { if (variant instanceof FunctionDescriptor) { FunctionDescriptor functionDescriptor = (FunctionDescriptor) variant; diff --git a/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java b/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java index 7fd34aac512..a5b863cd329 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java +++ b/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java @@ -81,18 +81,18 @@ public final class AnalyzerFacadeWithCache { @NotNull public static BindingContext getContextForElement(@NotNull JetElement jetElement) { - CancelableResolveSession cancelableResolveSession = getLazyResolveSessionForFile((JetFile) jetElement.getContainingFile()); - return cancelableResolveSession.resolveToElement(jetElement); + ResolveSessionForBodies resolveSessionForBodies = getLazyResolveSessionForFile((JetFile) jetElement.getContainingFile()); + return resolveSessionForBodies.resolveToElement(jetElement); } @NotNull - public static CancelableResolveSession getLazyResolveSessionForFile(@NotNull JetFile file) { + public static ResolveSessionForBodies getLazyResolveSessionForFile(@NotNull JetFile file) { Project project = file.getProject(); DeclarationsCacheProvider provider = KotlinCacheManager.getInstance(project).getRegisteredProvider(TargetPlatformDetector.getPlatform(file)); if (!provider.areDeclarationsAvailable(file)) { // There can be request for temp files (in completion) or non-source (in library) files. Create temp sessions for them. - CachedValue cachedValue; + CachedValue cachedValue; synchronized (PER_FILE_SESSION_CACHE) { cachedValue = PER_FILE_SESSION_CACHE.get(file); @@ -111,17 +111,17 @@ public final class AnalyzerFacadeWithCache { return AnalyzeExhaust.error(bindingTraceContext.getBindingContext(), e); } - private static final SLRUCache> PER_FILE_SESSION_CACHE = new SLRUCache>(2, 3) { + private static final SLRUCache> PER_FILE_SESSION_CACHE = new SLRUCache>(2, 3) { @NotNull @Override - public CachedValue createValue(final JetFile file) { + public CachedValue createValue(final JetFile file) { final Project fileProject = file.getProject(); return CachedValuesManager.getManager(fileProject).createCachedValue( // Each value monitors OUT_OF_CODE_BLOCK_MODIFICATION_COUNT and modification tracker of the stored value - new CachedValueProvider() { + new CachedValueProvider() { @Nullable @Override - public Result compute() { + public Result compute() { Project project = file.getProject(); @@ -138,7 +138,7 @@ public final class AnalyzerFacadeWithCache { } ResolveSession resolveSession = AnalyzerFacadeProvider.getAnalyzerFacadeForFile(file).getLazyResolveSession(fileProject, files); - return Result.create(new CancelableResolveSession(file, resolveSession), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT); + return Result.create(new ResolveSessionForBodies(file, resolveSession), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT); } }, true); diff --git a/idea/src/org/jetbrains/jet/plugin/project/CancelableResolveSession.java b/idea/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java similarity index 84% rename from idea/src/org/jetbrains/jet/plugin/project/CancelableResolveSession.java rename to idea/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java index 2ef2b128058..cfa7eabac86 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/CancelableResolveSession.java +++ b/idea/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java @@ -30,20 +30,20 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; -public class CancelableResolveSession implements KotlinCodeAnalyzer, ModificationTracker { +public class ResolveSessionForBodies implements KotlinCodeAnalyzer, ModificationTracker { private final Object createdForObject; private final ResolveSession resolveSession; private final ResolveElementCache resolveElementCache; - public CancelableResolveSession(@NotNull JetFile file, @NotNull ResolveSession resolveSession) { + public ResolveSessionForBodies(@NotNull JetFile file, @NotNull ResolveSession resolveSession) { this(file, file.getProject(), resolveSession); } - public CancelableResolveSession(@NotNull Project project, @NotNull ResolveSession resolveSession) { + public ResolveSessionForBodies(@NotNull Project project, @NotNull ResolveSession resolveSession) { this(project, project, resolveSession); } - private CancelableResolveSession(Object createdForObject, Project project, ResolveSession resolveSession) { + private ResolveSessionForBodies(Object createdForObject, Project project, ResolveSession resolveSession) { this.createdForObject = createdForObject; this.resolveSession = resolveSession; this.resolveElementCache = new ResolveElementCache(resolveSession, project); @@ -89,6 +89,6 @@ public class CancelableResolveSession implements KotlinCodeAnalyzer, Modificatio @Override public String toString() { - return "CancelableResolveSession: " + getModificationCount() + " " + createdForObject + " " + createdForObject.hashCode(); + return "ResolveSessionForBodies: " + getModificationCount() + " " + createdForObject + " " + createdForObject.hashCode(); } } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java index f1fb6bfb243..4823d621145 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java @@ -52,7 +52,7 @@ import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.actions.JetAddImportAction; import org.jetbrains.jet.plugin.caches.JetShortNamesCache; import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache; -import org.jetbrains.jet.plugin.project.CancelableResolveSession; +import org.jetbrains.jet.plugin.project.ResolveSessionForBodies; import org.jetbrains.jet.plugin.project.ProjectStructureUtil; import org.jetbrains.jet.plugin.util.JetPsiHeuristicsUtil; @@ -92,16 +92,16 @@ public class AutoImportFix extends JetHintAction implem return Collections.emptyList(); } - CancelableResolveSession cancelableResolveSession = + ResolveSessionForBodies resolveSessionForBodies = AnalyzerFacadeWithCache.getLazyResolveSessionForFile((JetFile) element.getContainingFile()); List result = Lists.newArrayList(); if (!isSuppressedTopLevelImportInPosition(element)) { - result.addAll(getClassNames(referenceName, (JetFile) file, cancelableResolveSession)); - result.addAll(getJetTopLevelFunctions(referenceName, element, cancelableResolveSession, file.getProject())); + result.addAll(getClassNames(referenceName, (JetFile) file, resolveSessionForBodies)); + result.addAll(getJetTopLevelFunctions(referenceName, element, resolveSessionForBodies, file.getProject())); } - result.addAll(getJetExtensionFunctions(referenceName, element, cancelableResolveSession, file.getProject())); + result.addAll(getJetExtensionFunctions(referenceName, element, resolveSessionForBodies, file.getProject())); return Collections2.filter(result, new Predicate() { @Override @@ -119,7 +119,7 @@ public class AutoImportFix extends JetHintAction implem private static Collection getJetTopLevelFunctions( @NotNull String referenceName, @NotNull JetSimpleNameExpression expression, - @NotNull CancelableResolveSession resolveSession, + @NotNull ResolveSessionForBodies resolveSession, @NotNull Project project ) { JetShortNamesCache namesCache = JetShortNamesCache.getKotlinInstance(project); @@ -139,7 +139,7 @@ public class AutoImportFix extends JetHintAction implem private static Collection getJetExtensionFunctions( @NotNull final String referenceName, @NotNull JetSimpleNameExpression expression, - @NotNull CancelableResolveSession resolveSession, + @NotNull ResolveSessionForBodies resolveSession, @NotNull Project project ) { JetShortNamesCache namesCache = JetShortNamesCache.getKotlinInstance(project); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java index 83068e30b59..48630f52e07 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.psi.JetDeclaration; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache; -import org.jetbrains.jet.plugin.project.CancelableResolveSession; +import org.jetbrains.jet.plugin.project.ResolveSessionForBodies; import java.util.*; @@ -60,7 +60,7 @@ public class MakeOverriddenMemberOpenFix extends JetIntentionAction functionsToAddParameters = Lists.newArrayList(); - CancelableResolveSession cancelableResolveSession = AnalyzerFacadeWithCache.getLazyResolveSessionForFile(containingFile); + ResolveSessionForBodies resolveSessionForBodies = AnalyzerFacadeWithCache.getLazyResolveSessionForFile(containingFile); for (JetExpression inlinedExpression : inlinedExpressions) { JetFunctionLiteralExpression functionLiteralExpression = getFunctionLiteralExpression(inlinedExpression); assert functionLiteralExpression != null : "can't find function literal expression for " + inlinedExpression.getText(); - if (needToAddParameterTypes(functionLiteralExpression, cancelableResolveSession)) { + if (needToAddParameterTypes(functionLiteralExpression, resolveSessionForBodies)) { functionsToAddParameters.add(functionLiteralExpression); } } @@ -298,10 +297,10 @@ public class KotlinInlineValHandler extends InlineActionHandler { private static boolean needToAddParameterTypes( @NotNull JetFunctionLiteralExpression functionLiteralExpression, - @NotNull CancelableResolveSession cancelableResolveSession + @NotNull ResolveSessionForBodies resolveSessionForBodies ) { JetFunctionLiteral functionLiteral = functionLiteralExpression.getFunctionLiteral(); - BindingContext context = cancelableResolveSession.resolveToElement(functionLiteralExpression); + BindingContext context = resolveSessionForBodies.resolveToElement(functionLiteralExpression); for (Diagnostic diagnostic : context.getDiagnostics()) { DiagnosticFactory factory = diagnostic.getFactory(); PsiElement element = diagnostic.getPsiElement(); @@ -319,12 +318,12 @@ public class KotlinInlineValHandler extends InlineActionHandler { JetFile containingFile = (JetFile) inlinedExpressions.get(0).getContainingFile(); List callsToAddArguments = Lists.newArrayList(); - CancelableResolveSession cancelableResolveSession = AnalyzerFacadeWithCache.getLazyResolveSessionForFile(containingFile); + ResolveSessionForBodies resolveSessionForBodies = AnalyzerFacadeWithCache.getLazyResolveSessionForFile(containingFile); for (JetExpression inlinedExpression : inlinedExpressions) { JetCallExpression callExpression = getCallExpression(inlinedExpression); assert callExpression != null : "can't find call expression for " + inlinedExpression.getText(); - if (hasIncompleteTypeInferenceDiagnostic(callExpression, cancelableResolveSession) && callExpression.getTypeArgumentList() == null) { + if (hasIncompleteTypeInferenceDiagnostic(callExpression, resolveSessionForBodies) && callExpression.getTypeArgumentList() == null) { callsToAddArguments.add(callExpression); } } @@ -366,10 +365,10 @@ public class KotlinInlineValHandler extends InlineActionHandler { private static boolean hasIncompleteTypeInferenceDiagnostic( @NotNull JetCallExpression callExpression, - @NotNull CancelableResolveSession cancelableResolveSession + @NotNull ResolveSessionForBodies resolveSessionForBodies ) { JetExpression callee = callExpression.getCalleeExpression(); - BindingContext context = cancelableResolveSession.resolveToElement(callExpression); + BindingContext context = resolveSessionForBodies.resolveToElement(callExpression); for (Diagnostic diagnostic : context.getDiagnostics()) { if (diagnostic.getFactory() == Errors.TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER && diagnostic.getPsiElement() == callee) { return true; diff --git a/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java b/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java index 16974bb81e1..1dd040074fa 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java +++ b/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java @@ -22,15 +22,9 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetPsiFactory; import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; -import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.jet.plugin.codeInsight.TipsManager; -import org.jetbrains.jet.plugin.completion.DescriptorLookupConverter; -import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache; -import org.jetbrains.jet.plugin.project.CancelableResolveSession; public class JetSimpleNameReference extends JetPsiReference { diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java index bb5971c52d1..83ba4b44d27 100644 --- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetValueArgumentList; import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.plugin.PluginTestCaseBase; -import org.jetbrains.jet.plugin.project.CancelableResolveSession; +import org.jetbrains.jet.plugin.project.ResolveSessionForBodies; public class JetFunctionParameterInfoTest extends LightCodeInsightFixtureTestCase { public void testInheritedFunctions() { @@ -120,7 +120,7 @@ public class JetFunctionParameterInfoTest extends LightCodeInsightFixtureTestCas for (Object item : mockCreateParameterInfoContext.getItemsToShow()) { //noinspection unchecked - parameterInfoHandler.updateUI((Pair)item, parameterInfoUIContext); + parameterInfoHandler.updateUI((Pair)item, parameterInfoUIContext); } assertEquals(expectedResultText, parameterInfoUIContext.getResultText()); }