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

Merge branch 'decompiler'

Browse Source 
Conflicts:
	compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
	compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
	compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
This commit is contained in:
Evgeny Gerashchenko
2012-03-14 14:50:04 +04:00
parent fe26a1de9e 6a8dfc555e
commit af9f00c177
40 changed files with 1034 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/libraries/AbstractClass.kt
+7
View File
@@ -0,0 +1,7 @@
// IntelliJ API Decompiler stub source generated from a class file
// Implementation of methods is not available
package testData.libraries
[abstract class AbstractClass {
}]
idea/testData/libraries/ClassWithAbstractAndOpenMembers.kt
+22
View File
@@ -0,0 +1,22 @@
// IntelliJ API Decompiler stub source generated from a class file
// Implementation of methods is not available
package testData.libraries
[abstract class ClassWithAbstractAndOpenMembers {
[abstract fun abstractFun() : Unit]
[open fun openFun() : Unit { /* compiled code */ }]
[abstract val abstractVal : jet.String]
[open val openVal : jet.String] /* compiled code */
[open val openValWithGetter : jet.String] /* compiled code */
[abstract var abstractVar : jet.String]
[open var openVar : jet.String] /* compiled code */
[open var openVarWithGetter : jet.String] /* compiled code */
}]
idea/testData/libraries/Color.kt
+8
View File
@@ -0,0 +1,8 @@
// IntelliJ API Decompiler stub source generated from a class file
// Implementation of methods is not available
package testData.libraries
[class Color {
[val rgb : jet.Int] /* compiled code */
}]
idea/testData/libraries/SimpleClass.kt
+7
View File
@@ -0,0 +1,7 @@
// IntelliJ API Decompiler stub source generated from a class file
// Implementation of methods is not available
package testData.libraries
[class SimpleClass {
}]
idea/testData/libraries/SimpleTrait.kt
+7
View File
@@ -0,0 +1,7 @@
// IntelliJ API Decompiler stub source generated from a class file
// Implementation of methods is not available
package testData.libraries
[trait SimpleTrait {
}]
idea/testData/libraries/SimpleTraitImpl.kt
+7
View File
@@ -0,0 +1,7 @@
// IntelliJ API Decompiler stub source generated from a class file
// Implementation of methods is not available
package testData.libraries
[class SimpleTraitImpl : testData.libraries.SimpleTrait {
}]
idea/testData/libraries/WithInnerAndObject.kt
+16
View File
@@ -0,0 +1,16 @@
// IntelliJ API Decompiler stub source generated from a class file
// Implementation of methods is not available
package testData.libraries
[class WithInnerAndObject {
class object {
[fun foo() : Unit { /* compiled code */ }]
}
[class MyInner {
[trait MyInnerInner {
[abstract fun innerInnerMethod() : Unit]
}]
}]
}]
idea/testData/libraries/WithTraitClassObject.kt
+9
View File
@@ -0,0 +1,9 @@
// IntelliJ API Decompiler stub source generated from a class file
// Implementation of methods is not available
package testData.libraries
[class WithTraitClassObject {
class object : testData.libraries.SimpleTrait {
}
}]
idea/testData/libraries/library/library.kt
+68
View File
@@ -0,0 +1,68 @@
package testData.libraries
trait SimpleTrait {
}
class SimpleClass {
}
class SimpleTraitImpl : SimpleTrait {
}
class WithInnerAndObject {
class object {
fun foo() {
}
}
class MyInner {
trait MyInnerInner {
fun innerInnerMethod()
}
}
}
class WithTraitClassObject {
class object : SimpleTrait
}
abstract class AbstractClass {
}
enum class Color(val rgb : Int) {
RED : Color(0xFF0000)
GREEN : Color(0x00FF00)
BLUE : Color(0x0000FF)
}
abstract class ClassWithAbstractAndOpenMembers {
abstract fun abstractFun()
open fun openFun() {
}
abstract val abstractVal : String
open val openVal : String = ""
open val openValWithGetter : String
get() {
return "239"
}
abstract var abstractVar : String
open var openVar : String = ""
open var openVarWithGetter : String
get() {
return "239"
}
set(value) {
}
}
fun main(args : Array<String>) {
}
val globalVal : #(Int, String) = #(239, "239")
val globalValWithGetter : Long
get() {
return System.currentTimeMillis()
}
idea/testData/libraries/namespace.kt
+10
View File
@@ -0,0 +1,10 @@
// IntelliJ API Decompiler stub source generated from a class file
// Implementation of methods is not available
package testData.libraries
[fun main(val args : jet.Array<jet.String>) : Unit { /* compiled code */ }]
[val globalVal : #(jet.Int, jet.String)] /* compiled code */
[val globalValWithGetter : jet.Long] /* compiled code */
idea/testData/parameterInfo/functionParameterInfo/InheritedFunctions.kt
+2 -2
View File
@@ -9,6 +9,6 @@ class B(): A(5) {
}
}
/*
Text: (x: Int), Disabled: true, Strikeout: false, Green: false
Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
Text: (x: jet.Int), Disabled: true, Strikeout: false, Green: false
Text: (x: jet.Int, y: jet.Boolean), Disabled: false, Strikeout: false, Green: true
*/
idea/testData/parameterInfo/functionParameterInfo/InheritedWithCurrentFunctions.kt
+3 -3
View File
@@ -9,7 +9,7 @@ class B(): A(5) {
}
}
/*
Text: (x: Int), Disabled: true, Strikeout: false, Green: false
Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
Text: (x: Int, y: Boolean, z: String), Disabled: false, Strikeout: false, Green: false
Text: (x: jet.Int), Disabled: true, Strikeout: false, Green: false
Text: (x: jet.Int, y: jet.Boolean), Disabled: false, Strikeout: false, Green: true
Text: (x: jet.Int, y: jet.Boolean, z: jet.String), Disabled: false, Strikeout: false, Green: false
*/
idea/testData/parameterInfo/functionParameterInfo/NamedAndDefaultParameter.kt
+2 -2
View File
@@ -7,6 +7,6 @@ open class A(x: Int) {
}
}
/*
Text: ([x: Int]), Disabled: false, Strikeout: false, Green: false
Text: ([y: Boolean = true], [x: Int], [z: Long = 1234567...]), Disabled: false, Strikeout: false, Green: true
Text: ([x: jet.Int]), Disabled: false, Strikeout: false, Green: false
Text: ([y: jet.Boolean = true], [x: jet.Int], [z: jet.Long = 1234567...]), Disabled: false, Strikeout: false, Green: true
*/
idea/testData/parameterInfo/functionParameterInfo/NamedParameter.kt
+2 -2
View File
@@ -7,6 +7,6 @@ open class A(x: Int) {
}
}
/*
Text: ([x: Int]), Disabled: true, Strikeout: false, Green: false
Text: ([x: Int], [y: Boolean]), Disabled: false, Strikeout: false, Green: true
Text: ([x: jet.Int]), Disabled: true, Strikeout: false, Green: false
Text: ([x: jet.Int], [y: jet.Boolean]), Disabled: false, Strikeout: false, Green: true
*/
idea/testData/parameterInfo/functionParameterInfo/NamedParameter2.kt
+2 -2
View File
@@ -7,6 +7,6 @@ open class A(x: Int) {
}
}
/*
Text: ([x: Int]), Disabled: false, Strikeout: false, Green: false
Text: ([y: Boolean], [x: Int]), Disabled: false, Strikeout: false, Green: true
Text: ([x: jet.Int]), Disabled: false, Strikeout: false, Green: false
Text: ([y: jet.Boolean], [x: jet.Int]), Disabled: false, Strikeout: false, Green: true
*/
idea/testData/parameterInfo/functionParameterInfo/NotGreen.kt
+2 -2
View File
@@ -7,6 +7,6 @@ open class A(x: Int) {
}
}
/*
Text: (x: Int), Disabled: false, Strikeout: false, Green: false
Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: false
Text: (x: jet.Int), Disabled: false, Strikeout: false, Green: false
Text: (x: jet.Int, y: jet.Boolean), Disabled: false, Strikeout: false, Green: false
*/
idea/testData/parameterInfo/functionParameterInfo/NullableTypeCall.kt
+2 -2
View File
@@ -14,6 +14,6 @@ fun f() {
}
}
/*
Text: (x: Int), Disabled: false, Strikeout: false, Green: false
Text: (x: Int, y: Int), Disabled: false, Strikeout: false, Green: false
Text: (x: jet.Int), Disabled: false, Strikeout: false, Green: false
Text: (x: jet.Int, y: jet.Int), Disabled: false, Strikeout: false, Green: false
*/
idea/testData/parameterInfo/functionParameterInfo/Println.kt
+2 -2
View File
@@ -9,6 +9,6 @@ open class A(x: Int) {
}
/*
Text: (<no parameters>), Disabled: false, Strikeout: false, Green: true
Text: (x: Boolean), Disabled: false, Strikeout: false, Green: false
Text: (x: String), Disabled: false, Strikeout: false, Green: false
Text: (x: jet.Boolean), Disabled: false, Strikeout: false, Green: false
Text: (x: jet.String), Disabled: false, Strikeout: false, Green: false
*/
idea/testData/parameterInfo/functionParameterInfo/Simple.kt
+1 -1
View File
@@ -5,4 +5,4 @@ open class A(x: Int) {
m(<caret>1, false)
}
}
//Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
//Text: (x: jet.Int, y: jet.Boolean), Disabled: false, Strikeout: false, Green: true
idea/testData/parameterInfo/functionParameterInfo/SimpleConstructor.kt
+1 -1
View File
@@ -6,4 +6,4 @@ class B(): A(5) {
A(<caret>3)
}
}
//Text: (x: Int), Disabled: false, Strikeout: false, Green: true
//Text: (x: jet.Int), Disabled: false, Strikeout: false, Green: true
idea/testData/parameterInfo/functionParameterInfo/SuperConstructorCall.kt
+1 -1
View File
@@ -6,4 +6,4 @@ class B(): A(<caret>5) {
A(3)
}
}
//Text: (x: Int), Disabled: false, Strikeout: false, Green: true
//Text: (x: jet.Int), Disabled: false, Strikeout: false, Green: true
idea/testData/parameterInfo/functionParameterInfo/TwoFunctions.kt
+2 -2
View File
@@ -7,6 +7,6 @@ open class A(x: Int) {
}
}
/*
Text: (x: Int), Disabled: false, Strikeout: false, Green: false
Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
Text: (x: jet.Int), Disabled: false, Strikeout: false, Green: false
Text: (x: jet.Int, y: jet.Boolean), Disabled: false, Strikeout: false, Green: true
*/
idea/testData/parameterInfo/functionParameterInfo/TwoFunctionsGrey.kt
+2 -2
View File
@@ -7,6 +7,6 @@ open class A(x: Int) {
}
}
/*
Text: (x: Int), Disabled: true, Strikeout: false, Green: false
Text: (x: Int, y: Boolean), Disabled: false, Strikeout: false, Green: true
Text: (x: jet.Int), Disabled: true, Strikeout: false, Green: false
Text: (x: jet.Int, y: jet.Boolean), Disabled: false, Strikeout: false, Green: true
*/