Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
abca7744
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
abca7744
编写于
11月 29, 2016
作者:
A
Alexey Andreev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support `external` modifier on classes in descriptor renderer. Regenerate test data.
上级
85733b47
变更
21
隐藏空白更改
内联
并排
Showing
21 changed file
with
35 addition
and
34 deletion
+35
-34
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt
...WithJsStdLib/native/nativeGetter/onNativeClassMembers.txt
+3
-3
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt
...ve/nativeGetter/onNestedDeclarationsInsideNativeClass.txt
+1
-1
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt
...WithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt
+1
-1
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt
...ve/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt
+1
-1
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt
...WithJsStdLib/native/nativeSetter/onNativeClassMembers.txt
+3
-3
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt
...ve/nativeSetter/onNestedDeclarationsInsideNativeClass.txt
+1
-1
compiler/testData/diagnostics/testsWithJsStdLib/native/nested.txt
.../testData/diagnostics/testsWithJsStdLib/native/nested.txt
+3
-3
compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.txt
...agnostics/testsWithJsStdLib/native/optionlBody/native.txt
+3
-3
compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeGetter.txt
...ics/testsWithJsStdLib/native/optionlBody/nativeGetter.txt
+1
-1
compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeInvoke.txt
...ics/testsWithJsStdLib/native/optionlBody/nativeInvoke.txt
+1
-1
compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeSetter.txt
...ics/testsWithJsStdLib/native/optionlBody/nativeSetter.txt
+1
-1
compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/castToNativeInterface.txt
...s/testsWithJsStdLib/native/rtti/castToNativeInterface.txt
+1
-1
compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/checkForNativeInterface.txt
...testsWithJsStdLib/native/rtti/checkForNativeInterface.txt
+1
-1
compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceAsReifiedTypeArgument.txt
...dLib/native/rtti/nativeInterfaceAsReifiedTypeArgument.txt
+2
-2
compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/whenIsNativeInterface.txt
...s/testsWithJsStdLib/native/rtti/whenIsNativeInterface.txt
+2
-2
compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/native.txt
...agnostics/testsWithJsStdLib/native/unusedParam/native.txt
+2
-2
compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeGetter.txt
...ics/testsWithJsStdLib/native/unusedParam/nativeGetter.txt
+2
-2
compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeInvoke.txt
...ics/testsWithJsStdLib/native/unusedParam/nativeInvoke.txt
+2
-2
compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeSetter.txt
...ics/testsWithJsStdLib/native/unusedParam/nativeSetter.txt
+2
-2
compiler/testData/diagnostics/testsWithJsStdLib/native/wrongTarget.txt
...Data/diagnostics/testsWithJsStdLib/native/wrongTarget.txt
+1
-1
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
...c/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+1
-0
未找到文件。
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt
浏览文件 @
abca7744
package
public final class A {
public
external
final 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 final class A {
}
}
public final class B {
public
external
final class B {
public constructor B()
@kotlin.js.nativeGetter public final val foo: kotlin.Int = 0
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
...
...
@@ -50,7 +50,7 @@ public final class B {
}
}
public final class C {
public
external
final 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
浏览文件 @
abca7744
package
public final class A {
public
external
final 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
浏览文件 @
abca7744
package
public final class A {
public
external
final class A {
public constructor A()
@kotlin.js.nativeInvoke public final val foo: kotlin.Int = 0
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
...
...
compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt
浏览文件 @
abca7744
package
public final class A {
public
external
final 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
浏览文件 @
abca7744
package
public final class A {
public
external
final 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 final class A {
}
}
public final class B {
public
external
final class B {
public constructor B()
@kotlin.js.nativeSetter public final val foo: kotlin.Int = 0
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
...
...
@@ -54,7 +54,7 @@ public final class B {
}
}
public final class C {
public
external
final 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
浏览文件 @
abca7744
package
public final class A {
public
external
final 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
浏览文件 @
abca7744
...
...
@@ -22,7 +22,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 final class A {
public
external
final 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
...
...
@@ -37,7 +37,7 @@ public final class TopLevel {
}
}
public final class TopLevelNative {
public
external
final class TopLevelNative {
public constructor TopLevelNative()
public final val x: kotlin.String = "a"
public external final val y: kotlin.String
...
...
@@ -49,7 +49,7 @@ public final class TopLevelNative {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final class A {
public
external
final 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
浏览文件 @
abca7744
...
...
@@ -8,7 +8,7 @@ public external fun foo(): kotlin.Unit
public external fun kotlin.String.bar(): kotlin.Int
public external fun kotlin.String.foo(): kotlin.Int
public final class C {
public
external
final class C {
public constructor C()
public final val baz: kotlin.Int
public final val boo: kotlin.Int
...
...
@@ -30,7 +30,7 @@ public final class C {
}
}
public object O {
public
external
object O {
private constructor O()
public final val baz: kotlin.Int
public final val boo: kotlin.Int
...
...
@@ -41,7 +41,7 @@ public object O {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface T {
public
external
interface T {
public abstract val baz: kotlin.Int
public open fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
...
...
compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeGetter.txt
浏览文件 @
abca7744
...
...
@@ -3,7 +3,7 @@ package
@kotlin.js.nativeGetter public fun kotlin.String.bar(/*0*/ n: kotlin.Int): kotlin.Int?
@kotlin.js.nativeGetter public fun kotlin.String.foo(/*0*/ n: kotlin.Int): kotlin.Int?
public interface T {
public
external
interface T {
@kotlin.js.nativeGetter public open fun bar(/*0*/ d: kotlin.Double): kotlin.String?
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.js.nativeGetter public abstract fun foo(/*0*/ d: kotlin.Double): kotlin.String?
...
...
compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeInvoke.txt
浏览文件 @
abca7744
...
...
@@ -3,7 +3,7 @@ package
@kotlin.js.nativeInvoke public fun kotlin.String.bar(): kotlin.Int
@kotlin.js.nativeInvoke public fun kotlin.String.foo(): kotlin.Int
public object O {
public
external
object O {
private constructor O()
@kotlin.js.nativeInvoke public final fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
...
...
compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeSetter.txt
浏览文件 @
abca7744
...
...
@@ -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 final class C {
public
external
final 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/rtti/castToNativeInterface.txt
浏览文件 @
abca7744
...
...
@@ -2,7 +2,7 @@ package
public fun box(/*0*/ a: kotlin.Any, /*1*/ b: kotlin.Any): kotlin.Pair<I, I?>
public interface I {
public
external
interface I {
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
...
...
compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/checkForNativeInterface.txt
浏览文件 @
abca7744
...
...
@@ -2,7 +2,7 @@ package
public fun box(/*0*/ a: kotlin.Any, /*1*/ b: kotlin.Any): kotlin.Boolean
public interface I {
public
external
interface I {
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
...
...
compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceAsReifiedTypeArgument.txt
浏览文件 @
abca7744
...
...
@@ -4,14 +4,14 @@ 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 final class C : I {
public
external
final 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface I {
public
external
interface I {
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
...
...
compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/whenIsNativeInterface.txt
浏览文件 @
abca7744
...
...
@@ -2,13 +2,13 @@ package
public fun box(/*0*/ a: kotlin.Any): kotlin.Int
public interface I {
public
external
interface I {
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 interface J {
public
external
interface J {
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
...
...
compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/native.txt
浏览文件 @
abca7744
...
...
@@ -3,7 +3,7 @@ package
public external fun foo(/*0*/ a: kotlin.String): kotlin.Int
public external fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int
public final class Bar {
public
external
final 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
...
...
@@ -11,7 +11,7 @@ public final class Bar {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public object Obj {
public
external
object Obj {
private constructor Obj()
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/nativeGetter.txt
浏览文件 @
abca7744
...
...
@@ -2,7 +2,7 @@ package
@kotlin.js.nativeGetter public fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int?
public final class Bar {
public
external
final 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
...
...
@@ -10,7 +10,7 @@ public final class Bar {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public object Obj {
public
external
object Obj {
private constructor Obj()
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/nativeInvoke.txt
浏览文件 @
abca7744
...
...
@@ -2,7 +2,7 @@ package
@kotlin.js.nativeInvoke public fun kotlin.Int.foo(/*0*/ a: kotlin.String): kotlin.Int
public final class Bar {
public
external
final 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
...
...
@@ -10,7 +10,7 @@ public final class Bar {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public object Obj {
public
external
object Obj {
private constructor Obj()
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/nativeSetter.txt
浏览文件 @
abca7744
...
...
@@ -2,7 +2,7 @@ package
@kotlin.js.nativeSetter public fun kotlin.Int.foo(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Int
public final class Bar {
public
external
final 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
...
...
@@ -10,7 +10,7 @@ public final class Bar {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public object Obj {
public
external
object Obj {
private constructor Obj()
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/wrongTarget.txt
浏览文件 @
abca7744
...
...
@@ -3,7 +3,7 @@ package
public val x: kotlin.Int
public val B.x: kotlin.Int
public final annotation class A : kotlin.Annotation {
public
external
final annotation class A : kotlin.Annotation {
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
...
...
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
浏览文件 @
abca7744
...
...
@@ -903,6 +903,7 @@ internal class DescriptorRendererImpl(
if
(!
isEnumEntry
)
{
renderVisibility
(
klass
.
visibility
,
builder
)
}
renderExternal
(
klass
,
builder
)
if
(!(
klass
.
kind
==
ClassKind
.
INTERFACE
&&
klass
.
modality
==
Modality
.
ABSTRACT
||
klass
.
kind
.
isSingleton
&&
klass
.
modality
==
Modality
.
FINAL
))
{
renderModality
(
klass
.
modality
,
builder
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录