172: Revert "Uast: making AbstractKotlinUClass not inherit from AbstractJavaUClass"

This reverts commit d35f79963c810365451f09e98c148f9ce7fc3263.
2018-01-11 20:11:45 +03:00
parent f9af79c6d9
commit 57789b8c3d
7 changed files with 81 additions and 39 deletions
@@ -0,0 +1,25 @@
+public class SimpleScript : kotlin.script.templates.standard.ScriptTemplateWithArgs {
+    public final fun getBarOrNull(@org.jetbrains.annotations.NotNull flag: boolean) : SimpleScript.Bar {
+        return if (flag) <init>(42) else null
+    }
+    public fun SimpleScript(@null p: java.lang.String[]) {
+        println("Hello World!")
+        getBarOrNull(true)
+        println("Goodbye World!")
+    }
+    public static final class Bar {
+        @org.jetbrains.annotations.NotNull private final var b: int = 0
+        @org.jetbrains.annotations.NotNull private final var a: int
+        public final fun getB() : int = UastEmptyExpression
+        public final fun getAPlusB() : int {
+            return a + b
+        }
+        public final fun getA() : int = UastEmptyExpression
+        public fun Bar(@org.jetbrains.annotations.NotNull a: int) = UastEmptyExpression
+        public static final class Baz {
+            public final fun doSomething() : void {
+            }
+            public fun Baz() = UastEmptyExpression
+        }
+    }
+}
@@ -0,0 +1,39 @@
+UFile (package = ) [public abstract interface Callback {...]
+    UClass (name = Callback) [public abstract interface Callback {...}]
+        UAnnotationMethod (name = onError) [public abstract fun onError(@org.jetbrains.annotations.NotNull throwable: java.lang.Throwable) : void = UastEmptyExpression]
+            UParameter (name = throwable) [@org.jetbrains.annotations.NotNull var throwable: java.lang.Throwable]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+    UClass (name = Model) [public final class Model {...}]
+        UAnnotationMethod (name = crashMe) [public final fun crashMe(@org.jetbrains.annotations.NotNull clazz: java.lang.Class<T>, @org.jetbrains.annotations.NotNull factory: kotlin.jvm.functions.Function0<? extends T>) : void {...}]
+            UParameter (name = clazz) [@org.jetbrains.annotations.NotNull var clazz: java.lang.Class<T>]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = factory) [@org.jetbrains.annotations.NotNull var factory: kotlin.jvm.functions.Function0<? extends T>]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] : PsiType:Void
+                UThrowExpression [throw <init>()] : PsiType:Void
+                    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) [<init>()] : PsiType:UnsupportedOperationException
+                        UIdentifier (Identifier (UnsupportedOperationException)) [UIdentifier (Identifier (UnsupportedOperationException))]
+                        USimpleNameReferenceExpression (identifier = <init>) [<init>] : PsiType:UnsupportedOperationException
+        UAnnotationMethod (name = Model) [public fun Model() {...}]
+            UBlockExpression [{...}]
+                UBlockExpression [{...}] : PsiType:Unit
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) [crashMe(Callback.java, { ...})] : PsiType:Unit
+                        UIdentifier (Identifier (crashMe)) [UIdentifier (Identifier (crashMe))]
+                        USimpleNameReferenceExpression (identifier = crashMe) [crashMe] : PsiType:Unit
+                        UQualifiedReferenceExpression [Callback.java] : PsiType:Class<Callback>
+                            UClassLiteralExpression [Callback] : PsiType:KClass<Callback>
+                            USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Class<Callback>
+                        ULambdaExpression [{ ...}] : PsiType:<ErrorType>
+                            UBlockExpression [{...}]
+                                UObjectLiteralExpression [anonymous object : Callback {...            }] : PsiType:Callback
+                                    UClass (name = null) [final class null {...}]
+                                        UAnnotationMethod (name = onError) [public fun onError(@org.jetbrains.annotations.NotNull throwable: java.lang.Throwable) : void {...}]
+                                            UParameter (name = throwable) [@org.jetbrains.annotations.NotNull var throwable: java.lang.Throwable]
+                                                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+                                            UBlockExpression [{...}] : PsiType:Void
+                                                UThrowExpression [throw <init>("")] : PsiType:Void
+                                                    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) [<init>("")] : PsiType:UnsupportedOperationException
+                                                        UIdentifier (Identifier (UnsupportedOperationException)) [UIdentifier (Identifier (UnsupportedOperationException))]
+                                                        USimpleNameReferenceExpression (identifier = <init>) [<init>] : PsiType:UnsupportedOperationException
+                                                        ULiteralExpression (value = "") [""] : PsiType:String
+                                        UAnnotationMethod (name = Model$1$1) [fun Model$1$1() = UastEmptyExpression]