From f61c7a4f602d571c19eefb469f28625f10e09e91 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 4 Jun 2024 15:02:31 +0200 Subject: [PATCH] [kotlin] quick doc: include references on builtins ^KTIJ-30157 fixed GitOrigin-RevId: 03dcc246a778c7276fb94937b34e09beefa9a19d --- .../quickDoc/KotlinIdeDeclarationRenderer.kt | 15 +++++------- .../idea/KotlinDocumentationProvider.kt | 2 -- .../kotlin/idea/kdoc/kdocBoringClassifiers.kt | 24 ------------------- .../quickDoc/AbstractCallableInClass.kt | 5 ++-- .../quickDoc/AbstractCallableInInterface.kt | 2 +- .../quickDoc/AtConstantWithUnderscore.kt | 2 +- .../editor/quickDoc/AtFunctionParameter.kt | 2 +- .../quickDoc/AtImplicitLambdaParametEnd.kt | 2 +- .../quickDoc/AtImplicitLambdaParameter.kt | 2 +- .../editor/quickDoc/AtLocalFunction.kt | 2 +- .../editor/quickDoc/AtVariableDeclaration.kt | 2 +- .../quickDoc/ConstructorVarParameter.kt | 2 +- .../testData/editor/quickDoc/DataClass.kt | 9 +++---- .../editor/quickDoc/DataClassOnConstructor.kt | 9 +++---- .../editor/quickDoc/DefinitelyNonNullType.kt | 4 ++-- .../quickDoc/DeprecationWithReplaceInfo.kt | 9 +++---- .../editor/quickDoc/ExtensionReceiver.kt | 5 ++-- .../editor/quickDoc/ExtensionReceiverEnd.kt | 5 ++-- .../testData/editor/quickDoc/Formatting.kt | 2 +- .../testData/editor/quickDoc/FromStdlib.kt | 2 +- .../editor/quickDoc/FunctionTypeParameter.kt | 5 ++-- .../quickDoc/JavaDocFromOverridenClass.kt | 2 +- .../quickDoc/JavaDocFromOverridenInterface.kt | 2 +- .../editor/quickDoc/JvmFieldAnnotation.kt | 5 ++-- .../testData/editor/quickDoc/LateinitName.kt | 2 +- .../editor/quickDoc/MethodFromStdLib.kt | 2 +- .../OnActualValueParameterDeclaration.kt | 2 +- .../quickDoc/OnEmptySecondaryConstructor.kt | 2 +- .../editor/quickDoc/OnEnumValueOfFunction.kt | 2 +- .../editor/quickDoc/OnEnumValuesFunction.kt | 2 +- .../OnFunctionDeclarationWithGFMTable.kt | 2 +- .../OnFunctionDeclarationWithPackage.kt | 6 ++--- .../editor/quickDoc/OnInheritedMethodUsage.kt | 2 +- .../quickDoc/OnInheritedPropertyUsage.kt | 2 +- .../testData/editor/quickDoc/OnMethodUsage.kt | 6 ++--- .../editor/quickDoc/OnMethodUsageInParen.kt | 6 ++--- .../editor/quickDoc/OnMethodUsageMultiline.kt | 2 +- .../OnMethodUsageWithBracketsInParam.kt | 6 ++--- .../quickDoc/OnMethodUsageWithCodeBlock.kt | 2 +- .../quickDoc/OnMethodUsageWithMarkdown.kt | 2 +- .../OnMethodUsageWithMultilineParam.kt | 4 ++-- .../quickDoc/OnMethodUsageWithReceiver.kt | 6 ++--- .../OnMethodUsageWithReturnAndLink.kt | 6 ++--- .../OnMethodUsageWithReturnAndThrows.kt | 6 ++--- .../editor/quickDoc/OnMethodUsageWithSee.kt | 2 +- .../OnMethodUsageWithTypeParameter.kt | 6 ++--- ...yConstructorAnnotatedWithConstructorTag.kt | 4 ++-- ...nPropertyUsageDocumentedWithPropertyTag.kt | 2 +- .../quickDoc/PropertiesInConstructor.kt | 4 ++-- .../tests/testData/editor/quickDoc/Samples.kt | 4 ++-- .../editor/quickDoc/TailrecFunction.kt | 4 ++-- .../testData/editor/quickDoc/TailrecName.kt | 2 +- .../quickDoc/TopLevelMethodFromJava.java | 4 ++-- .../quickDoc/TypeNamesFromStdLibNavigation.kt | 4 ++-- .../quickDoc/TypeParameterConstraints.kt | 4 ++-- .../OnActualValueParameterDeclaration.kt | 2 +- .../renderAnnotatedExtensionFunctionType.kt | 9 +++---- .../multiModuleResolve/fqName/code/usage.kt | 2 +- .../multiModuleResolve/simple/code/usage.kt | 2 +- .../code/usageNestedTypeParameters.kt | 2 +- .../code/usageSingleTypeParameter.kt | 2 +- 61 files changed, 115 insertions(+), 135 deletions(-) delete mode 100644 plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/kdoc/kdocBoringClassifiers.kt diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinIdeDeclarationRenderer.kt b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinIdeDeclarationRenderer.kt index ae3aca7015aa..7efa219c889a 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinIdeDeclarationRenderer.kt +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinIdeDeclarationRenderer.kt @@ -71,7 +71,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithVisibility import org.jetbrains.kotlin.analysis.api.types.* import org.jetbrains.kotlin.analysis.utils.printer.PrettyPrinter import org.jetbrains.kotlin.analysis.utils.printer.prettyPrint -import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.idea.base.analysis.api.utils.defaultValue @@ -445,15 +444,13 @@ internal class KotlinIdeDeclarationRenderer( else -> FqName.topLevel(name) } - val text = if (qName.parent() == FqName.topLevel(StandardNames.BUILT_INS_PACKAGE_NAME)) name.renderName() else { - val pathSegments = qName.pathSegments() - val qualifiedName = pathSegments.take(pathSegments.indexOf(name) + 1).joinToString(".") - val buffer = StringBuilder() - DocumentationManagerUtil.createHyperlink(buffer, qualifiedName, name.renderName(), true, false) - buffer.toString() - } - printer.append(highlight(text) { if (owner is KtTypeParameterType) asTypeParameterName else asClassName }) + val pathSegments = qName.pathSegments() + val qualifiedName = pathSegments.take(pathSegments.indexOf(name) + 1).joinToString(".") + val buffer = StringBuilder() + DocumentationManagerUtil.createHyperlink(buffer, qualifiedName, name.renderName(), true, false) + + printer.append(highlight(buffer.toString()) { if (owner is KtTypeParameterType) asTypeParameterName else asClassName }) } } } diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProvider.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProvider.kt index 900a6e566da5..aac8e63a2567 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProvider.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProvider.kt @@ -105,8 +105,6 @@ class HtmlClassifierNamePolicy(val base: ClassifierNamePolicy) : ClassifierNameP val name = base.renderClassifier(classifier, renderer) + (type?.takeIf { it.isDefinitelyNotNullType }?.let { " & Any" } ?: "") - if (classifier.isBoringBuiltinClass()) - return name return buildString { val ref = classifier.fqNameUnsafe.toString() DocumentationManagerUtil.createHyperlink(this, ref, name, true, false) diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/kdoc/kdocBoringClassifiers.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/kdoc/kdocBoringClassifiers.kt deleted file mode 100644 index d5a50982f035..000000000000 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/kdoc/kdocBoringClassifiers.kt +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -package org.jetbrains.kotlin.idea.kdoc - -import org.jetbrains.kotlin.builtins.StandardNames.FqNames -import org.jetbrains.kotlin.descriptors.ClassifierDescriptor -import org.jetbrains.kotlin.resolve.DescriptorUtils - -private val boringBuiltinClasses = setOf( - FqNames.unit, - FqNames._byte, - FqNames._short, - FqNames._int, - FqNames._long, - FqNames._char, - FqNames._boolean, - FqNames._float, - FqNames._double, - FqNames.string, - FqNames.array, - FqNames.any -) - -fun ClassifierDescriptor.isBoringBuiltinClass(): Boolean = DescriptorUtils.getFqName(this) in boringBuiltinClasses diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AbstractCallableInClass.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AbstractCallableInClass.kt index 3b246545ffd5..30e18e95b9af 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AbstractCallableInClass.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AbstractCallableInClass.kt @@ -2,5 +2,6 @@ abstract class Foo { abstract fun bar() } -//K2_INFO: 
public abstract fun bar(): Unit
 Foo
-//INFO: 
public abstract fun bar(): Unit

 Foo
+//K2_INFO: 
public abstract fun bar(): Unit
 Foo
+ +//INFO: 
public abstract fun bar(): Unit

 Foo
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AbstractCallableInInterface.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AbstractCallableInInterface.kt index e4c97e659f80..94ec2745732a 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AbstractCallableInInterface.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AbstractCallableInInterface.kt @@ -2,4 +2,4 @@ interface Foo { val bar: String } -//INFO: 
public abstract val bar: String
 Foo
+//INFO: 
public abstract val bar: String
 Foo
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtConstantWithUnderscore.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtConstantWithUnderscore.kt index 902343b272ed..0cc3bc7a0e6d 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtConstantWithUnderscore.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtConstantWithUnderscore.kt @@ -9,4 +9,4 @@ class C { } } -//INFO: 
public final fun foo(): Unit

