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

Rendering package FQ names instead of short names.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-12-04 17:43:32 +04:00
parent 212d303c7b
commit e175ebf60a
28 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
+1 -1
View File
@@ -12,6 +12,6 @@ public trait StringConstantInParam : java.lang.Object {
}
}
package StringConstantInParam {
package test.StringConstantInParam {
public val HEL: jet.String
}
compiler/testData/loadJava/compiledJava/sam/Nested.txt
+2 -2
View File
@@ -22,10 +22,10 @@ public trait Nested : java.lang.Object {
}
}
package Nested {
package test.Nested {
public /*synthesized*/ fun Runnable(/*0*/ function: () -> jet.Unit): test.Nested.Runnable
package Deeper2 {
package test.Nested.Deeper2 {
public /*synthesized*/ fun Runnable(/*0*/ function: () -> jet.Unit): test.Nested.Deeper2.Runnable
}
}
compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt
+1 -1
View File
@@ -15,7 +15,7 @@ public trait SamSubinterfaceOfTwo : java.lang.Object {
}
}
package SamSubinterfaceOfTwo {
package test.SamSubinterfaceOfTwo {
public /*synthesized*/ fun Sub(/*0*/ function: () -> jet.String?): test.SamSubinterfaceOfTwo.Sub
public /*synthesized*/ fun Super1(/*0*/ function: () -> jet.CharSequence?): test.SamSubinterfaceOfTwo.Super1
public /*synthesized*/ fun </*0*/ T> Super2(/*0*/ function: () -> T?): test.SamSubinterfaceOfTwo.Super2<T>
compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt
+1 -1
View File
@@ -6,7 +6,7 @@ public open class Basic : java.lang.Object {
public open fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
}
package Basic {
package test.Basic {
public /*synthesized*/ fun bar(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public open fun bar(/*0*/ p0: java.lang.Runnable?): jet.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt
+1 -1
View File
@@ -13,7 +13,7 @@ public trait DeepSamLoop : java.lang.Object {
}
}
package DeepSamLoop {
package test.DeepSamLoop {
public /*synthesized*/ fun Bar(/*0*/ function: (test.DeepSamLoop.Foo?) -> jet.Unit): test.DeepSamLoop.Bar
public /*synthesized*/ fun Foo(/*0*/ function: (test.DeepSamLoop.Bar?) -> jet.Unit): test.DeepSamLoop.Foo
}
compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt
+1 -1
View File
@@ -4,7 +4,7 @@ public open class SeveralSamParameters : java.lang.Object {
public constructor SeveralSamParameters()
}
package SeveralSamParameters {
package test.SeveralSamParameters {
public /*synthesized*/ fun findMaxAndInvokeCallback(/*0*/ p0: ((jet.String, jet.String) -> jet.Int)?, /*1*/ p1: jet.String?, /*2*/ p2: jet.String?, /*3*/ p3: (() -> jet.Unit)?): jet.String?
public open fun findMaxAndInvokeCallback(/*0*/ p0: java.util.Comparator<jet.String>?, /*1*/ p1: jet.String?, /*2*/ p2: jet.String?, /*3*/ p3: java.lang.Runnable?): jet.String?
}
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt
+1 -1
View File
@@ -4,7 +4,7 @@ public open class TypeParameterOfMethod : java.lang.Object {
public constructor TypeParameterOfMethod()
}
package TypeParameterOfMethod {
package test.TypeParameterOfMethod {
public /*synthesized*/ fun </*0*/ T> max(/*0*/ p0: ((T, T) -> jet.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T?
public open fun </*0*/ T> max(/*0*/ p0: java.util.Comparator<T>?, /*1*/ p1: T?, /*2*/ p2: T?): T?
public /*synthesized*/ fun </*0*/ T : jet.CharSequence?> max2(/*0*/ p0: ((T, T) -> jet.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T?
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt
+1 -1
View File
@@ -13,6 +13,6 @@ public trait AdapterDoesntOverrideDeclaration : java.lang.Object {
}
}
package AdapterDoesntOverrideDeclaration {
package test.AdapterDoesntOverrideDeclaration {
public /*synthesized*/ fun Super(/*0*/ function: ((() -> jet.Unit)?) -> jet.Unit): test.AdapterDoesntOverrideDeclaration.Super
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt
+1 -1
View File
@@ -18,7 +18,7 @@ public trait InheritedSameAdapters : java.lang.Object {
}
}
package InheritedSameAdapters {
package test.InheritedSameAdapters {
public /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable?) -> jet.Unit): test.InheritedSameAdapters.Sub
public /*synthesized*/ fun Super1(/*0*/ function: (java.lang.Runnable?) -> jet.Unit): test.InheritedSameAdapters.Super1
public /*synthesized*/ fun Super2(/*0*/ function: (java.lang.Runnable?) -> jet.Unit): test.InheritedSameAdapters.Super2
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt
+1 -1
View File
@@ -23,7 +23,7 @@ public trait InheritedSameAdaptersWithSubstitution : java.lang.Object {
}
}
package InheritedSameAdaptersWithSubstitution {
package test.InheritedSameAdaptersWithSubstitution {
public /*synthesized*/ fun Sub(/*0*/ function: (java.util.Comparator<jet.String>?) -> jet.Unit): test.InheritedSameAdaptersWithSubstitution.Sub
public /*synthesized*/ fun Super1(/*0*/ function: (java.util.Comparator<jet.String>?) -> jet.Unit): test.InheritedSameAdaptersWithSubstitution.Super1
public /*synthesized*/ fun </*0*/ T> Super2(/*0*/ function: (java.util.Comparator<T>?) -> jet.Unit): test.InheritedSameAdaptersWithSubstitution.Super2<T>
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt
+1 -1
View File
@@ -13,7 +13,7 @@ public trait InheritedSimple : java.lang.Object {
}
}
package InheritedSimple {
package test.InheritedSimple {
public /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable?) -> jet.Unit): test.InheritedSimple.Sub
public /*synthesized*/ fun Super(/*0*/ function: (java.lang.Runnable?) -> jet.Unit): test.InheritedSimple.Super
}
compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
+1 -1
View File
@@ -13,6 +13,6 @@ public open class RawSuperType : java.lang.Object {
}
}
package RawSuperType {
package test.RawSuperType {
public /*synthesized*/ fun </*0*/ T> Super(/*0*/ function: (T?) -> jet.Unit): test.RawSuperType.Super<T>
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
+1 -1
View File
@@ -15,6 +15,6 @@ public trait TwoSuperclassesInconsistentGenericTypes : java.lang.Object {
}
}
package TwoSuperclassesInconsistentGenericTypes {
package test.TwoSuperclassesInconsistentGenericTypes {
public /*synthesized*/ fun Other(/*0*/ function: () -> jet.MutableList<jet.String>?): test.TwoSuperclassesInconsistentGenericTypes.Other
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
+1 -1
View File
@@ -16,7 +16,7 @@ public trait TwoSuperclassesVarargAndNot : java.lang.Object {
}
}
package TwoSuperclassesVarargAndNot {
package test.TwoSuperclassesVarargAndNot {
public /*synthesized*/ fun Super1(/*0*/ function: (jet.Array<jet.String?>) -> jet.Unit): test.TwoSuperclassesVarargAndNot.Super1
public /*synthesized*/ fun Super2(/*0*/ function: (jet.Array<out jet.String?>?) -> jet.Unit): test.TwoSuperclassesVarargAndNot.Super2
}
compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt
+3 -3
View File
@@ -12,11 +12,11 @@ public open class DeeplyNestedStatic : java.lang.Object {
}
}
package DeeplyNestedStatic {
package test.DeeplyNestedStatic {
package Foo {
package test.DeeplyNestedStatic.Foo {
package Bar {
package test.DeeplyNestedStatic.Foo.Bar {
public open fun method(): jet.Unit
}
}
compiler/testData/loadJava/compiledJava/static/Simple.txt
+1 -1
View File
@@ -5,6 +5,6 @@ public open class Simple : java.lang.Object {
public open fun foo(): jet.Unit
}
package Simple {
package test.Simple {
public open fun bar(): jet.Unit
}
compiler/testData/loadJava/compiledJava/static/StaticFinal.txt
+1 -1
View File
@@ -4,6 +4,6 @@ public open class StaticFinal : java.lang.Object {
public constructor StaticFinal()
}
package StaticFinal {
package test.StaticFinal {
public val foo: jet.String
}
compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
+1 -1
View File
@@ -24,7 +24,7 @@ public final enum class StaticMembersInEnum : jet.Enum<test.StaticMembersInEnum>
}
}
package StaticMembersInEnum {
package test.StaticMembersInEnum {
public val CONSTANT: test.StaticMembersInEnum
public var STATIC_FIELD: jet.Int
public open fun foo(): jet.Unit