diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt index 2802136343e..1f5d0955262 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt @@ -48,6 +48,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.renderer.ClassifierNamePolicy import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.deprecatedByAnnotationReplaceWithExpression import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe import org.jetbrains.kotlin.resolve.getDeprecations @@ -163,7 +164,9 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() { } } - var renderedDecl = DESCRIPTOR_RENDERER.render(declarationDescriptor) + var renderedDecl = DESCRIPTOR_RENDERER.withOptions { + withDefinedIn = !DescriptorUtils.isLocal(declarationDescriptor) + }.render(declarationDescriptor) if (!quickNavigation) { renderedDecl = "
$renderedDecl
" diff --git a/idea/testData/editor/quickDoc/AtFunctionParameter.kt b/idea/testData/editor/quickDoc/AtFunctionParameter.kt index 1f21b8f1ebc..2c63d9afe0a 100644 --- a/idea/testData/editor/quickDoc/AtFunctionParameter.kt +++ b/idea/testData/editor/quickDoc/AtFunctionParameter.kt @@ -1,3 +1,3 @@ fun some(f: (Int) -> String) : String? = null -//INFO:
value-parameter f: (Int) → String defined in some
+//INFO:
value-parameter f: (Int) → String
diff --git a/idea/testData/editor/quickDoc/AtImplicitLambdaParameter.kt b/idea/testData/editor/quickDoc/AtImplicitLambdaParameter.kt index 3f54784a958..a2116c0cda2 100644 --- a/idea/testData/editor/quickDoc/AtImplicitLambdaParameter.kt +++ b/idea/testData/editor/quickDoc/AtImplicitLambdaParameter.kt @@ -4,4 +4,4 @@ fun foo() { } } -//INFO:
value-parameter it: Int defined in foo.<anonymous>
+//INFO:
value-parameter it: Int
diff --git a/idea/testData/editor/quickDoc/AtLocalFunction.kt b/idea/testData/editor/quickDoc/AtLocalFunction.kt new file mode 100644 index 00000000000..63bb7dce809 --- /dev/null +++ b/idea/testData/editor/quickDoc/AtLocalFunction.kt @@ -0,0 +1,9 @@ +fun context() { + fun local() { + + } + + local() +} + +//INFO:
local final fun local(): Unit
diff --git a/idea/testData/editor/quickDoc/AtVariableDeclaration.kt b/idea/testData/editor/quickDoc/AtVariableDeclaration.kt index 0afad3aaad1..61e7d6aae90 100644 --- a/idea/testData/editor/quickDoc/AtVariableDeclaration.kt +++ b/idea/testData/editor/quickDoc/AtVariableDeclaration.kt @@ -5,4 +5,4 @@ fun test() { } -//INFO:
val test: String? defined in test
+//INFO:
val test: String?
diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocProviderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocProviderTestGenerated.java index b17268c4727..c8c6bbb17fd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocProviderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocProviderTestGenerated.java @@ -54,6 +54,12 @@ public class QuickDocProviderTestGenerated extends AbstractQuickDocProviderTest doTest(fileName); } + @TestMetadata("AtLocalFunction.kt") + public void testAtLocalFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtLocalFunction.kt"); + doTest(fileName); + } + @TestMetadata("AtTypeParameter.kt") public void testAtTypeParameter() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtTypeParameter.kt");