azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve rendering of modifiers in DescriptorRenderer

Browse Source 
* Use bold font to render all modifiers
* Render 'external' according to the style guide, right after modality
This commit is contained in:
Alexander Udalov
2017-07-20 19:26:16 +03:00
parent f01e0ef335
commit 472959aca1
37 changed files with 102 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithJsStdLib/native/anonymousInitializer.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public external final class A {
public final external class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/native/body.txt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ public external fun f(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin
public external fun foo(): kotlin.Int
public external fun g(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
public external final class C {
public final external class C {
public constructor C()
public final fun bar(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/delegatedConstructorCall.txt
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
package
public external open class Base {
public open external class Base {
public constructor Base(/*0*/ x: kotlin.Int)
public constructor Base(/*0*/ x: kotlin.String)
public constructor Base(/*0*/ x: kotlin.String, /*1*/ y: kotlin.String)
@@ -9,7 +9,7 @@ public external open class Base {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public external open class Derived1 : Base {
public open external class Derived1 : Base {
public constructor Derived1()
public constructor Derived1(/*0*/ x: kotlin.Byte)
public constructor Derived1(/*0*/ x: kotlin.String)
@@ -19,7 +19,7 @@ public external open class Derived1 : Base {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public external open class Derived2 : Base {
public open external class Derived2 : Base {
public constructor Derived2()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/native/delegation.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package
public external val topLevelProp: kotlin.String
public external final class A : I {
public final external class A : I {
public constructor A()
public final var mutableProp: kotlin.String
public final val prop: kotlin.String
compiler/testData/diagnostics/testsWithJsStdLib/native/enumEntry.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public external final enum class E : kotlin.Enum<E> {
public final external enum class E : kotlin.Enum<E> {
enum entry X
enum entry Y
compiler/testData/diagnostics/testsWithJsStdLib/native/extensionFunctionArgumentOrReturnType.txt
Vendored
+2 -2
View File
@@ -8,14 +8,14 @@ public external fun bar(/*0*/ vararg f: kotlin.Int.() -> kotlin.Int /*kotlin.Arr
public external fun baz(): kotlin.Int.() -> kotlin.Int
public external fun foo(/*0*/ f: kotlin.Int.() -> kotlin.Int): kotlin.Unit
public external final class A {
public final external class A {
public constructor A(/*0*/ f: kotlin.Int.() -> kotlin.Int)
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public external final data class B {
public final external data class B {
public constructor B(/*0*/ a: kotlin.Int.() -> kotlin.Int, /*1*/ b: kotlin.Int.() -> kotlin.Int)
public final val a: kotlin.Int.() -> kotlin.Int
public final var b: kotlin.Int.() -> kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/native/inheritance.txt
Vendored
+5 -5
View File
@@ -7,28 +7,28 @@ public open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public external open class B {
public open external class B {
public constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public external final class C : A {
public final external class C : A {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public external final class D : B, I {
public final external class D : B, I {
public constructor D()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
public external final enum class E : kotlin.Enum<E> {
public final external enum class E : kotlin.Enum<E> {
enum entry X
private constructor E()
@@ -45,7 +45,7 @@ public external final enum class E : kotlin.Enum<E> {
public final /*synthesized*/ fun values(): kotlin.Array<E>
}
public external final enum class F : kotlin.Enum<F>, I {
public final external enum class F : kotlin.Enum<F>, I {
enum entry X
private constructor F()
compiler/testData/diagnostics/testsWithJsStdLib/native/inline.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public external val bar: kotlin.Int
public external val baz: kotlin.Int
public external inline fun foo(): kotlin.Unit
public external final class A {
public final external class A {
public constructor A()
public final val bar: kotlin.Int
public final val baz: kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/native/inlineExtensionToNative.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public inline fun A.foo(/*0*/ x: kotlin.Int): kotlin.String
public operator inline fun A.get(/*0*/ x: kotlin.Int): kotlin.String
public operator inline fun A.B.get(/*0*/ x: kotlin.Int): kotlin.String
public external final class A {
public final external class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/native/innerClass.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
package
public external final class C {
public final external class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -14,7 +14,7 @@ public external final class C {
}
}
public external final enum class E : kotlin.Enum<E> {
public final external enum class E : kotlin.Enum<E> {
enum entry X
private constructor E()
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
package
public external final class A {
public final external class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.js.nativeGetter public final fun foo(/*0*/ a: kotlin.Double): kotlin.String?
@@ -20,7 +20,7 @@ public external final class A {
}
}
public external final class B {
public final external class B {
public constructor B()
@kotlin.js.nativeGetter public final val foo: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -50,7 +50,7 @@ public external final class B {
}
}
public external final class C {
public final external class C {
public constructor C()
@kotlin.js.nativeGetter public final fun bar(/*0*/ a: kotlin.String): kotlin.Int
@kotlin.js.nativeGetter public final fun baz(/*0*/ a: kotlin.String = ...): kotlin.Int?
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public external final class A {
public final external class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public external final class A {
public final external class A {
public constructor A()
@kotlin.js.nativeInvoke public final val foo: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public external final class A {
public final external class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
package
public external final class A {
public final external class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit
@@ -24,7 +24,7 @@ public external final class A {
}
}
public external final class B {
public final external class B {
public constructor B()
@kotlin.js.nativeSetter public final val foo: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -54,7 +54,7 @@ public external final class B {
}
}
public external final class C {
public final external class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.js.nativeSetter public final fun foo(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String = ...): kotlin.String
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public external final class A {
public final external class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/native/nested.txt
Vendored
+3 -3
View File
@@ -20,7 +20,7 @@ public final class TopLevel {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public external final class A {
public final external class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ public final class TopLevel {
}
}
public external final class TopLevelNative {
public final external class TopLevelNative {
public constructor TopLevelNative()
public final val x: kotlin.String
public external final val y: kotlin.String
@@ -45,7 +45,7 @@ public external final class TopLevelNative {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public external final class A {
public final external class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public external val boo: kotlin.Int
public external fun bar(): kotlin.Unit
public external fun foo(): kotlin.Unit
public external final class C {
public final external class C {
public constructor C()
public final val baz: kotlin.Int
public final val boo: kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeSetter.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package
@kotlin.js.nativeSetter public fun kotlin.String.bar(/*0*/ n: kotlin.Int, /*1*/ v: kotlin.Any): kotlin.Unit
@kotlin.js.nativeSetter public fun kotlin.String.foo(/*0*/ n: kotlin.Int, /*1*/ v: kotlin.Any): kotlin.Unit
public external final class C {
public final external class C {
public constructor C()
@kotlin.js.nativeSetter public final fun bar(/*0*/ d: kotlin.Double, /*1*/ v: kotlin.Any): kotlin.Any
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/overrideOptionalParam.txt
Vendored
+6 -6
View File
@@ -1,6 +1,6 @@
package
public external open class A {
public open external class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun f(/*0*/ x: kotlin.Int = ...): kotlin.Unit
@@ -24,7 +24,7 @@ public final class BB : A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public external final class C : A {
public final external class C : A {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ fun f(/*0*/ x: kotlin.Int = ...): kotlin.Unit
@@ -32,7 +32,7 @@ public external final class C : A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public external open class D {
public open external class D {
public constructor D()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun f(/*0*/ x: kotlin.Int): kotlin.Unit
@@ -56,7 +56,7 @@ public final class F : D, I {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
public external final class G : D, I {
public final external class G : D, I {
public constructor G()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ fun f(/*0*/ x: kotlin.Int = ...): kotlin.Unit
@@ -100,7 +100,7 @@ public open class X {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public external open class XE {
public open external class XE {
public constructor XE()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun f(/*0*/ x: kotlin.Int): kotlin.Unit
@@ -116,7 +116,7 @@ public final class Y : X, I {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
public external final class YE : XE, I {
public final external class YE : XE, I {
public constructor YE()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*2*/ /*fake_override*/ fun f(/*0*/ x: kotlin.Int = ...): kotlin.Unit
compiler/testData/diagnostics/testsWithJsStdLib/native/privateMembers.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
package
public external final class C {
public final external class C {
public constructor C()
private final val b: kotlin.String
private final var c: kotlin.Float
@@ -23,7 +23,7 @@ public external object O {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public external final class Outer {
public final external class Outer {
public constructor Outer()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/native/propertyParameter.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public external final class C {
public final external class C {
public constructor C(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String)
public final val y: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceAsReifiedTypeArgument.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public fun bar(): kotlin.Unit
public inline fun </*0*/ reified T> foo(/*0*/ x: T): kotlin.Unit
public operator inline fun </*0*/ reified T> C.plus(/*0*/ other: T): C
public external final class C : I {
public final external class C : I {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/native.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package
public external fun foo(/*0*/ a: kotlin.String): kotlin.Int
public external final class Bar {
public final external class Bar {
public constructor Bar(/*0*/ b: kotlin.Int, /*1*/ c: kotlin.Char)
public final fun baz(/*0*/ d: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeGetter.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package
@kotlin.js.nativeGetter public fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int?
public external final class Bar {
public final external class Bar {
public constructor Bar(/*0*/ b: kotlin.Int, /*1*/ c: kotlin.Char)
@kotlin.js.nativeGetter public final fun baz(/*0*/ d: kotlin.Int): kotlin.Any?
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeInvoke.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package
@kotlin.js.nativeInvoke public fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int
public external final class Bar {
public final external class Bar {
public constructor Bar(/*0*/ b: kotlin.Int, /*1*/ c: kotlin.Char)
@kotlin.js.nativeInvoke public final fun baz(/*0*/ d: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeSetter.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package
@kotlin.js.nativeSetter public fun kotlin.Int.foo(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Int
public external final class Bar {
public final external class Bar {
public constructor Bar(/*0*/ b: kotlin.Int, /*1*/ c: kotlin.Char)
@kotlin.js.nativeSetter public final fun baz(/*0*/ d: kotlin.Int, /*1*/ v: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithJsStdLib/native/wrongTarget.txt
Vendored
+3 -3
View File
@@ -3,7 +3,7 @@ package
public val x: kotlin.Int
public val B.x: kotlin.Int
public external final annotation class A : kotlin.Annotation {
public final external annotation class A : kotlin.Annotation {
public constructor A(/*0*/ x: kotlin.Int)
public final val x: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -26,7 +26,7 @@ public final class C {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public external final class D {
public final external class D {
public constructor D()
public final val a: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -34,7 +34,7 @@ public external final class D {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public external final data class E {
public final external data class E {
public constructor E(/*0*/ x: kotlin.Int)
public final val x: kotlin.Int
public final operator /*synthesized*/ fun component1(): kotlin.Int