Completion for fqNames in KDoc links

Tests, also proved that KT-14432 are fixed Added completion and tests for extension functions.
2016-11-10 17:52:42 +03:00
parent 62077dafc3
commit 1a211ee7b0
9 changed files with 196 additions and 15 deletions
@@ -53,11 +53,16 @@ fun resolveKDocLink(context: BindingContext,
        val descriptorsByName = scope.collectDescriptorsFiltered(nameFilter = { it.asString() == shortName })
        // Try to find a matching local descriptor (parameter or type parameter) first.
        val localDescriptors = descriptorsByName.filter { it.containingDeclaration == fromDescriptor }
+
        if (localDescriptors.isNotEmpty()) return localDescriptors
-        if (descriptorsByName.isNotEmpty()) return descriptorsByName

        val moduleDescriptor = fromDescriptor.module
-        return moduleDescriptor.getSubPackagesOf(FqName.ROOT, { it.asString() == shortName }).map { moduleDescriptor.getPackage(it) }
+
+        val packagesByName = moduleDescriptor.getSubPackagesOf(FqName.ROOT, { true })
+                .filter { it.asString() == shortName }
+                .map { moduleDescriptor.getPackage(it) }
+
+        return descriptorsByName + packagesByName
    }

    val moduleDescriptor = fromDescriptor.module