diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt index 9fd72e297ed..1087dca71b9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt @@ -115,7 +115,9 @@ class WrapValueParameterHandler(val base: DescriptorRenderer.ValueParametersHand parameterCount: Int, builder: StringBuilder ) { - base.appendAfterValueParameter(parameter, parameterIndex, parameterCount, builder) + if (parameterIndex != parameterCount - 1) { + builder.append(",") + } } override fun appendAfterValueParameters(parameterCount: Int, builder: StringBuilder) { diff --git a/idea/testData/editor/quickDoc/AnonymousObjectLocalVariable.kt b/idea/testData/editor/quickDoc/AnonymousObjectLocalVariable.kt index 886d34b5118..fc577cc24e8 100644 --- a/idea/testData/editor/quickDoc/AnonymousObjectLocalVariable.kt +++ b/idea/testData/editor/quickDoc/AnonymousObjectLocalVariable.kt @@ -6,4 +6,4 @@ fun context() { v } -//INFO: 
val v: <anonymous object : OurClass, OurFace>
+//INFO: 
val v: <anonymous object : OurClass, OurFace>
diff --git a/idea/testData/editor/quickDoc/AtConstantWithUnderscore.kt b/idea/testData/editor/quickDoc/AtConstantWithUnderscore.kt index 81ca171d352..3b28d50a7b3 100644 --- a/idea/testData/editor/quickDoc/AtConstantWithUnderscore.kt +++ b/idea/testData/editor/quickDoc/AtConstantWithUnderscore.kt @@ -9,4 +9,4 @@ class C { } } -//INFO: 
public final fun foo(): Unit defined in C

Use SOME_REFERENCED_VAL to do something

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

Use SOME_REFERENCED_VAL to do something

diff --git a/idea/testData/editor/quickDoc/AtFunctionParameter.kt b/idea/testData/editor/quickDoc/AtFunctionParameter.kt index 2c63d9afe0a..c90d6e5aca8 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
+//INFO: 
value-parameter f: (Int) → String
diff --git a/idea/testData/editor/quickDoc/AtImplicitLambdaParametEnd.kt b/idea/testData/editor/quickDoc/AtImplicitLambdaParametEnd.kt index a2116c0cda2..21125859356 100644 --- a/idea/testData/editor/quickDoc/AtImplicitLambdaParametEnd.kt +++ b/idea/testData/editor/quickDoc/AtImplicitLambdaParametEnd.kt @@ -4,4 +4,4 @@ fun foo() { } } -//INFO: 
value-parameter it: Int
+//INFO: 
value-parameter it: Int
diff --git a/idea/testData/editor/quickDoc/AtImplicitLambdaParameter.kt b/idea/testData/editor/quickDoc/AtImplicitLambdaParameter.kt index 9e988b29111..e048e424361 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
+//INFO: 
value-parameter it: Int
diff --git a/idea/testData/editor/quickDoc/AtLocalFunction.kt b/idea/testData/editor/quickDoc/AtLocalFunction.kt index 63bb7dce809..20f1dfd8fa4 100644 --- a/idea/testData/editor/quickDoc/AtLocalFunction.kt +++ b/idea/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/idea/testData/editor/quickDoc/AtTypeParameter.kt b/idea/testData/editor/quickDoc/AtTypeParameter.kt index bb239791a0b..c33e03fe483 100644 --- a/idea/testData/editor/quickDoc/AtTypeParameter.kt +++ b/idea/testData/editor/quickDoc/AtTypeParameter.kt @@ -2,4 +2,4 @@ interface Base class Some<T: Base> -//INFO: 
<T : Base> defined in Some
+//INFO: 
Some
<T : Base>
diff --git a/idea/testData/editor/quickDoc/AtVariableDeclaration.kt b/idea/testData/editor/quickDoc/AtVariableDeclaration.kt index 61e7d6aae90..31e16420680 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?
+//INFO: 
val test: String?
diff --git a/idea/testData/editor/quickDoc/ConstructorVarParameter.kt b/idea/testData/editor/quickDoc/ConstructorVarParameter.kt index e0550f31bc9..ab046aaf085 100644 --- a/idea/testData/editor/quickDoc/ConstructorVarParameter.kt +++ b/idea/testData/editor/quickDoc/ConstructorVarParameter.kt @@ -4,4 +4,4 @@ class C(var v: Int) { } } -//INFO: 
public final var v: Int defined in C
+//INFO: 
C
public final var v: Int
diff --git a/idea/testData/editor/quickDoc/EscapeHtmlInsideCodeBlocks.kt b/idea/testData/editor/quickDoc/EscapeHtmlInsideCodeBlocks.kt index 4a2c308b672..aa0da4305b9 100644 --- a/idea/testData/editor/quickDoc/EscapeHtmlInsideCodeBlocks.kt +++ b/idea/testData/editor/quickDoc/EscapeHtmlInsideCodeBlocks.kt @@ -8,7 +8,7 @@ */ class A -//INFO: 
public final class A<T> defined in root package in file EscapeHtmlInsideCodeBlocks.kt

