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

Fixed tests related to changes in DescriptorRenderer.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-03-16 17:00:59 +04:00
parent 1157ab6d5d
commit ba841816c8
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+1 -1
View File
@@ -401,7 +401,7 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
} }
public void renderClassDescriptor(ClassDescriptor descriptor, StringBuilder builder, String keyword) { public void renderClassDescriptor(ClassDescriptor descriptor, StringBuilder builder, String keyword) {
if (descriptor.getKind() != ClassKind.TRAIT) { if (descriptor.getKind() != ClassKind.TRAIT && descriptor.getKind() != ClassKind.OBJECT) {
renderModality(descriptor.getModality(), builder); renderModality(descriptor.getModality(), builder);
} }
builder.append(renderKeyword(keyword)); builder.append(renderKeyword(keyword));
idea/testData/libraries/Color.kt
+2 -2
View File
@@ -3,6 +3,6 @@
package testData.libraries package testData.libraries
[class Color { [final class Color {
[val rgb : jet.Int] /* compiled code */ [final val rgb : jet.Int] /* compiled code */
}] }]
idea/testData/libraries/SimpleClass.kt
+1 -1
View File
@@ -3,5 +3,5 @@
package testData.libraries package testData.libraries
[class SimpleClass { [final class SimpleClass {
}] }]
idea/testData/libraries/SimpleTraitImpl.kt
+1 -1
View File
@@ -3,5 +3,5 @@
package testData.libraries package testData.libraries
[class SimpleTraitImpl : testData.libraries.SimpleTrait { [final class SimpleTraitImpl : testData.libraries.SimpleTrait {
}] }]
idea/testData/libraries/WithInnerAndObject.kt
+3 -3
View File
@@ -3,12 +3,12 @@
package testData.libraries package testData.libraries
[class WithInnerAndObject { [final class WithInnerAndObject {
class object { class object {
[fun foo() : Unit { /* compiled code */ }] [final fun foo() : Unit { /* compiled code */ }]
} }
[class MyInner { [final class MyInner {
[trait MyInnerInner { [trait MyInnerInner {
[abstract fun innerInnerMethod() : Unit] [abstract fun innerInnerMethod() : Unit]
}] }]
idea/testData/libraries/WithTraitClassObject.kt
+1 -1
View File
@@ -3,7 +3,7 @@
package testData.libraries package testData.libraries
[class WithTraitClassObject { [final class WithTraitClassObject {
class object : testData.libraries.SimpleTrait { class object : testData.libraries.SimpleTrait {
} }
}] }]
idea/testData/libraries/namespace.kt
+3 -3
View File
@@ -3,8 +3,8 @@
package testData.libraries package testData.libraries
[fun main(val args : jet.Array<jet.String>) : Unit { /* compiled code */ }] [final fun main(val args : jet.Array<jet.String>) : Unit { /* compiled code */ }]
[val globalVal : #(jet.Int, jet.String)] /* compiled code */ [final val globalVal : #(jet.Int, jet.String)] /* compiled code */
[val globalValWithGetter : jet.Long] /* compiled code */ [final val globalValWithGetter : jet.Long] /* compiled code */