Fix InnerClassesScopeWrapper - remove properties and functions from this scope.

2015-08-26 22:13:41 +03:00
parent 49b294b8b4
commit 9a435e332f
11 changed files with 110 additions and 19 deletions
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.util
+
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
+import org.jetbrains.kotlin.descriptors.VariableDescriptor
+import org.jetbrains.kotlin.incremental.components.NoLookupLocation
+import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.resolve.scopes.JetScope
+
+
+public fun JetScope.getAllAccessibleVariables(name: Name): Collection<VariableDescriptor>
+        = getVariablesFromImplicitReceivers(name) + getProperties(name, NoLookupLocation.FROM_IDE) + listOfNotNull(getLocalVariable(name))
+
+public fun JetScope.getAllAccessibleFunctions(name: Name): Collection<FunctionDescriptor>
+        = getImplicitReceiversWithInstance().flatMap { it.type.memberScope.getFunctions(name, NoLookupLocation.FROM_IDE) } +
+          getFunctions(name, NoLookupLocation.FROM_IDE)
+
+public fun JetScope.getVariablesFromImplicitReceivers(name: Name): Collection<VariableDescriptor> = getImplicitReceiversWithInstance().flatMap {
+    it.type.memberScope.getProperties(name, NoLookupLocation.FROM_IDE)
+}
+
+public fun JetScope.getVariableFromImplicitReceivers(name: Name): VariableDescriptor? {
+    getImplicitReceiversWithInstance().forEach {
+        it.type.memberScope.getProperties(name, NoLookupLocation.FROM_IDE).singleOrNull()?.let { return it }
+    }
+    return null
+}