Code block:

+//INFO: 
(EscapeHtmlInsideCodeBlocks.kt)
public final class A<T>

Code block:

//INFO: 

 //INFO: A<T>
-//INFO:

Code span: <T> is type parameter

+//INFO:

Code span: <T> is type parameter

diff --git a/idea/testData/editor/quickDoc/ExtensionReceiver.kt b/idea/testData/editor/quickDoc/ExtensionReceiver.kt index b48eb25c8f6..3a8854c7673 100644 --- a/idea/testData/editor/quickDoc/ExtensionReceiver.kt +++ b/idea/testData/editor/quickDoc/ExtensionReceiver.kt @@ -7,4 +7,4 @@ fun Foo.bar() { foo(this) } -//INFO: 
public fun Foo.bar(): Unit defined in root package in file ExtensionReceiver.kt
+//INFO: 
(ExtensionReceiver.kt)
public fun Foo.bar(): Unit

diff --git a/idea/testData/editor/quickDoc/ExtensionReceiverEnd.kt b/idea/testData/editor/quickDoc/ExtensionReceiverEnd.kt index d3e5b5e5d0e..366a4be94c3 100644 --- a/idea/testData/editor/quickDoc/ExtensionReceiverEnd.kt +++ b/idea/testData/editor/quickDoc/ExtensionReceiverEnd.kt @@ -7,4 +7,4 @@ fun Foo.bar() { foo(this) } -//INFO: 
public fun Foo.bar(): Unit defined in root package in file ExtensionReceiverEnd.kt
+//INFO: 
(ExtensionReceiverEnd.kt)
public fun Foo.bar(): Unit

diff --git a/idea/testData/editor/quickDoc/IndentedCodeBlock.kt b/idea/testData/editor/quickDoc/IndentedCodeBlock.kt index c854f80022f..2c0dcb79631 100644 --- a/idea/testData/editor/quickDoc/IndentedCodeBlock.kt +++ b/idea/testData/editor/quickDoc/IndentedCodeBlock.kt @@ -13,10 +13,10 @@ */ class A -//INFO: 
public final class A defined in root package in file IndentedCodeBlock.kt

val a = A()
+//INFO: 
(IndentedCodeBlock.kt)
public final class A
val a = A()
 //INFO: println(a) // comment

 //INFO: <fenced>Code_block</fenced>
 //INFO: 
val b = B()
 //INFO: println(b)
some text content

 //INFO: 
Indented code block with tab
-//INFO: 	Second line

+//INFO: 	Second line
diff --git a/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt b/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt index f905d3ee993..69728726e65 100644 --- a/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt +++ b/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt @@ -2,7 +2,7 @@ fun testing() { SomeClass>() } -//INFO: 
public class SomeClass<T extends List>
-//INFO: extends Object
+//INFO: 
public class SomeClass<T extends List>
+//INFO: extends Object
//INFO: Some Java Class -//INFO:
Type parameters:
<T> -
+//INFO:

