From 0dd77a8ed350a266a187ef1ab9df0d9e92a188ac Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Fri, 21 Nov 2014 11:52:22 +0300 Subject: [PATCH] Renames - dropped word "Service" --- .../jet/lang/resolve/lazy/ElementResolver.java | 6 +++--- .../jet/lang/resolve/lazy/PartialBodyResolveFilter.kt | 6 +++--- ...NamesService.kt => ProbablyNothingCallableNames.kt} | 4 ++-- .../jet/plugin/project/ResolveElementCache.java | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) rename idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/{ProbablyNothingCallableNamesService.kt => ProbablyNothingCallableNames.kt} (86%) diff --git a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java index 0cfa07a3f62..3e04d107a8b 100644 --- a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java +++ b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java @@ -70,8 +70,8 @@ public abstract class ElementResolver { } @NotNull - protected ProbablyNothingCallableNamesService probablyNothingCallableNamesService() { - return DefaultNothingCallableNamesService.INSTANCE$; + protected ProbablyNothingCallableNames probablyNothingCallableNames() { + return DefaultNothingCallableNames.INSTANCE$; } @NotNull @@ -101,7 +101,7 @@ public abstract class ElementResolver { boolean inBody = body != null && PsiTreeUtil.isAncestor(body, jetElement, false); Function1 filter; if (inBody) { - filter = new PartialBodyResolveFilter(jetElement, body, probablyNothingCallableNamesService()); + filter = new PartialBodyResolveFilter(jetElement, body, probablyNothingCallableNames()); } else { // do as less as possible body-resolve filter = new Function1() { diff --git a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt index ff6f344380a..38fb90165fe 100644 --- a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt +++ b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt @@ -34,13 +34,13 @@ import org.jetbrains.jet.utils.addToStdlib.firstOrNullIsInstance class PartialBodyResolveFilter( elementToResolve: JetElement, private val body: JetExpression, - probablyNothingCallableNamesService: ProbablyNothingCallableNamesService + probablyNothingCallableNames: ProbablyNothingCallableNames ) : (JetElement) -> Boolean { private val statementTree = StatementTree() - private val nothingFunctionNames = HashSet(probablyNothingCallableNamesService.functionNames()) - private val nothingPropertyNames = probablyNothingCallableNamesService.propertyNames() + private val nothingFunctionNames = HashSet(probablyNothingCallableNames.functionNames()) + private val nothingPropertyNames = probablyNothingCallableNames.propertyNames() ;{ assert(body.isAncestor(elementToResolve, strict = false)) diff --git a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ProbablyNothingCallableNamesService.kt b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ProbablyNothingCallableNames.kt similarity index 86% rename from idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ProbablyNothingCallableNamesService.kt rename to idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ProbablyNothingCallableNames.kt index 564cd82dd6d..b7443773249 100644 --- a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ProbablyNothingCallableNamesService.kt +++ b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ProbablyNothingCallableNames.kt @@ -16,12 +16,12 @@ package org.jetbrains.jet.lang.resolve.lazy -public trait ProbablyNothingCallableNamesService { +public trait ProbablyNothingCallableNames { public fun functionNames(): Set public fun propertyNames(): Set } -public object DefaultNothingCallableNamesService : ProbablyNothingCallableNamesService { +public object DefaultNothingCallableNames : ProbablyNothingCallableNames { private val hardcodedNames = setOf("error") override fun functionNames() = hardcodedNames diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java index 601add33fdc..f7a46137055 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java @@ -28,9 +28,9 @@ import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.lazy.DefaultNothingCallableNamesService; +import org.jetbrains.jet.lang.resolve.lazy.DefaultNothingCallableNames; import org.jetbrains.jet.lang.resolve.lazy.ElementResolver; -import org.jetbrains.jet.lang.resolve.lazy.ProbablyNothingCallableNamesService; +import org.jetbrains.jet.lang.resolve.lazy.ProbablyNothingCallableNames; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.plugin.stubindex.JetProbablyNothingFunctionShortNameIndex; import org.jetbrains.jet.plugin.stubindex.JetProbablyNothingPropertyShortNameIndex; @@ -87,13 +87,13 @@ public class ResolveElementCache extends ElementResolver { @NotNull @Override - protected ProbablyNothingCallableNamesService probablyNothingCallableNamesService() { - return new ProbablyNothingCallableNamesService() { + protected ProbablyNothingCallableNames probablyNothingCallableNames() { + return new ProbablyNothingCallableNames() { @NotNull @Override public Set functionNames() { // we have to add hardcoded-names until we have Kotlin compiled classes in caches - Set hardcodedNames = DefaultNothingCallableNamesService.INSTANCE$.functionNames(); + Set hardcodedNames = DefaultNothingCallableNames.INSTANCE$.functionNames(); Collection indexedNames = JetProbablyNothingFunctionShortNameIndex.getInstance().getAllKeys(project); Set set = new HashSet(hardcodedNames.size() + indexedNames.size()); set.addAll(hardcodedNames);