Resolution: Resolve primary constructor references to primary constructor

itself if it's explicitly present in PSI

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinClsFileBase.kt

@@ -21,11 +21,13 @@ import com.intellij.psi.FileViewProvider
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
+import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledText
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.descriptorToKey
 import org.jetbrains.kotlin.psi.JetCallableDeclaration
+import org.jetbrains.kotlin.psi.JetClassOrObject
 import org.jetbrains.kotlin.psi.JetDeclaration
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.utils.concurrent.block.LockedClearableLazyValue
@@ -42,6 +44,11 @@ public abstract class KotlinClsFileBase(provider: FileViewProvider) : JetFile(pr
             return callableDeclaration.getValueParameters()[original.getIndex()]
         }
 
+        if (original is ConstructorDescriptor && original.isPrimary()) {
+            val classOrObject = getDeclarationForDescriptor(original.getContainingDeclaration()) as? JetClassOrObject
+            return classOrObject?.getPrimaryConstructor() ?: classOrObject
+        }
+
         val key = descriptorToKey(original)
 
         val range = decompiledText.get().renderedDescriptorsToRange[key]

idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocFinder.kt

@@ -21,13 +21,19 @@ import org.jetbrains.kotlin.kdoc.parser.KDocKnownTag
 import org.jetbrains.kotlin.kdoc.psi.api.KDoc
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocTag
 import org.jetbrains.kotlin.psi.JetDeclaration
+import org.jetbrains.kotlin.psi.JetPrimaryConstructor
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 import org.jetbrains.kotlin.resolve.source.PsiSourceElement
 
 object KDocFinder {
     fun findKDoc(declaration: DeclarationDescriptor): KDocTag? {
         if (declaration is DeclarationDescriptorWithSource) {
-            val psiDeclaration = (declaration.getSource() as? PsiSourceElement)?.psi?.getNavigationElement()
+            var psiDeclaration = (declaration.getSource() as? PsiSourceElement)?.psi?.getNavigationElement()
+            // KDoc for primary constructor is located inside of its class KDoc
+            if (psiDeclaration is JetPrimaryConstructor) {
+                psiDeclaration = psiDeclaration.getClassOrObject()
+            }
+
             if (psiDeclaration is JetDeclaration) {
                 val kdoc = psiDeclaration.getDocComment()
                 if (kdoc != null) {

idea/testData/refactoring/extractFunction/basic/localClassExtraction.kt.conflicts

@@ -1 +1 @@
-Following declarations are used outside of selected code fragment:  local final class A value-parameter val n: Int = ...
+Following declarations are used outside of selected code fragment:  public constructor A(n: Int = ...) value-parameter val n: Int = ...

idea/testData/resolve/references/AnnotationOnFile.kt

@@ -2,4 +2,4 @@
 
 package foo
 
-// REF: (kotlin).deprecated
+// REF: (in kotlin.deprecated).deprecated(kotlin.String,kotlin.ReplaceWith)

idea/testData/resolve/references/AnnotationOnFileWithImport.kt

@@ -4,4 +4,4 @@ package foo
 
 import kotlin.deprecated as D
 
-// REF: (kotlin).deprecated
+// REF: (in kotlin.deprecated).deprecated(kotlin.String,kotlin.ReplaceWith)

idea/testData/resolve/references/CtrlClickResolve.kt

@@ -7,4 +7,4 @@ fun main(args : Array<String>) {
     var a = <caret>IntArray(array(1, 2, 3))
 }
 
-// REF: (kotlin).IntArray
+// REF: (in kotlin.IntArray).IntArray(Int)

idea/testData/resolve/references/FakeJavaLang1.kt

@@ -4,4 +4,4 @@ fun foo() {
     <caret>Fake()
 }
 
-//REF: (java.lang).Fake
+//REF: (in java.lang.Fake).Fake()

idea/testData/resolve/references/FakeJavaLang3.kt

@@ -5,4 +5,4 @@ fun foo() {
     <caret>Fake()
 }
 
-//REF: (java.lang).Fake
+//REF: (in java.lang.Fake).Fake()