Type parameters:

<T> –
diff --git a/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt b/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt index 6d54330807d..6a81ea79084 100644 --- a/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt +++ b/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt @@ -4,6 +4,6 @@ class A : OverrideMe() { } -//INFO: 
protected open fun overrideMe(): Unit defined in A
Description copied from class: OverrideMe
+//INFO: 
A
protected open fun overrideMe(): Unit

Description copied from class:

OverrideMe
//INFO: Some comment -//INFO:

Overrides:
overrideMe in class OverrideMe
+//INFO:

Overrides:

overrideMe in class OverrideMe

diff --git a/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt b/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt index 3581f116c53..bb95ef2e1a2 100644 --- a/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt +++ b/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt @@ -4,6 +4,6 @@ class A : OverrideMe { } -//INFO: 
public open fun overrideMe(): Unit defined in A
Description copied from interface: OverrideMe
+//INFO: 
A
public open fun overrideMe(): Unit

Description copied from interface:

OverrideMe
//INFO: Some comment -//INFO:

Specified by:
overrideMe in interface OverrideMe
+//INFO:

Specified by:

overrideMe in interface OverrideMe

diff --git a/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt b/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt index 4d95c59736e..236c74ac245 100644 --- a/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt +++ b/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt @@ -2,12 +2,8 @@ fun ktTest() { Test.foo("SomeTest") } -//INFO: Test
@Contract(pure = true) 
+//INFO: 
Test
@Contract(pure = true) 
 //INFO: @NotNull 
-//INFO: public static Object[] foo(String param)

+//INFO: public static Object[] foo(String param)
//INFO: Java Method -//INFO: -//INFO: Inferred annotations available:
-//INFO: +//INFO:

Inferred annotations:

@org.jetbrains.annotations.Contract(pure = true) @org.jetbrains.annotations.NotNull

diff --git a/idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java b/idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java index cf31cfc0c75..1295353800b 100644 --- a/idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java +++ b/idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java @@ -6,4 +6,4 @@ class KotlinClassUsedFromJava { } } -//INFO: 
public final class Test defined in testing in file KotlinClassUsedFromJava_Data.kt

Some comment

+//INFO: 
testing (KotlinClassUsedFromJava_Data.kt)
public final class Test

Some comment

diff --git a/idea/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java b/idea/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java index 1471e1049a4..be31754d58f 100644 --- a/idea/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java +++ b/idea/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java @@ -6,5 +6,5 @@ class KotlinPackageClassUsedFromJava { } } -//INFO: testing
public final class testing.KotlinPackageClassUsedFromJava_DataKt
-//INFO: extends Object
+//INFO: 
testing
public final class testing.KotlinPackageClassUsedFromJava_DataKt
+//INFO: extends Object
diff --git a/idea/testData/editor/quickDoc/MethodFromStdLib.kt b/idea/testData/editor/quickDoc/MethodFromStdLib.kt index 132a734ce0d..72cc41bdad9 100644 --- a/idea/testData/editor/quickDoc/MethodFromStdLib.kt +++ b/idea/testData/editor/quickDoc/MethodFromStdLib.kt @@ -2,4 +2,6 @@ fun test() { listOf(1, 2, 4).filter { it > 0 } } -//INFO: 
public inline fun <T> Iterable<T>.filter(predicate: (T) → Boolean): List<T> defined in kotlin.collections in file CollectionsKt.class

Returns a list containing only elements matching the given predicate.