Use SOME_REFERENCED_VAL to do something

 C
+//INFO: 
public final fun foo(): Unit

Use SOME_REFERENCED_VAL to do something

 C
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtFunctionParameter.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtFunctionParameter.kt index cf4e21aadb75..6cf1d6a8c837 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtFunctionParameter.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtFunctionParameter.kt @@ -3,4 +3,4 @@ */ fun some(f: (Int) -> String) : String? = null -//INFO: 
value-parameter f: (Int) -> String

docs for param f

+//INFO: 
value-parameter f: (Int) -> String

docs for param f

diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtImplicitLambdaParametEnd.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtImplicitLambdaParametEnd.kt index e4a490b89d9f..e8ad3acf2483 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtImplicitLambdaParametEnd.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtImplicitLambdaParametEnd.kt @@ -4,4 +4,4 @@ fun foo() { } } -//INFO: 
value-parameter it: Int
+//INFO: 
value-parameter it: Int
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtImplicitLambdaParameter.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtImplicitLambdaParameter.kt index 2f347b57d8f0..7390c55ebfd3 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtImplicitLambdaParameter.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtImplicitLambdaParameter.kt @@ -4,4 +4,4 @@ fun foo() { } } -//INFO: 
value-parameter it: Int
+//INFO: 
value-parameter it: Int
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtLocalFunction.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtLocalFunction.kt index 23974666bd11..bb3d258207c7 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtLocalFunction.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtLocalFunction.kt @@ -6,4 +6,4 @@ fun context() { local() } -//INFO: 
local final fun local(): Unit
+//INFO: 
local final fun local(): Unit
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtVariableDeclaration.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtVariableDeclaration.kt index 0cd26f878379..7a886958374b 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtVariableDeclaration.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/AtVariableDeclaration.kt @@ -5,4 +5,4 @@ fun test() { } -//INFO: 
val test: String?
+//INFO: 
val test: String?
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/ConstructorVarParameter.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/ConstructorVarParameter.kt index 97c9216d8742..aa45dd6b23cf 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/ConstructorVarParameter.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/ConstructorVarParameter.kt @@ -4,4 +4,4 @@ class C(var v: Int) { } } -//INFO: 
public final var v: Int
+//INFO: 
public final var v: Int
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/DataClass.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/DataClass.kt index 52dd0b2642b2..1d5d3e03f801 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/DataClass.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/DataClass.kt @@ -1,12 +1,13 @@ data class DataClass(val i: Int, val s: String) //K2_INFO: 
public final data class DataClass(
-//K2_INFO:     public final val i: Int,
-//K2_INFO:     public final val s: String
+//K2_INFO:     public final val i: Int,
+//K2_INFO:     public final val s: String
 //K2_INFO: )
 DataClass.kt
+ //INFO: 
public final data class DataClass(
-//INFO:     val i: Int,
-//INFO:     val s: String
+//INFO:     val i: Int,
+//INFO:     val s: String
 //INFO: )
 DataClass.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/DataClassOnConstructor.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/DataClassOnConstructor.kt index d4bc55a1c1b9..ebf8fe4ac2d3 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/DataClassOnConstructor.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/DataClassOnConstructor.kt @@ -1,11 +1,12 @@ data class DataClass(val i: Int, val s: String) //K2_INFO: 
public constructor DataClass(
-//K2_INFO:     public final val i: Int,
-//K2_INFO:     public final val s: String
+//K2_INFO:     public final val i: Int,
+//K2_INFO:     public final val s: String
 //K2_INFO: )
 DataClass
+ //INFO: 
public constructor DataClass(
-//INFO:     val i: Int,
-//INFO:     val s: String
+//INFO:     val i: Int,
+//INFO:     val s: String
 //INFO: )

 DataClass
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/DefinitelyNonNullType.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/DefinitelyNonNullType.kt index be8b06e56491..af2ff4ddb3da 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/DefinitelyNonNullType.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/DefinitelyNonNullType.kt @@ -6,8 +6,8 @@ fun someFun() { //K2_INFO: 
public fun <T> elvisLike(
 //K2_INFO:     x: T,
-//K2_INFO:     y: T & Any
-//K2_INFO: ): T & Any
 DefinitelyNonNullType.kt
+//K2_INFO: y: T & Any +//K2_INFO: ): T & Any
 DefinitelyNonNullType.kt
//INFO: 
public fun <T> elvisLike(
 //INFO:     x: T,
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/DeprecationWithReplaceInfo.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/DeprecationWithReplaceInfo.kt
index 605a52ba6fb7..e56f9d3635c2 100644
--- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/DeprecationWithReplaceInfo.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/DeprecationWithReplaceInfo.kt
@@ -3,8 +3,9 @@ fun lol() {
     println("lol")
 }
 
-//INFO: 
@Deprecated(message = "lol no more mainstream", replaceWith = @ReplaceWith(expression = "kek()", imports = {}))
-//INFO: public fun lol(): Unit
Deprecated:
lol no more mainstream
Replace with:
kek()

 DeprecationWithReplaceInfo.kt
- //K2_INFO: 
@Deprecated(message = "lol no more mainstream", replaceWith = @ReplaceWith(expression = "kek()"))
-//K2_INFO: public fun lol(): Unit
 DeprecationWithReplaceInfo.kt
\ No newline at end of file +//K2_INFO: public fun lol(): Unit
 DeprecationWithReplaceInfo.kt
+ + +//INFO: 
@Deprecated(message = "lol no more mainstream", replaceWith = @ReplaceWith(expression = "kek()", imports = {}))
+//INFO: public fun lol(): Unit

Deprecated:

lol no more mainstream

Replace with:

kek()

 DeprecationWithReplaceInfo.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/ExtensionReceiver.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/ExtensionReceiver.kt index 7e5200120d7c..db29000eb6af 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/ExtensionReceiver.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/ExtensionReceiver.kt @@ -7,5 +7,6 @@ fun Foo.bar() { foo(this) } -//K2_INFO: 
public fun Foo.bar(): Unit
 ExtensionReceiver.kt
-//INFO: 
public fun Foo.bar(): Unit

 ExtensionReceiver.kt
+//K2_INFO: 
public fun Foo.bar(): Unit
 ExtensionReceiver.kt
+ +//INFO: 
public fun Foo.bar(): Unit

 ExtensionReceiver.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/ExtensionReceiverEnd.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/ExtensionReceiverEnd.kt index 2e7799200b50..593158eb31be 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/ExtensionReceiverEnd.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/ExtensionReceiverEnd.kt @@ -7,5 +7,6 @@ fun Foo.bar() { foo(this) } -//K2_INFO: 
public fun Foo.bar(): Unit
 ExtensionReceiverEnd.kt
-//INFO: 
public fun Foo.bar(): Unit

 ExtensionReceiverEnd.kt
+//K2_INFO: 
public fun Foo.bar(): Unit
 ExtensionReceiverEnd.kt
+ +//INFO: 
public fun Foo.bar(): Unit

 ExtensionReceiverEnd.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/Formatting.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/Formatting.kt index 3e4e01197502..4c59a70009f2 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/Formatting.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/Formatting.kt @@ -6,6 +6,6 @@ */ fun test() {} -//INFO: 
public fun test(): Unit

foo bar baz

+//INFO: 
public fun test(): Unit

foo bar baz

//INFO:

quote line another quote line

//INFO:
 Formatting.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/FromStdlib.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/FromStdlib.kt index cf8b3baffe83..d05808c58738 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/FromStdlib.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/FromStdlib.kt @@ -3,4 +3,4 @@ class Foo { override fun toString() = "dummy" } -//INFO: 
public open fun toString(): String

Returns a string representation of the object.

 Foo
+//INFO: 
public open fun toString(): String

Returns a string representation of the object.

 Foo
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/FunctionTypeParameter.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/FunctionTypeParameter.kt index 226ad75ad951..3b097f2cfc04 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/FunctionTypeParameter.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/FunctionTypeParameter.kt @@ -1,4 +1,5 @@ fun test(lambda: (a: Int) -> String) {} -//K2_INFO: 
a: Int
-//INFO: 
val a: Int
+//K2_INFO: 
a: Int
+ +//INFO: 
val a: Int
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/JavaDocFromOverridenClass.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/JavaDocFromOverridenClass.kt index f71f1a34cb30..e03aa34141b6 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/JavaDocFromOverridenClass.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/JavaDocFromOverridenClass.kt @@ -4,6 +4,6 @@ class A : OverrideMe() { } -//INFO: 
protected open fun overrideMe(): Unit

From class:

OverrideMe
+//INFO: 

protected open fun overrideMe(): Unit

From class:

OverrideMe
//INFO: Some comment //INFO:

Overrides:

overrideMe in class OverrideMe

 A
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt index 14ea312a1239..9a868a09e586 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt @@ -4,6 +4,6 @@ class A : OverrideMe { } -//INFO: 
public open fun overrideMe(): Unit

From interface:

OverrideMe
+//INFO: 

public open fun overrideMe(): Unit

From interface:

OverrideMe
//INFO: Some comment //INFO:

Specified by:

overrideMe in interface OverrideMe

 A
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/JvmFieldAnnotation.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/JvmFieldAnnotation.kt index a52b2b458ac3..edf2ea445e0f 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/JvmFieldAnnotation.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/JvmFieldAnnotation.kt @@ -7,7 +7,8 @@ class JvmFieldContainerContainer { //K2_INFO: 
@Anno
 //K2_INFO: @field:JvmField
-//K2_INFO: public final val jvmField: Int
 JvmFieldContainerContainer.Companion
+//K2_INFO: public final val jvmField: Int
 JvmFieldContainerContainer.Companion
+ //INFO: 
@Anno
-//INFO: @field:JvmField public final val jvmField: Int
 JvmFieldContainerContainer.Companion
+//INFO: @field:JvmField public final val jvmField: Int
 JvmFieldContainerContainer.Companion
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/LateinitName.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/LateinitName.kt index 1c127247d68c..53aca8dfa746 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/LateinitName.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/LateinitName.kt @@ -2,4 +2,4 @@ class Foo { val lateinit: String = "" } -//INFO: 
public final val lateinit: String
 Foo
+//INFO: 
public final val lateinit: String
 Foo
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/MethodFromStdLib.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/MethodFromStdLib.kt index 5a00163b1d40..42c22f9a889b 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/MethodFromStdLib.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/MethodFromStdLib.kt @@ -3,5 +3,5 @@ fun test() { } //INFO: 
public inline fun <T> Iterable<T>.filter(
-//INFO:     predicate: (T) -> Boolean
+//INFO:     predicate: (T) -> Boolean
 //INFO: ): List<T>

Returns a list containing only elements matching the given predicate.

Samples:

samples.collections.Collections.Filtering.filter

// Unresolved
 kotlin.collections
 _Collections.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnActualValueParameterDeclaration.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnActualValueParameterDeclaration.kt index 198316f5899c..dc8b2a84ea01 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnActualValueParameterDeclaration.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnActualValueParameterDeclaration.kt @@ -8,4 +8,4 @@ expect fun foo(param: String) actual fun foo(param: String) {} // IGNORE_K2 -//INFO: 
value-parameter param: String

doc for expected param of function foo

+//INFO: 
value-parameter param: String

doc for expected param of function foo

diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnEmptySecondaryConstructor.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnEmptySecondaryConstructor.kt index df2d5113b813..bc72b6ea1aed 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnEmptySecondaryConstructor.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnEmptySecondaryConstructor.kt @@ -13,5 +13,5 @@ fun test() { val f = Foo(10) } //INFO: 
public constructor Foo(
-//INFO:     x: Int
+//INFO:     x: Int
 //INFO: )

Documentation is here.

 Foo
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnEnumValueOfFunction.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnEnumValueOfFunction.kt index 6911d01398f4..638645da34b3 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnEnumValueOfFunction.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnEnumValueOfFunction.kt @@ -8,5 +8,5 @@ fun use() { //INFO: 
public final fun valueOf(
-//INFO:     value: String
+//INFO:     value: String
 //INFO: ): E

Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are not permitted.)

Throws:

IllegalArgumentException - if this enum type has no constant with the specified name

diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnEnumValuesFunction.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnEnumValuesFunction.kt index cbcba315a794..8e5d328fe3ad 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnEnumValuesFunction.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnEnumValuesFunction.kt @@ -6,4 +6,4 @@ fun use() { E.values() } -//INFO: 
public final fun values(): Array<E>

Returns an array containing the constants of this enum type, in the order they're declared. This method may be used to iterate over the constants.

+//INFO: 
public final fun values(): Array<E>

Returns an array containing the constants of this enum type, in the order they're declared. This method may be used to iterate over the constants.

diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnFunctionDeclarationWithGFMTable.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnFunctionDeclarationWithGFMTable.kt index b2a043425a82..94ef361f6ca8 100755 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnFunctionDeclarationWithGFMTable.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnFunctionDeclarationWithGFMTable.kt @@ -14,4 +14,4 @@ */ fun testFun() = 12 -//INFO: 
public fun testFun(): Int
left center right default
1 2 3 4
foo bar baz
1 2
3 4 5
header only
 OnFunctionDeclarationWithGFMTable.kt
+//INFO: 
public fun testFun(): Int
left center right default
1 2 3 4
foo bar baz
1 2
3 4 5
header only
 OnFunctionDeclarationWithGFMTable.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt index d2145dfbd981..c252cb0aa5e3 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt @@ -13,6 +13,6 @@ package test fun testFun(first: String, second: Int) = 12 //INFO: 
public fun testFun(
-//INFO:     first: String,
-//INFO:     second: Int
-//INFO: ): Int

Test function

Params:

first - Some

second - Other

 test
 OnFunctionDeclarationWithPackage.kt
+//INFO: first: String, +//INFO: second: Int +//INFO: ): Int

Test function

Params:

first - Some

second - Other

 test
 OnFunctionDeclarationWithPackage.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnInheritedMethodUsage.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnInheritedMethodUsage.kt index 481deda09ba9..fffc7dd0ce9b 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnInheritedMethodUsage.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnInheritedMethodUsage.kt @@ -14,4 +14,4 @@ fun test() { D().foo() } -//INFO: 
public open fun foo(): Int

This method returns zero.

 D
+//INFO: 
public open fun foo(): Int

This method returns zero.

 D
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnInheritedPropertyUsage.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnInheritedPropertyUsage.kt index ca5feb318d96..148eba68eaf4 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnInheritedPropertyUsage.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnInheritedPropertyUsage.kt @@ -14,4 +14,4 @@ fun test() { D().foo } -//INFO: 
public open val foo: Int

This property returns zero.

 D
+//INFO: 
public open val foo: Int

This property returns zero.

 D
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsage.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsage.kt index 3b1592571259..34d79a26c379 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsage.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsage.kt @@ -13,6 +13,6 @@ fun test() { } //INFO: 
public fun testMethod(
-//INFO:     a: Int,
-//INFO:     b: String = "default"
-//INFO: ): Unit

Some documentation

Params:

a - Some int

b - String

 OnMethodUsage.kt
+//INFO: a: Int, +//INFO: b: String = "default" +//INFO: ): Unit

Some documentation

Params:

a - Some int

b - String

 OnMethodUsage.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageInParen.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageInParen.kt index c0943c6333f4..317281785453 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageInParen.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageInParen.kt @@ -13,6 +13,6 @@ fun test() { } //INFO: 
public fun testMethod(
-//INFO:     a: Int,
-//INFO:     b: String
-//INFO: ): Unit

Some documentation

Params:

a - Some int

b - String

 OnMethodUsageInParen.kt
+//INFO: a: Int, +//INFO: b: String +//INFO: ): Unit

Some documentation

Params:

a - Some int

b - String

 OnMethodUsageInParen.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageMultiline.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageMultiline.kt index 824b350f57f8..cb4c27473a9f 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageMultiline.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageMultiline.kt @@ -10,4 +10,4 @@ fun test() { testMethod() } -//INFO: 
public fun testMethod(): Unit

Some documentation on two lines.

 OnMethodUsageMultiline.kt
+//INFO: 
public fun testMethod(): Unit

Some documentation on two lines.

 OnMethodUsageMultiline.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt index 2673b42e96af..a2f0fcaefea8 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt @@ -13,6 +13,6 @@ fun test() { } //INFO: 
public fun testMethod(
-//INFO:     a: Int,
-//INFO:     b: String
-//INFO: ): Unit

Some documentation

Params:

a - Some int

b - String

 OnMethodUsageWithBracketsInParam.kt
+//INFO: a: Int, +//INFO: b: String +//INFO: ): Unit

Some documentation

Params:

a - Some int

b - String

 OnMethodUsageWithBracketsInParam.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt index 7e5cd8b0b3a1..229c63aed7cf 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt @@ -24,6 +24,6 @@ fun test() { testMethod(1, "value") } -//INFO: 
public fun testMethod(): Unit

Some documentation.

+//INFO: 
public fun testMethod(): Unit

Some documentation.

//INFO: 
Code block
    Second line

Third line

Text between code blocks.

//INFO:

Text after code block.

 OnMethodUsageWithCodeBlock.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt index 458d1d2458bb..b4aff038e28b 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt @@ -27,7 +27,7 @@ fun test() { testMethod(1, "value") } -//INFO: 
public fun testMethod(): Unit

Some documentation. Bold underline code foo: bar (baz) quux 'apos'

+//INFO: 
public fun testMethod(): Unit

Some documentation. Bold underline code foo: bar (baz) quux 'apos'

//INFO:

Kotlin abd kas

//INFO:

C

//INFO:

See this class

diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt index 912e429fa77b..8f03a3b022bb 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt @@ -13,5 +13,5 @@ fun test() { } //INFO: 
public fun testMethod(
-//INFO:     test: String
-//INFO: ): Unit

Some documentation on two lines.

Params:

test - String on two lines

 OnMethodUsageWithMultilineParam.kt
+//INFO: test: String +//INFO: ): Unit

Some documentation on two lines.

Params:

test - String on two lines

 OnMethodUsageWithMultilineParam.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt index 46070dc9383c..6becb24027c4 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt @@ -13,6 +13,6 @@ fun test() { 1.testMethod("value") } -//INFO: 
public fun Int.testMethod(
-//INFO:     b: String
-//INFO: ): Unit

Some documentation

Receiver:

Some int

Params:

b - String

Returns:

Return a and nothing else
 OnMethodUsageWithReceiver.kt
+//INFO: 
public fun Int.testMethod(
+//INFO:     b: String
+//INFO: ): Unit

Some documentation

Receiver:

Some int

Params:

b - String

Returns:

Return a and nothing else
 OnMethodUsageWithReceiver.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt index a21dd95cd29d..980544caf673 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt @@ -14,6 +14,6 @@ fun test() { } //INFO: 
public fun testMethod(
-//INFO:     a: Int,
-//INFO:     b: String
-//INFO: ): Unit

Some documentation

Params:

a - Some int

b - String

Returns:

Return a and nothing else
 OnMethodUsageWithReturnAndLink.kt
+//INFO: a: Int, +//INFO: b: String +//INFO: ): Unit

Some documentation

Params:

a - Some int

b - String

Returns:

Return a and nothing else
 OnMethodUsageWithReturnAndLink.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt index 41647e18381a..7a62deca5612 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt @@ -15,6 +15,6 @@ fun test() { } //INFO: 
public fun testMethod(
-//INFO:     a: Int,
-//INFO:     b: String
-//INFO: ): Unit

Some documentation

Params:

a - Some int

b - String

Returns:

Return value

Throws:

IllegalArgumentException - if the weather is bad

 OnMethodUsageWithReturnAndThrows.kt
+//INFO: a: Int, +//INFO: b: String +//INFO: ): Unit

Some documentation

Params:

a - Some int

b - String

Returns:

Return value

Throws:

IllegalArgumentException - if the weather is bad

 OnMethodUsageWithReturnAndThrows.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithSee.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithSee.kt index d4fe0b2c196b..74a37bdee246 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithSee.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithSee.kt @@ -17,4 +17,4 @@ fun test() { testMethod(1, "value") } -//INFO: 
public fun testMethod(): Unit

See Also:

C,
D,
kotlin
 OnMethodUsageWithSee.kt
+//INFO: 
public fun testMethod(): Unit

See Also:

C,
D,
kotlin
 OnMethodUsageWithSee.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt index 063e3b9add51..0cd974d95758 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt @@ -14,6 +14,6 @@ fun test() { } //INFO: 
public fun <T> testMethod(
-//INFO:     a: Int,
-//INFO:     b: String
-//INFO: ): Unit

Some documentation

Params:

T - the type parameter

a - Some int

b - String

 OnMethodUsageWithTypeParameter.kt
+//INFO: a: Int, +//INFO: b: String +//INFO: ): Unit

Some documentation

Params:

T - the type parameter

a - Some int

b - String

 OnMethodUsageWithTypeParameter.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnPrimaryConstructorAnnotatedWithConstructorTag.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnPrimaryConstructorAnnotatedWithConstructorTag.kt index e9d35ade79e6..70b0f2d30b6c 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnPrimaryConstructorAnnotatedWithConstructorTag.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnPrimaryConstructorAnnotatedWithConstructorTag.kt @@ -15,10 +15,10 @@ fun usage() { } //K2_INFO: 
public constructor Foo(
-//K2_INFO:     public final val s: String
+//K2_INFO:     public final val s: String
 //K2_INFO: )

constructor tag description

Params:

s - param description

Properties:

s - property description

 Foo
//INFO: 
public constructor Foo(
-//INFO:     val s: String
+//INFO:     val s: String
 //INFO: )

constructor tag description

Params:

s - param description

Properties:

s - property description

 Foo
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnPropertyUsageDocumentedWithPropertyTag.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnPropertyUsageDocumentedWithPropertyTag.kt index 4bcd5edef370..9d4d85ac4de7 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnPropertyUsageDocumentedWithPropertyTag.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/OnPropertyUsageDocumentedWithPropertyTag.kt @@ -9,4 +9,4 @@ fun usage() { Foo().bar } -//INFO: 
public final val bar: String

bar property description should be taken from this tag

 Foo
+//INFO: 
public final val bar: String

bar property description should be taken from this tag

 Foo
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/PropertiesInConstructor.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/PropertiesInConstructor.kt index ce4c31def370..05abe63bc751 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/PropertiesInConstructor.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/PropertiesInConstructor.kt @@ -1,9 +1,9 @@ class Foo(val p: String) //K2_INFO: 
public constructor Foo(
-//K2_INFO:     public final val p: String
+//K2_INFO:     public final val p: String
 //K2_INFO: )
 Foo
//INFO: 
public constructor Foo(
-//INFO:     val p: String
+//INFO:     val p: String
 //INFO: )

 Foo
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/Samples.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/Samples.kt index 43036ab97ac9..36ff405c7973 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/Samples.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/Samples.kt @@ -20,5 +20,5 @@ fun castTextSpell(spell: String) { } //INFO: 
public fun castTextSpell(
-//INFO:     spell: String
-//INFO: ): Unit

Samples:

Samples.sampleMagic

castTextSpell("[asd] [dse] [asz]")

sampleScroll

val reader = Scroll("[asd] [dse] [asz]").reader()
castTextSpell(reader.readAll())
 magic
 Samples.kt
+//INFO: spell: String +//INFO: ): Unit

Samples:

Samples.sampleMagic

castTextSpell("[asd] [dse] [asz]")

sampleScroll

val reader = Scroll("[asd] [dse] [asz]").reader()
castTextSpell(reader.readAll())
 magic
 Samples.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/TailrecFunction.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/TailrecFunction.kt index 9a91e62ceac1..3279e1306f42 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/TailrecFunction.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/TailrecFunction.kt @@ -1,5 +1,5 @@ tailrec fun dummyTailrec() {} -//K2_INFO: 
public tailrec fun dummyTailrec(): Unit
 TailrecFunction.kt
+//K2_INFO: 
public tailrec fun dummyTailrec(): Unit
 TailrecFunction.kt
-//INFO: 
public tailrec fun dummyTailrec(): Unit

 TailrecFunction.kt
+//INFO: 
public tailrec fun dummyTailrec(): Unit

 TailrecFunction.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/TailrecName.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/TailrecName.kt index f9cb40e9a025..b2894f0d505d 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/TailrecName.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/TailrecName.kt @@ -2,4 +2,4 @@ class Foo { val tailrec: String = "" } -//INFO: 
public final val tailrec: String
 Foo
+//INFO: 
public final val tailrec: String
 Foo
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/TopLevelMethodFromJava.java b/plugins/kotlin/idea/tests/testData/editor/quickDoc/TopLevelMethodFromJava.java index 1d84e05fffa4..2a27f3fad205 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/TopLevelMethodFromJava.java +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/TopLevelMethodFromJava.java @@ -9,5 +9,5 @@ class Testing { } //INFO: 
public fun foo(
-//INFO:     bar: Int
-//INFO: ): Unit

KDoc foo

 some
 TopLevelMethodFromJava_Data.kt
+//INFO: bar: Int +//INFO: ): Unit

KDoc foo

 some
 TopLevelMethodFromJava_Data.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt index 715bef32de82..e5bd8abbe9ba 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt @@ -10,9 +10,9 @@ fun main(args: Array) { //K2_INFO: 
public fun foo(
 //K2_INFO:     x: A
-//K2_INFO: ): Unit
 TypeNamesFromStdLibNavigation.kt
+//K2_INFO: ): Unit
 TypeNamesFromStdLibNavigation.kt
//INFO: 
public fun foo(
 //INFO:     x: A
-//INFO: ): Unit

 TypeNamesFromStdLibNavigation.kt
+//INFO: ): Unit

 TypeNamesFromStdLibNavigation.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/TypeParameterConstraints.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/TypeParameterConstraints.kt index e34d3bf3d3ff..51a1af11e4dc 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/TypeParameterConstraints.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/TypeParameterConstraints.kt @@ -4,6 +4,6 @@ fun bar() where T: I2 { } -//K2_INFO: 
public fun <T> bar(): Unit where T : I1, T : I2
 TypeParameterConstraints.kt
-//INFO: 
public fun <T : I1> bar(): Unit where T : I2

 TypeParameterConstraints.kt
+//K2_INFO: 
public fun <T> bar(): Unit where T : I1, T : I2
 TypeParameterConstraints.kt
+//INFO: 
public fun <T : I1> bar(): Unit where T : I2

 TypeParameterConstraints.kt
diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/multiplatform/OnActualValueParameterDeclaration.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/multiplatform/OnActualValueParameterDeclaration.kt index 975a1acff702..a38c0acdc2e2 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/multiplatform/OnActualValueParameterDeclaration.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/multiplatform/OnActualValueParameterDeclaration.kt @@ -12,4 +12,4 @@ expect fun foo(param: String) // MAIN actual fun foo(param: String) {} -//INFO: 
value-parameter param: String

doc for expected param of function foo

+//INFO: 
value-parameter param: String

doc for expected param of function foo

\ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/editor/quickDoc/renderAnnotatedExtensionFunctionType.kt b/plugins/kotlin/idea/tests/testData/editor/quickDoc/renderAnnotatedExtensionFunctionType.kt index 6a1e54b42b2c..022d13f64fe4 100644 --- a/plugins/kotlin/idea/tests/testData/editor/quickDoc/renderAnnotatedExtensionFunctionType.kt +++ b/plugins/kotlin/idea/tests/testData/editor/quickDoc/renderAnnotatedExtensionFunctionType.kt @@ -4,10 +4,11 @@ fun myFun(param: @MyAnnotation (String.() -> Unit)) {} // quick documenta annotation class MyAnnotation //K2_INFO: 
public fun myFun(
-//K2_INFO:     param: @MyAnnotation (String.() -> Unit)
-//K2_INFO: ): Unit
 renderAnnotatedExtensionFunctionType.kt
+//K2_INFO: param: @MyAnnotation (String.() -> Unit) +//K2_INFO: ): Unit
 renderAnnotatedExtensionFunctionType.kt
+ //INFO: 
public fun myFun(
-//INFO:     param: @MyAnnotation() (String.() -> Unit)
-//INFO: ): Unit

 renderAnnotatedExtensionFunctionType.kt
+//INFO: param: @MyAnnotation() (String.() -> Unit) +//INFO: ): Unit

 renderAnnotatedExtensionFunctionType.kt
diff --git a/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/fqName/code/usage.kt b/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/fqName/code/usage.kt index cafa1334b226..f50360e20158 100644 --- a/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/fqName/code/usage.kt +++ b/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/fqName/code/usage.kt @@ -9,4 +9,4 @@ fun some() { } -//INFO: 
public fun some(): Unit

Samples:

samples.SampleGroup.mySample

println("Hello, world")

samples.megasamples.MegaSamplesGroup.megaSample

println("...---...")

samples.notindir.NotInDirSamples.sssample

println("location is samplesTest/")

smaplez.a.b.c.Samplez.sssample

// Unresolved
 usage.kt
+//INFO: 
public fun some(): Unit

Samples:

samples.SampleGroup.mySample

println("Hello, world")

samples.megasamples.MegaSamplesGroup.megaSample

println("...---...")

samples.notindir.NotInDirSamples.sssample

println("location is samplesTest/")

smaplez.a.b.c.Samplez.sssample

// Unresolved
 usage.kt
diff --git a/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/simple/code/usage.kt b/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/simple/code/usage.kt index 7d49b220fbed..d476c2bd125b 100644 --- a/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/simple/code/usage.kt +++ b/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/simple/code/usage.kt @@ -5,4 +5,4 @@ fun some() { } -//INFO: 
public fun some(): Unit

Samples:

samples.sample

println("Hello, world")
 usage.kt
+//INFO: 
public fun some(): Unit

Samples:

samples.sample

println("Hello, world")
 usage.kt
diff --git a/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/typeParameters/code/usageNestedTypeParameters.kt b/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/typeParameters/code/usageNestedTypeParameters.kt index 61e06f87d2bc..e9fb24eb677b 100644 --- a/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/typeParameters/code/usageNestedTypeParameters.kt +++ b/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/typeParameters/code/usageNestedTypeParameters.kt @@ -5,4 +5,4 @@ fun some() { } -//INFO: 
public fun some(): Unit

Samples:

samples.nestedTypeParameter

val m = mapOf&lt;String, Pair&lt;Int, Long&gt;&gt;()
println(m)
 usageNestedTypeParameters.kt
+//INFO: 
public fun some(): Unit

Samples:

samples.nestedTypeParameter

val m = mapOf&lt;String, Pair&lt;Int, Long&gt;&gt;()
println(m)
 usageNestedTypeParameters.kt
diff --git a/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/typeParameters/code/usageSingleTypeParameter.kt b/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/typeParameters/code/usageSingleTypeParameter.kt index fd61542ead27..a71ae24f52c1 100644 --- a/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/typeParameters/code/usageSingleTypeParameter.kt +++ b/plugins/kotlin/idea/tests/testData/kdoc/multiModuleResolve/typeParameters/code/usageSingleTypeParameter.kt @@ -5,4 +5,4 @@ fun some() { } -//INFO: 
public fun some(): Unit

Samples:

samples.singleTypeParameter

val l = listOf&lt;String&gt;()
println(l)
 usageSingleTypeParameter.kt
+//INFO: 
public fun some(): Unit

Samples:

samples.singleTypeParameter

val l = listOf&lt;String&gt;()
println(l)
 usageSingleTypeParameter.kt