From d98b1dfa7ed8f949986ab77aed12506c87228335 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 12 Apr 2019 09:02:02 +0200 Subject: [PATCH] Fix testdata after adding main function to scripts --- compiler/testData/asJava/lightClasses/script/HelloWorld.java | 2 ++ compiler/testData/asJava/lightClasses/script/InnerClasses.java | 2 ++ plugins/uast-kotlin/testData/SimpleScript.log.txt | 3 +++ plugins/uast-kotlin/testData/SimpleScript.render.txt | 1 + 4 files changed, 8 insertions(+) diff --git a/compiler/testData/asJava/lightClasses/script/HelloWorld.java b/compiler/testData/asJava/lightClasses/script/HelloWorld.java index 4535105e778..a653d218be8 100644 --- a/compiler/testData/asJava/lightClasses/script/HelloWorld.java +++ b/compiler/testData/asJava/lightClasses/script/HelloWorld.java @@ -1,3 +1,5 @@ public class HelloWorld extends kotlin.script.templates.standard.ScriptTemplateWithArgs { + public static final void main(java.lang.String[] p) { /* compiled code */ } + public HelloWorld(java.lang.String[] p) { /* compiled code */ } } \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/script/InnerClasses.java b/compiler/testData/asJava/lightClasses/script/InnerClasses.java index a86dda367e1..bd9c476c0ea 100644 --- a/compiler/testData/asJava/lightClasses/script/InnerClasses.java +++ b/compiler/testData/asJava/lightClasses/script/InnerClasses.java @@ -1,4 +1,6 @@ public class InnerClasses extends kotlin.script.templates.standard.ScriptTemplateWithArgs { + public static final void main(java.lang.String[] p) { /* compiled code */ } + public InnerClasses(java.lang.String[] p) { /* compiled code */ } public static final class Bar { diff --git a/plugins/uast-kotlin/testData/SimpleScript.log.txt b/plugins/uast-kotlin/testData/SimpleScript.log.txt index 06fb6f860d3..89ef5ba5c51 100644 --- a/plugins/uast-kotlin/testData/SimpleScript.log.txt +++ b/plugins/uast-kotlin/testData/SimpleScript.log.txt @@ -12,6 +12,9 @@ UFile (package = ) USimpleNameReferenceExpression (identifier = , resolvesTo = Bar) ULiteralExpression (value = 42) ULiteralExpression (value = null) + UAnnotationMethod (name = main) + UParameter (name = p) + UAnnotation (fqName = null) UAnnotationMethod (name = SimpleScript) UParameter (name = p) UAnnotation (fqName = null) diff --git a/plugins/uast-kotlin/testData/SimpleScript.render.txt b/plugins/uast-kotlin/testData/SimpleScript.render.txt index 139f56f9260..e31b3d4a69d 100644 --- a/plugins/uast-kotlin/testData/SimpleScript.render.txt +++ b/plugins/uast-kotlin/testData/SimpleScript.render.txt @@ -2,6 +2,7 @@ public class SimpleScript { public final fun getBarOrNull(@org.jetbrains.annotations.NotNull flag: boolean) : SimpleScript.Bar { return if (flag) (42) else null } + public static final fun main(@null p: java.lang.String[]) : void = UastEmptyExpression public fun SimpleScript(@null p: java.lang.String[]) { println("Hello World!") getBarOrNull(true)