+//INFO: 
kotlin.collections (CollectionsKt.class)
public inline fun <T> Iterable<T>.filter(
+//INFO:     predicate: (T) → Boolean
+//INFO: ): List<T>

Returns a list containing only elements matching the given predicate.

diff --git a/idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt b/idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt index a2dd4bad33f..46988352a30 100644 --- a/idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt +++ b/idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt @@ -3,4 +3,4 @@ */ class Some -//INFO: 
public final class Some defined in root package in file OnClassDeclarationWithNoPackage.kt

Usefull comment

+//INFO: 
(OnClassDeclarationWithNoPackage.kt)
public final class Some

Usefull comment

diff --git a/idea/testData/editor/quickDoc/OnEnumClassReference.kt b/idea/testData/editor/quickDoc/OnEnumClassReference.kt index dfb14429e45..06838dfbae5 100644 --- a/idea/testData/editor/quickDoc/OnEnumClassReference.kt +++ b/idea/testData/editor/quickDoc/OnEnumClassReference.kt @@ -7,4 +7,4 @@ fun use() { SomeEnum::class } -//INFO: 
public final enum class SomeEnum : Enum<SomeEnum> defined in root package in file OnEnumClassReference.kt

Useless one

+//INFO: 
(OnEnumClassReference.kt)
public final enum class SomeEnum : Enum<SomeEnum>

Useless one

diff --git a/idea/testData/editor/quickDoc/OnEnumDeclaration.kt b/idea/testData/editor/quickDoc/OnEnumDeclaration.kt index fa04d7a560a..5e31e14f0bc 100644 --- a/idea/testData/editor/quickDoc/OnEnumDeclaration.kt +++ b/idea/testData/editor/quickDoc/OnEnumDeclaration.kt @@ -3,4 +3,4 @@ */ enum class SomeEnum -//INFO: 
public final enum class SomeEnum : Enum<SomeEnum> defined in root package in file OnEnumDeclaration.kt

Useless one

+//INFO: 
(OnEnumDeclaration.kt)
public final enum class SomeEnum : Enum<SomeEnum>

Useless one

diff --git a/idea/testData/editor/quickDoc/OnEnumEntry.kt b/idea/testData/editor/quickDoc/OnEnumEntry.kt index bfd7d3bd39b..c9ad9f209c1 100644 --- a/idea/testData/editor/quickDoc/OnEnumEntry.kt +++ b/idea/testData/editor/quickDoc/OnEnumEntry.kt @@ -4,4 +4,4 @@ enum class TestEnum{ -//INFO: 
enum entry C defined in TestEnum
Enum constant ordinal: 2 +//INFO: 
TestEnum
enum entry CEnum constant ordinal: 2
diff --git a/idea/testData/editor/quickDoc/OnEnumEntryUsage.kt b/idea/testData/editor/quickDoc/OnEnumEntryUsage.kt index 0c1419055c7..fd840ff70aa 100644 --- a/idea/testData/editor/quickDoc/OnEnumEntryUsage.kt +++ b/idea/testData/editor/quickDoc/OnEnumEntryUsage.kt @@ -6,4 +6,4 @@ fun test() { TestEnum.C } -//INFO: 
enum entry C defined in TestEnum
Enum constant ordinal: 2 +//INFO: 
TestEnum
enum entry CEnum constant ordinal: 2
diff --git a/idea/testData/editor/quickDoc/OnEnumUsage.kt b/idea/testData/editor/quickDoc/OnEnumUsage.kt index 117618fc88f..56936f2af3d 100644 --- a/idea/testData/editor/quickDoc/OnEnumUsage.kt +++ b/idea/testData/editor/quickDoc/OnEnumUsage.kt @@ -9,4 +9,4 @@ fun use() { SomeEnum.One } -//INFO: 
public final enum class SomeEnum : Enum<SomeEnum> defined in root package in file OnEnumUsage.kt

Enum of 1, 2

+//INFO: 
(OnEnumUsage.kt)
public final enum class SomeEnum : Enum<SomeEnum>

Enum of 1, 2

diff --git a/idea/testData/editor/quickDoc/OnEnumValueOfFunction.kt b/idea/testData/editor/quickDoc/OnEnumValueOfFunction.kt index cf38cac14f0..dcec5e8cc1e 100644 --- a/idea/testData/editor/quickDoc/OnEnumValueOfFunction.kt +++ b/idea/testData/editor/quickDoc/OnEnumValueOfFunction.kt @@ -7,5 +7,6 @@ fun use() { } -//INFO: public final fun valueOf(value: String): E defined in 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.)

-//INFO:
Throws:
IllegalArgumentException - if this enum type has no constant with the specified name
+//INFO: 
E
public final fun valueOf(
+//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/idea/testData/editor/quickDoc/OnEnumValuesFunction.kt b/idea/testData/editor/quickDoc/OnEnumValuesFunction.kt index ed70854ab83..9f90fa39274 100644 --- a/idea/testData/editor/quickDoc/OnEnumValuesFunction.kt +++ b/idea/testData/editor/quickDoc/OnEnumValuesFunction.kt @@ -6,4 +6,4 @@ fun use() { E.values() } -//INFO: public final fun values(): Array<E> defined in 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: 
E
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/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt b/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt index b5695d06cf8..b7e727cbbf2 100644 --- a/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt +++ b/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt @@ -12,5 +12,7 @@ package test */ fun testFun(first: String, second: Int) = 12 -//INFO: 
public fun testFun(first: String, second: Int): Int defined in test in file OnFunctionDeclarationWithPackage.kt

Test function

-//INFO:
Parameters:
first - Some
second - Other
+//INFO: 
test (OnFunctionDeclarationWithPackage.kt)
public fun testFun(
+//INFO:     first: String,
+//INFO:     second: Int
+//INFO: ): Int

Test function

Parameters

first - Some

second - Other

diff --git a/idea/testData/editor/quickDoc/OnInheritedMethodUsage.kt b/idea/testData/editor/quickDoc/OnInheritedMethodUsage.kt index ceb71bce1fa..5faaa98db62 100644 --- a/idea/testData/editor/quickDoc/OnInheritedMethodUsage.kt +++ b/idea/testData/editor/quickDoc/OnInheritedMethodUsage.kt @@ -14,4 +14,4 @@ fun test() { D().foo() } -//INFO: 
public open fun foo(): Int defined in D

This method returns zero.

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

This method returns zero.

diff --git a/idea/testData/editor/quickDoc/OnInheritedPropertyUsage.kt b/idea/testData/editor/quickDoc/OnInheritedPropertyUsage.kt index ab9c857aa27..45591e12057 100644 --- a/idea/testData/editor/quickDoc/OnInheritedPropertyUsage.kt +++ b/idea/testData/editor/quickDoc/OnInheritedPropertyUsage.kt @@ -14,4 +14,4 @@ fun test() { D().foo } -//INFO: 
public open val foo: Int defined in D

This property returns zero.

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

This property returns zero.

diff --git a/idea/testData/editor/quickDoc/OnMethodUsage.kt b/idea/testData/editor/quickDoc/OnMethodUsage.kt index d7dd575d3a8..19ee0d0a5b9 100644 --- a/idea/testData/editor/quickDoc/OnMethodUsage.kt +++ b/idea/testData/editor/quickDoc/OnMethodUsage.kt @@ -12,5 +12,7 @@ fun test() { testMethod(1, "value") } -//INFO: 
public fun testMethod(a: Int, b: String): Unit defined in root package in file OnMethodUsage.kt

Some documentation

-//INFO:
Parameters:
a - Some int
b - String
+//INFO: 
(OnMethodUsage.kt)
public fun testMethod(
+//INFO:     a: Int,
+//INFO:     b: String
+//INFO: ): Unit

Some documentation

Parameters

a - Some int

b - String

diff --git a/idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt b/idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt index 38bac449780..80768ad4f60 100644 --- a/idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt +++ b/idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt @@ -10,4 +10,4 @@ fun test() { testMethod() } -//INFO: 
public fun testMethod(): Unit defined in root package in file OnMethodUsageMultiline.kt

Some documentation on two lines.

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

Some documentation on two lines.

diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt index f2ed28dcccf..00397f67b14 100644 --- a/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt +++ b/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt @@ -12,5 +12,7 @@ fun test() { testMethod(1, "value") } -//INFO: 
public fun testMethod(a: Int, b: String): Unit defined in root package in file OnMethodUsageWithBracketsInParam.kt

Some documentation

-//INFO:
Parameters:
a - Some int
b - String
+//INFO: 
(OnMethodUsageWithBracketsInParam.kt)
public fun testMethod(
+//INFO:     a: Int,
+//INFO:     b: String
+//INFO: ): Unit

Some documentation

Parameters

a - Some int

b - String

diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt index a1b336ec2e9..465ae88d53e 100644 --- a/idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt +++ b/idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt @@ -24,7 +24,7 @@ fun test() { testMethod(1, "value") } -//INFO: 
public fun testMethod(): Unit defined in root package in file OnMethodUsageWithCodeBlock.kt

Some documentation.

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

Some documentation.

//INFO: 

 //INFO: Code block
 //INFO:     Second line
@@ -32,4 +32,4 @@ fun test() {
 //INFO: Third line
 //INFO:

Text between code blocks.

//INFO: 

-//INFO:

Text after code block.

+//INFO:

Text after code block.

diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt index 654a5126fdc..52b324b7411 100644 --- a/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt +++ b/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt @@ -27,10 +27,10 @@ fun test() { testMethod(1, "value") } -//INFO: 
public fun testMethod(): Unit defined in root package in file OnMethodUsageWithMarkdown.kt

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

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

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

//INFO:

Kotlin abd kas

//INFO:

C

//INFO:

See this class

//INFO:

This is emphasized text but text_with_underscores has to preserve the underscores. Single stars embedded in a word like Embedded*Star have to be preserved as well.

//INFO:

Exclamation marks are also important! Also in code blocks!

-//INFO:

bt+ : prefix ` postfix backslash: \

+//INFO:

bt+ : prefix ` postfix backslash: \

diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt index ff2fb1dd5c5..fff2d1d0c64 100644 --- a/idea/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt +++ b/idea/testData/editor/quickDoc/OnMethodUsageWithMultilineParam.kt @@ -12,5 +12,6 @@ fun test() { testMethod("") } -//INFO: 
public fun testMethod(test: String): Unit defined in root package in file OnMethodUsageWithMultilineParam.kt

Some documentation on two lines.

-//INFO:
Parameters:
test - String on two lines
\ No newline at end of file +//INFO: 
(OnMethodUsageWithMultilineParam.kt)
public fun testMethod(
+//INFO:     test: String
+//INFO: ): Unit

Some documentation on two lines.

Parameters

test - String on two lines

diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt index 104f1be6ad4..20eb4e17913 100644 --- a/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt +++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt @@ -13,7 +13,6 @@ fun test() { 1.testMethod("value") } -//INFO: 
public fun Int.testMethod(b: String): Unit defined in root package in file OnMethodUsageWithReceiver.kt

Some documentation

-//INFO:
Receiver:
Some int
-//INFO:
Parameters:
b - String
-//INFO:
Returns:
Return a and nothing else
+//INFO: 
(OnMethodUsageWithReceiver.kt)
public fun Int.testMethod(
+//INFO:     b: String
+//INFO: ): Unit

Some documentation

Receiver

Parameters

b - String

Returns

diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt index ee1b9160c38..a656178ac22 100644 --- a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt +++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt @@ -13,6 +13,7 @@ fun test() { testMethod(1, "value") } -//INFO: 
public fun testMethod(a: Int, b: String): Unit defined in root package in file OnMethodUsageWithReturnAndLink.kt

Some documentation

-//INFO:
Parameters:
a - Some int
b - String
-//INFO:
Returns:
Return a and nothing else
+//INFO: 
(OnMethodUsageWithReturnAndLink.kt)
public fun testMethod(
+//INFO:     a: Int,
+//INFO:     b: String
+//INFO: ): Unit

Some documentation

Parameters

a - Some int

b - String

Returns

diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt index e868dfa30c3..267808aeb0a 100644 --- a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt +++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt @@ -14,7 +14,7 @@ fun test() { testMethod(1, "value") } -//INFO: 
public fun testMethod(a: Int, b: String): Unit defined in root package in file OnMethodUsageWithReturnAndThrows.kt

Some documentation

-//INFO:
Parameters:
a - Some int
b - String
-//INFO:
Returns:
Return value
-//INFO:
Throws:
IllegalArgumentException - if the weather is bad
+//INFO: 
(OnMethodUsageWithReturnAndThrows.kt)
public fun testMethod(
+//INFO:     a: Int,
+//INFO:     b: String
+//INFO: ): Unit

Some documentation

Parameters

a - Some int

b - String

Returns

Throws

IllegalArgumentException - if the weather is bad

diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt index 65956d8f011..c7cfbf0a944 100644 --- a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt +++ b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt @@ -17,5 +17,4 @@ fun test() { testMethod(1, "value") } -//INFO: 
public fun testMethod(): Unit defined in root package in file OnMethodUsageWithSee.kt

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

See Also

C, D, kotlin
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt index eab08dbc61f..557406ed6fd 100644 --- a/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt +++ b/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt @@ -13,5 +13,7 @@ fun test() { testMethod(1, "value") } -//INFO: 
public fun <T> testMethod(a: Int, b: String): Unit defined in root package in file OnMethodUsageWithTypeParameter.kt

Some documentation

-//INFO:
Parameters:
T - the type parameter
a - Some int
b - String
+//INFO: 
(OnMethodUsageWithTypeParameter.kt)
public fun <T> testMethod(
+//INFO:     a: Int,
+//INFO:     b: String
+//INFO: ): Unit

Some documentation

Parameters

T - the type parameter

a - Some int

b - String

diff --git a/idea/testData/editor/quickDoc/Samples.kt b/idea/testData/editor/quickDoc/Samples.kt index d285fdc3487..62933c31fee 100644 --- a/idea/testData/editor/quickDoc/Samples.kt +++ b/idea/testData/editor/quickDoc/Samples.kt @@ -19,10 +19,11 @@ fun castTextSpell(spell: String) { throw SecurityException("Magic prohibited outside Hogwarts") } -//INFO: 
public fun castTextSpell(spell: String): Unit defined in magic in file Samples.kt

-//INFO:
Samples:
Samples.sampleMagic

+//INFO: 
magic (Samples.kt)
public fun castTextSpell(
+//INFO:     spell: String
+//INFO: ): Unit
Samples
Samples.sampleMagic

 //INFO: castTextSpell("[asd] [dse] [asz]")
-//INFO: 
sampleScroll

+//INFO: 
sampleScroll

 //INFO: val reader = Scroll("[asd] [dse] [asz]").reader()
 //INFO: castTextSpell(reader.readAll())
-//INFO: 

+//INFO: 

diff --git a/idea/testData/editor/quickDoc/TopLevelMethodFromJava.java b/idea/testData/editor/quickDoc/TopLevelMethodFromJava.java
index 7e8e13aa306..33265cdcabd 100644
--- a/idea/testData/editor/quickDoc/TopLevelMethodFromJava.java
+++ b/idea/testData/editor/quickDoc/TopLevelMethodFromJava.java
@@ -8,4 +8,6 @@ class Testing {
     }
 }
 
-//INFO: 
public fun foo(bar: Int): Unit defined in some in file TopLevelMethodFromJava_Data.kt
KDoc foo

+//INFO: 
some (TopLevelMethodFromJava_Data.kt)
public fun foo(
+//INFO:     bar: Int
+//INFO: ): Unit
KDoc foo

diff --git a/idea/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt b/idea/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt
index 37a73ee27b1..45c28d9db75 100644
--- a/idea/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt
+++ b/idea/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt
@@ -8,4 +8,6 @@ fun main(args: Array) {
     foo()
 }
 
-//INFO: 
public fun foo(x: A): Unit defined in root package in file TypeNamesFromStdLibNavigation.kt

+//INFO: 
(TypeNamesFromStdLibNavigation.kt)
public fun foo(
+//INFO:     x: A
+//INFO: ): Unit