Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
f7164c5b
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,发现更多精彩内容 >>
提交
f7164c5b
编写于
10月 12, 2015
作者:
M
Michael Bogdanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't rename class property with JvmField annotation, report clashing
上级
b7133285
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
35 addition
and
1 deletion
+35
-1
compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java
...g/jetbrains/kotlin/codegen/context/FieldOwnerContext.java
+4
-1
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.kt
...Lib/annotations/jvmField/clashWithCompanionObjectField.kt
+8
-0
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.txt
...ib/annotations/jvmField/clashWithCompanionObjectField.txt
+17
-0
compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java
...otlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java
+6
-0
未找到文件。
compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java
浏览文件 @
f7164c5b
...
...
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
import
org.jetbrains.kotlin.descriptors.ClassDescriptor
;
import
org.jetbrains.kotlin.descriptors.DeclarationDescriptor
;
import
org.jetbrains.kotlin.descriptors.PropertyDescriptor
;
import
org.jetbrains.kotlin.resolve.jvm.annotations.AnnotationsPackage
;
import
java.util.HashMap
;
import
java.util.Map
;
...
...
@@ -64,7 +65,9 @@ public abstract class FieldOwnerContext<T extends DeclarationDescriptor> extends
String
actualName
=
descriptor2Name
.
get
(
descriptor
);
if
(
actualName
!=
null
)
return
actualName
;
String
newName
=
descriptor2Name
.
isEmpty
()
?
defaultPropertyName
:
defaultPropertyName
+
"$"
+
descriptor2Name
.
size
();
String
newName
=
descriptor2Name
.
isEmpty
()
||
AnnotationsPackage
.
hasJvmFieldAnnotation
(
descriptor
)
?
defaultPropertyName
:
defaultPropertyName
+
"$"
+
descriptor2Name
.
size
();
descriptor2Name
.
put
(
descriptor
,
newName
);
return
newName
;
}
...
...
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.kt
0 → 100644
浏览文件 @
f7164c5b
class
A
{
<!
CONFLICTING_JVM_DECLARATIONS
!>
@JvmField
val
clash
<!>
=
1
;
companion
object
{
<!
CONFLICTING_JVM_DECLARATIONS
!>
val
clash
<!>
=
1
;
}
}
\ No newline at end of file
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.txt
0 → 100644
浏览文件 @
f7164c5b
package
public final class A {
public constructor A()
@kotlin.jvm.JvmField() public final val clash: kotlin.Int = 1
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 companion object Companion {
private constructor Companion()
public final val clash: kotlin.Int = 1
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/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java
浏览文件 @
f7164c5b
...
...
@@ -330,6 +330,12 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
JetTestUtils
.
assertAllTestsPresentByMetadata
(
this
.
getClass
(),
new
File
(
"compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField"
),
Pattern
.
compile
(
"^(.+)\\.kt$"
),
true
);
}
@TestMetadata
(
"clashWithCompanionObjectField.kt"
)
public
void
testClashWithCompanionObjectField
()
throws
Exception
{
String
fileName
=
JetTestUtils
.
navigationMetadata
(
"compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.kt"
);
doTest
(
fileName
);
}
@TestMetadata
(
"inMultiFileFacade.kt"
)
public
void
testInMultiFileFacade
()
throws
Exception
{
String
fileName
=
JetTestUtils
.
navigationMetadata
(
"compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/inMultiFileFacade.kt"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录