From 4c4d6a4ad477a5628829c2fe4b2eae0c3ab25327 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 13 Oct 2016 20:28:36 +0300 Subject: [PATCH] Temporary remove outdated Uast tests --- .../jetbrains/uast/AbstractStructureTest.kt | 65 --- .../test/org/jetbrains/uast/StructureTest.kt | 24 - .../uast-java/testData/ControlStructures.java | 29 -- plugins/uast-java/testData/Lambda.java | 13 - plugins/uast-java/testData/NestedClasses.java | 13 - plugins/uast-java/testData/Simple.java | 15 - .../testData/SpecialExpressions.java | 54 --- .../testData/log/ControlStructures.txt | 103 ---- plugins/uast-java/testData/log/Lambda.txt | 30 -- .../uast-java/testData/log/NestedClasses.txt | 10 - plugins/uast-java/testData/log/Simple.txt | 23 - .../testData/log/SpecialExpressions.txt | 126 ----- .../testData/render/ControlStructures.txt | 32 -- plugins/uast-java/testData/render/Lambda.txt | 17 - .../testData/render/NestedClasses.txt | 13 - plugins/uast-java/testData/render/Simple.txt | 17 - .../testData/render/SpecialExpressions.txt | 64 --- .../AbstractKotlinUastStructureTest.kt | 72 --- .../KotlinUastStructureTest.kt | 25 - .../uast-kotlin/testData/ControlStructures.kt | 120 ----- plugins/uast-kotlin/testData/Declarations.kt | 26 - plugins/uast-kotlin/testData/Simple.kt | 8 - .../testData/log/ControlStructures.txt | 363 -------------- .../uast-kotlin/testData/log/Declarations.txt | 41 -- plugins/uast-kotlin/testData/log/Simple.txt | 25 - .../testData/render/ControlStructures.txt | 164 ------- .../testData/render/Declarations.txt | 42 -- .../uast-kotlin/testData/render/Simple.txt | 11 - .../testData/tree/ControlStructures.txt | 448 ------------------ .../testData/tree/Declarations.txt | 67 --- plugins/uast-kotlin/testData/tree/Simple.txt | 36 -- 31 files changed, 2096 deletions(-) delete mode 100644 plugins/uast-java/test/org/jetbrains/uast/AbstractStructureTest.kt delete mode 100644 plugins/uast-java/test/org/jetbrains/uast/StructureTest.kt delete mode 100644 plugins/uast-java/testData/ControlStructures.java delete mode 100644 plugins/uast-java/testData/Lambda.java delete mode 100644 plugins/uast-java/testData/NestedClasses.java delete mode 100644 plugins/uast-java/testData/Simple.java delete mode 100644 plugins/uast-java/testData/SpecialExpressions.java delete mode 100644 plugins/uast-java/testData/log/ControlStructures.txt delete mode 100644 plugins/uast-java/testData/log/Lambda.txt delete mode 100644 plugins/uast-java/testData/log/NestedClasses.txt delete mode 100644 plugins/uast-java/testData/log/Simple.txt delete mode 100644 plugins/uast-java/testData/log/SpecialExpressions.txt delete mode 100644 plugins/uast-java/testData/render/ControlStructures.txt delete mode 100644 plugins/uast-java/testData/render/Lambda.txt delete mode 100644 plugins/uast-java/testData/render/NestedClasses.txt delete mode 100644 plugins/uast-java/testData/render/Simple.txt delete mode 100644 plugins/uast-java/testData/render/SpecialExpressions.txt delete mode 100644 plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/AbstractKotlinUastStructureTest.kt delete mode 100644 plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/KotlinUastStructureTest.kt delete mode 100644 plugins/uast-kotlin/testData/ControlStructures.kt delete mode 100644 plugins/uast-kotlin/testData/Declarations.kt delete mode 100644 plugins/uast-kotlin/testData/Simple.kt delete mode 100644 plugins/uast-kotlin/testData/log/ControlStructures.txt delete mode 100644 plugins/uast-kotlin/testData/log/Declarations.txt delete mode 100644 plugins/uast-kotlin/testData/log/Simple.txt delete mode 100644 plugins/uast-kotlin/testData/render/ControlStructures.txt delete mode 100644 plugins/uast-kotlin/testData/render/Declarations.txt delete mode 100644 plugins/uast-kotlin/testData/render/Simple.txt delete mode 100644 plugins/uast-kotlin/testData/tree/ControlStructures.txt delete mode 100644 plugins/uast-kotlin/testData/tree/Declarations.txt delete mode 100644 plugins/uast-kotlin/testData/tree/Simple.txt diff --git a/plugins/uast-java/test/org/jetbrains/uast/AbstractStructureTest.kt b/plugins/uast-java/test/org/jetbrains/uast/AbstractStructureTest.kt deleted file mode 100644 index c7269e68907..00000000000 --- a/plugins/uast-java/test/org/jetbrains/uast/AbstractStructureTest.kt +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jetbrains.uast - -import com.intellij.psi.JavaPsiFacade -import com.intellij.psi.PsiClass -import com.intellij.testFramework.LightCodeInsightTestCase -import com.intellij.testFramework.LightPlatformTestCase -import java.io.File - -open class AbstractStructureTest : LightCodeInsightTestCase() { - fun test(name: String) { -// val testDir = testDataPath -// val javaFile = File(testDir, "$name.java") -// val logFile = File(File(testDir, "log"), "$name.txt") -// val renderFile = File(File(testDir, "render"), "$name.txt") -// -// val psiClass = createClass(javaFile.readText()) -// val uElement = JavaConverter.convertWithParent(psiClass) ?: error("UFile was not created") -// val uFile = uElement.getContainingFile() ?: error("No containing file") -// try { -// assertEqualsFile(uFile.logString(), logFile) -// } catch (e: NoTestFileException) { -// assertEqualsFile(uFile.renderString(), renderFile) -// throw e -// } -// assertEqualsFile(uFile.renderString(), renderFile) - } - - private fun createClass(text: String): PsiClass { - val factory = JavaPsiFacade.getInstance(LightPlatformTestCase.ourProject).elementFactory - val classA = factory.createClassFromText(text, null).innerClasses[0] - return classA - } - - private fun assertEqualsFile(text: String, file: File) { - if (!file.exists()) { - file.parentFile.mkdirs() - file.writeText(text) - throw NoTestFileException(file) - } else { - val lineSeparator = System.getProperty("line.separator") ?: "\n" - val expected = file.readLines().map { it.trimEnd() }.joinToString(lineSeparator).trim() - val actual = text.lines().map { it.trimEnd() }.joinToString(lineSeparator).trim() - assertEquals(expected, actual) - } - } - - private class NoTestFileException(file: File) : RuntimeException("Test file was generated: $file") - - override fun getTestDataPath() = "plugins/uast-java/testData" -} \ No newline at end of file diff --git a/plugins/uast-java/test/org/jetbrains/uast/StructureTest.kt b/plugins/uast-java/test/org/jetbrains/uast/StructureTest.kt deleted file mode 100644 index 97f1333396d..00000000000 --- a/plugins/uast-java/test/org/jetbrains/uast/StructureTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jetbrains.uast - -class StructureTest : AbstractStructureTest() { - fun testSimple() = test("Simple") - fun testControlStructures() = test("ControlStructures") - fun testNestedClasses() = test("NestedClasses") - fun testSpecialExpressions() = test("SpecialExpressions") - fun testLambda() = test("Lambda") -} \ No newline at end of file diff --git a/plugins/uast-java/testData/ControlStructures.java b/plugins/uast-java/testData/ControlStructures.java deleted file mode 100644 index 3c18b0665ce..00000000000 --- a/plugins/uast-java/testData/ControlStructures.java +++ /dev/null @@ -1,29 +0,0 @@ -class ControlStructures { - public static void main(String[] args) { - if (args.length == 0) { - return; - } - - String mode = args.length == 1 ? "singleArg" : "multiArgs"; - - for (String arg : args) { - System.out.println(arg); - } - - for (int i = 0; i < args.length; ++i) { - System.out.println(i + ": " + args[i]); - } - - int i = 0; - while (i < args.length) { - System.out.println("Index " + i); - i++; - } - - i = 0; - do { - System.out.println(i); - i += 1; - } while (i < args.length); - } -} diff --git a/plugins/uast-java/testData/Lambda.java b/plugins/uast-java/testData/Lambda.java deleted file mode 100644 index 9d4a9f0fba7..00000000000 --- a/plugins/uast-java/testData/Lambda.java +++ /dev/null @@ -1,13 +0,0 @@ -class Lambda { - void example() { - doJob(arg -> arg + arg, "Mary"); - } - - void doJob(Job job, String arg) { - System.out.println(job.doJob(arg)); - } -} - -interface Job { - String doJob(String arg); -} \ No newline at end of file diff --git a/plugins/uast-java/testData/NestedClasses.java b/plugins/uast-java/testData/NestedClasses.java deleted file mode 100644 index 211405f502b..00000000000 --- a/plugins/uast-java/testData/NestedClasses.java +++ /dev/null @@ -1,13 +0,0 @@ -class NestedClasses { - public static class Nested { - void func1() { - - } - } - - public class Inner { - void func2() { - - } - } -} \ No newline at end of file diff --git a/plugins/uast-java/testData/Simple.java b/plugins/uast-java/testData/Simple.java deleted file mode 100644 index e56e521dae8..00000000000 --- a/plugins/uast-java/testData/Simple.java +++ /dev/null @@ -1,15 +0,0 @@ -class Simple { - private String name; - - public Simple(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} \ No newline at end of file diff --git a/plugins/uast-java/testData/SpecialExpressions.java b/plugins/uast-java/testData/SpecialExpressions.java deleted file mode 100644 index 157e8374047..00000000000 --- a/plugins/uast-java/testData/SpecialExpressions.java +++ /dev/null @@ -1,54 +0,0 @@ -class SpecialExpressions { - boolean test() { - assert 5 > 3; - assert 5 > 3 : "Message"; - - synchronized (this) { - System.out.println("A"); - } - - int a = 5, b = 7, c; - - while (a > 0) { - if (a == 3) { - break; - } - if (a % 5 == 0) { - continue; - } - a--; - } - - this.test(); - super.hashCode(); - - String x; - switch (a) { - case 1: { - x = "1"; - break; - } - case 3: x = "3"; - case 4: x = "4"; - default: x = ""; - } - - if (System.getProperty("abc", "").equals("1")) { - throw new AssertionError("Err"); - } - - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - - } finally { - a = 3; - } - - { - a = 5; - } - - return true; - } -} \ No newline at end of file diff --git a/plugins/uast-java/testData/log/ControlStructures.txt b/plugins/uast-java/testData/log/ControlStructures.txt deleted file mode 100644 index fb953e9b5de..00000000000 --- a/plugins/uast-java/testData/log/ControlStructures.txt +++ /dev/null @@ -1,103 +0,0 @@ -UFile (package = ) - UClass (_Dummy_, kind = class) - UClass (ControlStructures, kind = class) - UFunction (main, kind = function, paramCount = 1) - UBlockExpression - UIfExpression - UBinaryExpression (===) - UQualifiedExpression - USimpleReferenceExpression (args) - USimpleReferenceExpression (length) - ULiteralExpression (0) - UBlockExpression - UReturnExpression - - EmptyExpression - UDeclarationsExpression - UVariable (mode, kind = local) - UIfExpression - UBinaryExpression (===) - UQualifiedExpression - USimpleReferenceExpression (args) - USimpleReferenceExpression (length) - ULiteralExpression (1) - ULiteralExpression ("singleArg") - ULiteralExpression ("multiArgs") - UForEachExpression - UVariable (arg, kind = parameter) - - USimpleReferenceExpression (args) - UBlockExpression - UQualifiedExpression - UQualifiedExpression - USimpleReferenceExpression (System) - USimpleReferenceExpression (out) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - USimpleReferenceExpression (arg) - UForExpression - UDeclarationsExpression - UVariable (i, kind = local) - ULiteralExpression (0) - UBinaryExpression (<) - USimpleReferenceExpression (i) - UQualifiedExpression - USimpleReferenceExpression (args) - USimpleReferenceExpression (length) - UPrefixExpression (++) - USimpleReferenceExpression (i) - UBlockExpression - UQualifiedExpression - UQualifiedExpression - USimpleReferenceExpression (System) - USimpleReferenceExpression (out) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - UBinaryExpression (+) - UBinaryExpression (+) - USimpleReferenceExpression (i) - ULiteralExpression (": ") - UArrayAccessExpression - USimpleReferenceExpression (args) - USimpleReferenceExpression (i) - UDeclarationsExpression - UVariable (i, kind = local) - ULiteralExpression (0) - UWhileExpression - UBinaryExpression (<) - USimpleReferenceExpression (i) - UQualifiedExpression - USimpleReferenceExpression (args) - USimpleReferenceExpression (length) - UBlockExpression - UQualifiedExpression - UQualifiedExpression - USimpleReferenceExpression (System) - USimpleReferenceExpression (out) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - UBinaryExpression (+) - ULiteralExpression ("Index ") - USimpleReferenceExpression (i) - UPostfixExpression (++) - USimpleReferenceExpression (i) - UBinaryExpression (=) - USimpleReferenceExpression (i) - ULiteralExpression (0) - UDoWhileExpression - UBinaryExpression (<) - USimpleReferenceExpression (i) - UQualifiedExpression - USimpleReferenceExpression (args) - USimpleReferenceExpression (length) - UBlockExpression - UQualifiedExpression - UQualifiedExpression - USimpleReferenceExpression (System) - USimpleReferenceExpression (out) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - USimpleReferenceExpression (i) - UBinaryExpression (+=) - USimpleReferenceExpression (i) - ULiteralExpression (1) \ No newline at end of file diff --git a/plugins/uast-java/testData/log/Lambda.txt b/plugins/uast-java/testData/log/Lambda.txt deleted file mode 100644 index 7c3f559375b..00000000000 --- a/plugins/uast-java/testData/log/Lambda.txt +++ /dev/null @@ -1,30 +0,0 @@ -UFile (package = ) - UClass (_Dummy_, kind = class) - UClass (Lambda, kind = class) - UFunction (example, kind = function, paramCount = 0) - UBlockExpression - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 2) - USimpleReferenceExpression (doJob) - ULambdaExpression - UVariable (arg, kind = parameter) - - UBinaryExpression (+) - USimpleReferenceExpression (arg) - USimpleReferenceExpression (arg) - ULiteralExpression ("Mary") - UFunction (doJob, kind = function, paramCount = 2) - UBlockExpression - UQualifiedExpression - UQualifiedExpression - USimpleReferenceExpression (System) - USimpleReferenceExpression (out) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - UQualifiedExpression - USimpleReferenceExpression (job) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (doJob) - USimpleReferenceExpression (arg) - UClass (Job, kind = interface) - UFunction (doJob, kind = function, paramCount = 1) - \ No newline at end of file diff --git a/plugins/uast-java/testData/log/NestedClasses.txt b/plugins/uast-java/testData/log/NestedClasses.txt deleted file mode 100644 index f2d81407599..00000000000 --- a/plugins/uast-java/testData/log/NestedClasses.txt +++ /dev/null @@ -1,10 +0,0 @@ -UFile (package = ) - UClass (_Dummy_, kind = class) - UClass (NestedClasses, kind = class) - UClass (Nested, kind = class) - UFunction (func1, kind = function, paramCount = 0) - UBlockExpression - - UClass (Inner, kind = class) - UFunction (func2, kind = function, paramCount = 0) - UBlockExpression \ No newline at end of file diff --git a/plugins/uast-java/testData/log/Simple.txt b/plugins/uast-java/testData/log/Simple.txt deleted file mode 100644 index d9aac36dfbf..00000000000 --- a/plugins/uast-java/testData/log/Simple.txt +++ /dev/null @@ -1,23 +0,0 @@ -UFile (package = ) - UClass (_Dummy_, kind = class) - UClass (Simple, kind = class) - UVariable (name, kind = member) - EmptyExpression - UFunction (, kind = constructor, paramCount = 1) - UBlockExpression - UBinaryExpression (=) - UQualifiedExpression - UThisExpression - USimpleReferenceExpression (name) - USimpleReferenceExpression (name) - UFunction (getName, kind = function, paramCount = 0) - UBlockExpression - UReturnExpression - USimpleReferenceExpression (name) - UFunction (setName, kind = function, paramCount = 1) - UBlockExpression - UBinaryExpression (=) - UQualifiedExpression - UThisExpression - USimpleReferenceExpression (name) - USimpleReferenceExpression (name) \ No newline at end of file diff --git a/plugins/uast-java/testData/log/SpecialExpressions.txt b/plugins/uast-java/testData/log/SpecialExpressions.txt deleted file mode 100644 index 230c9f77066..00000000000 --- a/plugins/uast-java/testData/log/SpecialExpressions.txt +++ /dev/null @@ -1,126 +0,0 @@ -UFile (package = ) - UClass (_Dummy_, kind = class) - UClass (SpecialExpressions, kind = class) - UFunction (test, kind = function, paramCount = 0) - UBlockExpression - UFunctionCallExpression (UastCallKind(name='assert'), argCount = 1) - - UBinaryExpression (>) - ULiteralExpression (5) - ULiteralExpression (3) - UFunctionCallExpression (UastCallKind(name='assert'), argCount = 2) - - UBinaryExpression (>) - ULiteralExpression (5) - ULiteralExpression (3) - ULiteralExpression ("Message") - UBlockExpression - UQualifiedExpression - UQualifiedExpression - USimpleReferenceExpression (System) - USimpleReferenceExpression (out) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - ULiteralExpression ("A") - UDeclarationsExpression - UVariable (a, kind = local) - ULiteralExpression (5) - UVariable (b, kind = local) - ULiteralExpression (7) - UVariable (c, kind = local) - EmptyExpression - UWhileExpression - UBinaryExpression (>) - USimpleReferenceExpression (a) - ULiteralExpression (0) - UBlockExpression - UIfExpression - UBinaryExpression (===) - USimpleReferenceExpression (a) - ULiteralExpression (3) - UBlockExpression - UBreakExpression () - EmptyExpression - UIfExpression - UBinaryExpression (===) - UBinaryExpression (%) - USimpleReferenceExpression (a) - ULiteralExpression (5) - ULiteralExpression (0) - UBlockExpression - UContinueExpression () - EmptyExpression - UPostfixExpression (--) - USimpleReferenceExpression (a) - UQualifiedExpression - UThisExpression - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 0) - USimpleReferenceExpression (test) - - UQualifiedExpression - USuperExpression - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 0) - USimpleReferenceExpression (hashCode) - - UDeclarationsExpression - UVariable (x, kind = local) - EmptyExpression - USwitchExpression - USimpleReferenceExpression (a) - UBlockExpression - USwitchClauseExpression - ULiteralExpression (1) - UBlockExpression - UBinaryExpression (=) - USimpleReferenceExpression (x) - ULiteralExpression ("1") - UBreakExpression () - USwitchClauseExpression - ULiteralExpression (3) - UBinaryExpression (=) - USimpleReferenceExpression (x) - ULiteralExpression ("3") - USwitchClauseExpression - ULiteralExpression (4) - UBinaryExpression (=) - USimpleReferenceExpression (x) - ULiteralExpression ("4") - DefaultUSwitchClauseExpression - UBinaryExpression (=) - USimpleReferenceExpression (x) - ULiteralExpression ("") - UIfExpression - UQualifiedExpression - UQualifiedExpression - USimpleReferenceExpression (System) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 2) - USimpleReferenceExpression (getProperty) - ULiteralExpression ("abc") - ULiteralExpression ("") - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (equals) - ULiteralExpression ("1") - UBlockExpression - UThrowExpression - UFunctionCallExpression (UastCallKind(name='constructor_call'), argCount = 1) - - ULiteralExpression ("Err") - EmptyExpression - UTryExpression - UBlockExpression - UQualifiedExpression - USimpleReferenceExpression (Thread) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (sleep) - ULiteralExpression (1000) UCatchClause - UBlockExpression - UBlockExpression - UBinaryExpression (=) - USimpleReferenceExpression (a) - ULiteralExpression (3) - UBlockExpression - UBinaryExpression (=) - USimpleReferenceExpression (a) - ULiteralExpression (5) - UReturnExpression - ULiteralExpression (true) \ No newline at end of file diff --git a/plugins/uast-java/testData/render/ControlStructures.txt b/plugins/uast-java/testData/render/ControlStructures.txt deleted file mode 100644 index 080655f6e4b..00000000000 --- a/plugins/uast-java/testData/render/ControlStructures.txt +++ /dev/null @@ -1,32 +0,0 @@ -package_local class _Dummy_ { - package_local class ControlStructures { - public static fun main(args: String[]): void { - if (args.length === 0) { - return - } - - local var mode: String = (args.length === 1) ? ("singleArg") : ("multiArgs") - for (arg : args) { - System.out.println(arg) - } - - for (local var i: int = 0; i < args.length; ++i) { - System.out.println(i + ": " + args[i]) - } - - local var i: int = 0 - while (i < args.length) { - System.out.println("Index " + i) - i++ - } - - i = 0 - do { - System.out.println(i) - i += 1 - } - while (i < args.length) - - } - } -} \ No newline at end of file diff --git a/plugins/uast-java/testData/render/Lambda.txt b/plugins/uast-java/testData/render/Lambda.txt deleted file mode 100644 index 6fc9bc93231..00000000000 --- a/plugins/uast-java/testData/render/Lambda.txt +++ /dev/null @@ -1,17 +0,0 @@ -package_local class _Dummy_ { - package_local class Lambda { - package_local fun example(): void { - doJob({ arg: String -> - arg + arg - }, "Mary") - } - - package_local fun doJob(job: Job, arg: String): void { - System.out.println(job.doJob(arg)) - } - } - - package_local abstract static interface Job { - public abstract fun doJob(arg: String): String - } -} \ No newline at end of file diff --git a/plugins/uast-java/testData/render/NestedClasses.txt b/plugins/uast-java/testData/render/NestedClasses.txt deleted file mode 100644 index 8384242f9bd..00000000000 --- a/plugins/uast-java/testData/render/NestedClasses.txt +++ /dev/null @@ -1,13 +0,0 @@ -package_local class _Dummy_ { - package_local class NestedClasses { - public static class Nested { - package_local fun func1(): void { - } - } - - public class Inner { - package_local fun func2(): void { - } - } - } -} \ No newline at end of file diff --git a/plugins/uast-java/testData/render/Simple.txt b/plugins/uast-java/testData/render/Simple.txt deleted file mode 100644 index a9bb5931765..00000000000 --- a/plugins/uast-java/testData/render/Simple.txt +++ /dev/null @@ -1,17 +0,0 @@ -package_local class _Dummy_ { - package_local class Simple { - private var name: String - - public fun (name: String) { - this.name = name - } - - public fun getName(): String { - return name - } - - public fun setName(name: String): void { - this.name = name - } - } -} \ No newline at end of file diff --git a/plugins/uast-java/testData/render/SpecialExpressions.txt b/plugins/uast-java/testData/render/SpecialExpressions.txt deleted file mode 100644 index d7f37e021e4..00000000000 --- a/plugins/uast-java/testData/render/SpecialExpressions.txt +++ /dev/null @@ -1,64 +0,0 @@ -package_local class _Dummy_ { - package_local class SpecialExpressions { - package_local fun test(): boolean { - (5 > 3) - (5 > 3, "Message") - { - System.out.println("A") - } - - local var a: int = 5 - local var b: int = 7 - local var c: int - while (a > 0) { - if (a === 3) { - break - } - - if (a % 5 === 0) { - continue - } - - a-- - } - - this.test() - super.hashCode() - local var x: String - switch (a) - { - 1 -> - { - x = "1" - break - } - - 3 -> - x = "3" - 4 -> - x = "4" - else -> - x = "" - } - - - if (System.getProperty("abc", "").equals("1")) { - throw AssertionError("Err") - } - - try { - Thread.sleep(1000) - } - catch (e) { - } - finally { - a = 3 - } - { - a = 5 - } - - return true - } - } -} \ No newline at end of file diff --git a/plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/AbstractKotlinUastStructureTest.kt b/plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/AbstractKotlinUastStructureTest.kt deleted file mode 100644 index 0ea3dacc27e..00000000000 --- a/plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/AbstractKotlinUastStructureTest.kt +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.uast - -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor - -abstract class AbstractKotlinUastStructureTest : KotlinLightCodeInsightFixtureTestCase() { - fun doTest() { -// val testName = getTestName(false) -// myFixture.configureByFile("$testName.kt") -// -// val logFile = File(File(testDataPath, "log"), "$testName.txt") -// val renderFile = File(File(testDataPath, "render"), "$testName.txt") -// val treeFile = File(File(testDataPath, "tree"), "$testName.txt") -// -// val psiFile = myFixture.file -// val uElement = KotlinUastLanguagePlugin.converter.convertWithParent(psiFile) ?: error("UFile was not created") -// -// val logActual = uElement.logString() -// val renderActual = trimEmptyLines(uElement.renderString()) -// -// try { -// KotlinTestUtils.assertEqualsToFile(logFile, logActual) -// } catch (e: Throwable) { -// KotlinTestUtils.assertEqualsToFile(renderFile, renderActual) -// throw e -// } -// KotlinTestUtils.assertEqualsToFile(renderFile, renderActual) -// KotlinTestUtils.assertEqualsToFile(treeFile, genTree(uElement)) - } - -// private fun trimEmptyLines(s: String): String { -// val lineSeparator = System.getProperty("line.separator") -// return s.lines().map { if (it.trim().isEmpty()) "" else it.trimEnd() }.joinToString(lineSeparator) -// } - -// private fun genTree(node: UElement): String { -// val builder = StringBuilder() -// val visitor = object : AbstractUastVisitor() { -// private tailrec fun height(node: UElement, current: Int): Int { -// val parent = node.parent ?: return current -// return height(parent, current + 1) -// } -// -// override fun visitElement(node: UElement): Boolean { -// builder.appendln(" ".repeat(height(node, 0)) + node.javaClass.simpleName) -// return super.visitElement(node) -// } -// } -// node.accept(visitor) -// return builder.toString() -// } - - override fun getTestDataPath() = "plugins/uast-kotlin/testData" - - override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE -} \ No newline at end of file diff --git a/plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/KotlinUastStructureTest.kt b/plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/KotlinUastStructureTest.kt deleted file mode 100644 index 180eec6eed9..00000000000 --- a/plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/KotlinUastStructureTest.kt +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.uast - -import org.jetbrains.kotlin.test.TestMetadata - -class KotlinUastStructureTest : AbstractKotlinUastStructureTest() { - @TestMetadata("Simple.kt") fun testSimple() = doTest() - @TestMetadata("Declarations.kt") fun testDeclarations() = doTest() - @TestMetadata("ControlStructures.kt") fun testControlStructures() = doTest() -} \ No newline at end of file diff --git a/plugins/uast-kotlin/testData/ControlStructures.kt b/plugins/uast-kotlin/testData/ControlStructures.kt deleted file mode 100644 index 532628120ad..00000000000 --- a/plugins/uast-kotlin/testData/ControlStructures.kt +++ /dev/null @@ -1,120 +0,0 @@ -class ControlStructures { - val prop = 3 - - fun nullFun(): String? = null - - fun test(): Boolean { - " " - "Z" - "Z Z" - - 'c' - 5 - 5.0 - 5.0f - -5 - +5 - 0.0 - -0.0 - 1E10 - 1E-10 - - val qwe = 2 - " $qwe " - "a\"b" - "a'b\r\n" - "5\n 2" - "\t\t\t" - - if (5 > 3) { - println("5 > 3") - } - - for (c in "ABC") { - println(c) - } - - for (c: Char in "DEF") { - println(c.toByte()) - } - - var i = 5 - while (i > 0) { - i-- - if (i == 3) break - if (i == 2) { - continue - } - } - - "" is String - ("" as Any) as String? - - super.equals(this) - this.equals(this) - - this@ControlStructures.equals(this) - - ControlStructures::test - ControlStructures::prop - ControlStructures::class.java - - outer@ for (outerVal in 1..2) { - inner@ for (innerVal in 3..4) { - continue@outer - } - break@outer - } - - nullFun()?.let { println(it) } - - i = 5 - do { - i -= 1 - } while (i > 0) - - "ABC".forEach { println(it.toString()[0]) } - - "ABC".zip("DEF").forEach { println(it.first + " " + it.second) } - - val arr = arrayOf("A", "B", "C") - println(arr[2]) - - val (a, b) = "ABC".zip("DEF") - - val value = if (5 > 3) "a" else "b" - val list = listOf("A") - val list2 = listOf("A") - - val type = when (value) { - in list -> "inlist" - !in list2 -> "notinlist2" - is String -> "string" - is CharSequence -> "cs" - else -> "unknown" - } - - val x = when { - value == "b" -> "B" - 5 % 2 == 0 -> { - println("A") - "Q" - } - false -> "!" - else -> "A" - } - - try { - 5 + 1 - throw Exception() - } catch (e: Exception) { - e.printStackTrace() - } catch (thr: Throwable) { - System.out.println("error!") - } finally { - System.out.println("finally") - } - - return false - } -} \ No newline at end of file diff --git a/plugins/uast-kotlin/testData/Declarations.kt b/plugins/uast-kotlin/testData/Declarations.kt deleted file mode 100644 index 05c2edf6dfa..00000000000 --- a/plugins/uast-kotlin/testData/Declarations.kt +++ /dev/null @@ -1,26 +0,0 @@ -class Declarations { - val a: String = "a" - var b: String - get() = "A" - set(v) { println(v) } - val c: String - - class NestedClass { - val b: String = "b" - } - inner class InnerClass { - val c: CharSequence = a - } - - companion object { - val CONST_VAL = 1 - } - - companion object A { - fun b(): Boolean = true - } - - fun func(a: Int, b: String): Int { - return (a + 1) * b.length - } -} \ No newline at end of file diff --git a/plugins/uast-kotlin/testData/Simple.kt b/plugins/uast-kotlin/testData/Simple.kt deleted file mode 100644 index ddc3292f925..00000000000 --- a/plugins/uast-kotlin/testData/Simple.kt +++ /dev/null @@ -1,8 +0,0 @@ -class Simple { - val a: String = "text" + "other" + "text" - val b = listOf("A") - - fun test() { - System.out.println(5.0f / 2) - } -} \ No newline at end of file diff --git a/plugins/uast-kotlin/testData/log/ControlStructures.txt b/plugins/uast-kotlin/testData/log/ControlStructures.txt deleted file mode 100644 index a66eed0aae2..00000000000 --- a/plugins/uast-kotlin/testData/log/ControlStructures.txt +++ /dev/null @@ -1,363 +0,0 @@ -UFile (package = ) - UClass (ControlStructures, kind = class) - UFunction (, kind = constructor, paramCount = 0) - - UVariable (prop, kind = member) - ULiteralExpression (3) - UFunction (nullFun, kind = function, paramCount = 0) - ULiteralExpression (null) - UFunction (test, kind = function, paramCount = 0) - UBlockExpression - ULiteralExpression (" ") - ULiteralExpression ("Z") - ULiteralExpression ("Z Z") - ULiteralExpression ('c') - ULiteralExpression (5) - ULiteralExpression (5.0) - ULiteralExpression (5.0) - UPrefixExpression (-) - ULiteralExpression (5) - UPrefixExpression (+) - ULiteralExpression (5) - ULiteralExpression (0.0) - UPrefixExpression (-) - ULiteralExpression (0.0) - ULiteralExpression (1.0E10) - ULiteralExpression (1.0E-10) - UDeclarationsExpression - UVariable (qwe, kind = local) - ULiteralExpression (2) - UBinaryExpression (+) - UBinaryExpression (+) - ULiteralExpression (" ") - USimpleReferenceExpression (qwe) - ULiteralExpression (" ") - UBinaryExpression (+) - UBinaryExpression (+) - ULiteralExpression ("a") - ULiteralExpression ("\"") - ULiteralExpression ("b") - UBinaryExpression (+) - UBinaryExpression (+) - ULiteralExpression ("a'b") - ULiteralExpression ("\r") - ULiteralExpression ("\n") - UBinaryExpression (+) - UBinaryExpression (+) - ULiteralExpression ("5") - ULiteralExpression ("\n") - ULiteralExpression (" 2") - UBinaryExpression (+) - UBinaryExpression (+) - ULiteralExpression ("\t") - ULiteralExpression ("\t") - ULiteralExpression ("\t") - UIfExpression - UBinaryExpression (>) - ULiteralExpression (5) - ULiteralExpression (3) - UBlockExpression - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - ULiteralExpression ("5 > 3") - - UForEachExpression - UVariable (c, kind = parameter) - - ULiteralExpression ("ABC") - UBlockExpression - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - USimpleReferenceExpression (c) - UForEachExpression - UVariable (c, kind = parameter) - - ULiteralExpression ("DEF") - UBlockExpression - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - UQualifiedExpression - USimpleReferenceExpression (c) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 0) - USimpleReferenceExpression (toByte) - - UDeclarationsExpression - UVariable (i, kind = local) - ULiteralExpression (5) - UWhileExpression - UBinaryExpression (>) - USimpleReferenceExpression (i) - ULiteralExpression (0) - UBlockExpression - UPostfixExpression (--) - USimpleReferenceExpression (i) - UIfExpression - UBinaryExpression (==) - USimpleReferenceExpression (i) - ULiteralExpression (3) - UBreakExpression () - - UIfExpression - UBinaryExpression (==) - USimpleReferenceExpression (i) - ULiteralExpression (2) - UBlockExpression - UContinueExpression () - - UBinaryExpressionWithType (null, !is) - ULiteralExpression ("") - UBinaryExpressionWithType (null, as) - UParenthesizedExpression - UBinaryExpressionWithType (null, as) - ULiteralExpression ("") - UQualifiedExpression - USuperExpression - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (equals) - UThisExpression - UQualifiedExpression - UThisExpression - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (equals) - UThisExpression - UQualifiedExpression - UThisExpression - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (equals) - UThisExpression - UCallableReferenceExpression - UCallableReferenceExpression - UQualifiedExpression - UClassLiteralExpression - USimpleReferenceExpression (java) - ULabeledExpression (outer) - UForEachExpression - UVariable (outerVal, kind = parameter) - - UBinaryExpression (..) - ULiteralExpression (1) - ULiteralExpression (2) - UBlockExpression - ULabeledExpression (inner) - UForEachExpression - UVariable (innerVal, kind = parameter) - - UBinaryExpression (..) - ULiteralExpression (3) - ULiteralExpression (4) - UBlockExpression - UContinueExpression (outer) - UBreakExpression (outer) - UQualifiedExpression - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 0) - USimpleReferenceExpression (nullFun) - - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (let) - ULambdaExpression - - UBlockExpression - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - USimpleReferenceExpression (it) - UBinaryExpression (=) - USimpleReferenceExpression (i) - ULiteralExpression (5) - UDoWhileExpression - UBinaryExpression (>) - USimpleReferenceExpression (i) - ULiteralExpression (0) - UBlockExpression - UBinaryExpression (-=) - USimpleReferenceExpression (i) - ULiteralExpression (1) - UQualifiedExpression - ULiteralExpression ("ABC") - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (forEach) - ULambdaExpression - - UBlockExpression - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - UArrayAccessExpression - UQualifiedExpression - USimpleReferenceExpression (it) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 0) - USimpleReferenceExpression (toString) - - ULiteralExpression (0) - UQualifiedExpression - UQualifiedExpression - ULiteralExpression ("ABC") - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (zip) - ULiteralExpression ("DEF") - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (forEach) - ULambdaExpression - - UBlockExpression - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - UBinaryExpression (+) - UBinaryExpression (+) - UQualifiedExpression - USimpleReferenceExpression (it) - USimpleReferenceExpression (first) - ULiteralExpression (" ") - UQualifiedExpression - USimpleReferenceExpression (it) - USimpleReferenceExpression (second) - UDeclarationsExpression - UVariable (arr, kind = local) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 3) - USimpleReferenceExpression (arrayOf) - ULiteralExpression ("A") - ULiteralExpression ("B") - ULiteralExpression ("C") - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - UArrayAccessExpression - USimpleReferenceExpression (arr) - ULiteralExpression (2) - UDeclarationsExpression - UVariable (var1496943053, kind = local) - UQualifiedExpression - ULiteralExpression ("ABC") - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (zip) - ULiteralExpression ("DEF") - UVariable (a, kind = local) - UQualifiedExpression - USimpleReferenceExpression (var1496943053) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 0) - USimpleReferenceExpression (component1) - - UVariable (b, kind = local) - UQualifiedExpression - USimpleReferenceExpression (var1496943053) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 0) - USimpleReferenceExpression (component2) - - UDeclarationsExpression - UVariable (value, kind = local) - UIfExpression - UBinaryExpression (>) - ULiteralExpression (5) - ULiteralExpression (3) - ULiteralExpression ("a") - ULiteralExpression ("b") - UDeclarationsExpression - UVariable (list, kind = local) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (listOf) - ULiteralExpression ("A") - UDeclarationsExpression - UVariable (list2, kind = local) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (listOf) - ULiteralExpression ("A") - UDeclarationsExpression - UVariable (type, kind = local) - USwitchExpression - USimpleReferenceExpression (value) - USpecialExpressionList (when) - USwitchClauseExpressionWithBody - UBinaryExpression (in) - USimpleReferenceExpression (it) - USimpleReferenceExpression (list) - USpecialExpressionList (when_entry) - ULiteralExpression ("inlist") - UBreakExpression () - USwitchClauseExpressionWithBody - UBinaryExpression (in) - USimpleReferenceExpression (it) - USimpleReferenceExpression (list2) - USpecialExpressionList (when_entry) - ULiteralExpression ("notinlist2") - UBreakExpression () - USwitchClauseExpressionWithBody - UBinaryExpressionWithType (null, is) - USimpleReferenceExpression (it) - USpecialExpressionList (when_entry) - ULiteralExpression ("string") - UBreakExpression () - USwitchClauseExpressionWithBody - UBinaryExpressionWithType (null, is) - USimpleReferenceExpression (it) - USpecialExpressionList (when_entry) - ULiteralExpression ("cs") - UBreakExpression () - USwitchClauseExpressionWithBody - - USpecialExpressionList (when_entry) - ULiteralExpression ("unknown") - UBreakExpression () - UDeclarationsExpression - UVariable (x, kind = local) - USwitchExpression - - USpecialExpressionList (when) - USwitchClauseExpressionWithBody - UBinaryExpression (==) - USimpleReferenceExpression (value) - ULiteralExpression ("b") - USpecialExpressionList (when_entry) - ULiteralExpression ("B") - UBreakExpression () - USwitchClauseExpressionWithBody - UBinaryExpression (==) - UBinaryExpression (%) - ULiteralExpression (5) - ULiteralExpression (2) - ULiteralExpression (0) - USpecialExpressionList (when_entry) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - ULiteralExpression ("A") - ULiteralExpression ("Q") - UBreakExpression () - USwitchClauseExpressionWithBody - ULiteralExpression (false) - USpecialExpressionList (when_entry) - ULiteralExpression ("!") - UBreakExpression () - USwitchClauseExpressionWithBody - - USpecialExpressionList (when_entry) - ULiteralExpression ("A") - UBreakExpression () - UTryExpression - UBlockExpression - UBinaryExpression (+) - ULiteralExpression (5) - ULiteralExpression (1) - UThrowExpression - UFunctionCallExpression (UastCallKind(name='constructor_call'), argCount = 0) - USimpleReferenceExpression (Exception) - UCatchClause - UBlockExpression - UQualifiedExpression - USimpleReferenceExpression (e) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 0) - USimpleReferenceExpression (printStackTrace) - - UCatchClause - UBlockExpression - UQualifiedExpression - UQualifiedExpression - USimpleReferenceExpression (System) - USimpleReferenceExpression (out) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - ULiteralExpression ("error!") UBlockExpression - UQualifiedExpression - UQualifiedExpression - USimpleReferenceExpression (System) - USimpleReferenceExpression (out) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - ULiteralExpression ("finally") - UReturnExpression - ULiteralExpression (false) \ No newline at end of file diff --git a/plugins/uast-kotlin/testData/log/Declarations.txt b/plugins/uast-kotlin/testData/log/Declarations.txt deleted file mode 100644 index 5bb13bdfe05..00000000000 --- a/plugins/uast-kotlin/testData/log/Declarations.txt +++ /dev/null @@ -1,41 +0,0 @@ -UFile (package = ) - UClass (Declarations, kind = class) - UFunction (, kind = constructor, paramCount = 0) - - UVariable (a, kind = member) - ULiteralExpression ("a") - UVariable (b, kind = member) - EmptyExpression - UVariable (c, kind = member) - EmptyExpression - UClass (NestedClass, kind = class) - UFunction (, kind = constructor, paramCount = 0) - - UVariable (b, kind = member) - ULiteralExpression ("b") - UClass (InnerClass, kind = class) - UFunction (, kind = constructor, paramCount = 0) - - UVariable (c, kind = member) - USimpleReferenceExpression (a) - UClass (Companion, kind = companion object) - UFunction (, kind = constructor, paramCount = 0) - - UVariable (CONST_VAL, kind = member) - ULiteralExpression (1) - UClass (A, kind = companion object) - UFunction (, kind = constructor, paramCount = 0) - - UFunction (b, kind = function, paramCount = 0) - ULiteralExpression (true) - UFunction (func, kind = function, paramCount = 2) - UBlockExpression - UReturnExpression - UBinaryExpression (*) - UParenthesizedExpression - UBinaryExpression (+) - USimpleReferenceExpression (a) - ULiteralExpression (1) - UQualifiedExpression - USimpleReferenceExpression (b) - USimpleReferenceExpression (length) \ No newline at end of file diff --git a/plugins/uast-kotlin/testData/log/Simple.txt b/plugins/uast-kotlin/testData/log/Simple.txt deleted file mode 100644 index 8fb66bd2169..00000000000 --- a/plugins/uast-kotlin/testData/log/Simple.txt +++ /dev/null @@ -1,25 +0,0 @@ -UFile (package = ) - UClass (Simple, kind = class) - UFunction (, kind = constructor, paramCount = 0) - - UVariable (a, kind = member) - UBinaryExpression (+) - UBinaryExpression (+) - ULiteralExpression ("text") - ULiteralExpression ("other") - ULiteralExpression ("text") - UVariable (b, kind = member) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (listOf) - ULiteralExpression ("A") - UFunction (test, kind = function, paramCount = 0) - UBlockExpression - UQualifiedExpression - UQualifiedExpression - USimpleReferenceExpression (System) - USimpleReferenceExpression (out) - UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) - USimpleReferenceExpression (println) - UBinaryExpression (/) - ULiteralExpression (5.0) - ULiteralExpression (2) \ No newline at end of file diff --git a/plugins/uast-kotlin/testData/render/ControlStructures.txt b/plugins/uast-kotlin/testData/render/ControlStructures.txt deleted file mode 100644 index 49ae2d40f0e..00000000000 --- a/plugins/uast-kotlin/testData/render/ControlStructures.txt +++ /dev/null @@ -1,164 +0,0 @@ -public static class ControlStructures { - public fun () - - public immutable var prop: Int = 3 - - public fun nullFun(): String? = null - - public fun test(): Boolean { - " " - "Z" - "Z Z" - 'c' - 5 - 5.0 - 5.0 - -5 - +5 - 0.0 - -0.0 - 1.0E10 - 1.0E-10 - public immutable var qwe: Int = 2 - - " " + qwe + " " - "a" + "\"" + "b" - "a'b" + "\r" + "\n" - "5" + "\n" + " 2" - "\t" + "\t" + "\t" - if (5 > 3) { - println("5 > 3") - } - - for (c : "ABC") { - println(c) - } - - for (c : "DEF") { - println(c.toByte()) - } - - public var i: Int = 5 - - while (i > 0) { - i-- - if (i == 3) break - if (i == 2) { - continue - } - - } - - "" !is String - ("" as Any) as String? - super.equals(this) - this.equals(this) - this.equals(this) - ControlStructures::test - ControlStructures::prop - ControlStructures::class.java - outer@ for (outerVal : 1 .. 2) { - inner@ for (innerVal : 3 .. 4) { - continue@outer - } - - break@outer - } - - nullFun()?.let({ - println(it) - }) - i = 5 - do { - i -= 1 - } - while (i > 0) - - "ABC".forEach({ - println(it.toString()[0]) - }) - "ABC".zip("DEF").forEach({ - println(it.first + " " + it.second) - }) - public immutable var arr: Array = arrayOf("A", "B", "C") - - println(arr[2]) - local var var1496943053: = "ABC".zip("DEF") - local immutable var a: Pair = var1496943053.component1() - local immutable var b: Pair = var1496943053.component2() - public immutable var value: String = if (5 > 3) "a" else "b" - - public immutable var list: List = listOf("A") - - public immutable var list2: List = listOf("A") - - public immutable var type: String = switch (value) { - it in list -> { - "inlist" - break - } - - it in list2 -> { - "notinlist2" - break - } - - it is String -> { - "string" - break - } - - it is CharSequence -> { - "cs" - break - } - - -> { - "unknown" - break - } - - } - - - public immutable var x: String = switch { - value == "b" -> { - "B" - break - } - - 5 % 2 == 0 -> { - println("A") - "Q" - break - } - - false -> { - "!" - break - } - - -> { - "A" - break - } - - } - - - try { - 5 + 1 - throw () - } - catch (e) { - e.printStackTrace() - } - catch (e) { - System.out.println("error!") - } - finally { - System.out.println("finally") - } - return false - } -} diff --git a/plugins/uast-kotlin/testData/render/Declarations.txt b/plugins/uast-kotlin/testData/render/Declarations.txt deleted file mode 100644 index 1aaba0d1cc9..00000000000 --- a/plugins/uast-kotlin/testData/render/Declarations.txt +++ /dev/null @@ -1,42 +0,0 @@ -public static class Declarations { - public fun () - - public immutable var a: String = "a" - - public var b: String - public fun (): String = "A" - public fun (v: String) { - println(v) - } - - - public immutable var c: String - - public static class NestedClass { - public fun () - - public immutable var b: String = "b" - } - - public class InnerClass { - public fun () - - public immutable var c: CharSequence = a - } - - public static companion object Companion { - public fun () - - public immutable var CONST_VAL: Int = 1 - } - - public static companion object A { - public fun () - - public fun b(): Boolean = true - } - - public fun func(a: Int, b: String): Int { - return (a + 1) * b.length - } -} diff --git a/plugins/uast-kotlin/testData/render/Simple.txt b/plugins/uast-kotlin/testData/render/Simple.txt deleted file mode 100644 index cce2ae634d9..00000000000 --- a/plugins/uast-kotlin/testData/render/Simple.txt +++ /dev/null @@ -1,11 +0,0 @@ -public static class Simple { - public fun () - - public immutable var a: String = "text" + "other" + "text" - - public immutable var b: List = listOf("A") - - public fun test(): Unit { - System.out.println(5.0 / 2) - } -} diff --git a/plugins/uast-kotlin/testData/tree/ControlStructures.txt b/plugins/uast-kotlin/testData/tree/ControlStructures.txt deleted file mode 100644 index 3fd860b3a13..00000000000 --- a/plugins/uast-kotlin/testData/tree/ControlStructures.txt +++ /dev/null @@ -1,448 +0,0 @@ -KotlinUFile - KotlinUClass - KotlinNameUSimpleReferenceExpression - KotlinDefaultPrimaryConstructorUFunction - KotlinDumbUElement - KotlinUVariable - KotlinDumbUElement - KotlinULiteralExpression - KotlinUType - KotlinUFunction - KotlinDumbUElement - KotlinULiteralExpression - KotlinUType - KotlinUFunction - KotlinDumbUElement - KotlinUBlockExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinULiteralExpression - KotlinULiteralExpression - KotlinULiteralExpression - KotlinULiteralExpression - KotlinUPrefixExpression - KotlinULiteralExpression - KotlinUPrefixExpression - KotlinULiteralExpression - KotlinULiteralExpression - KotlinUPrefixExpression - KotlinULiteralExpression - KotlinULiteralExpression - KotlinULiteralExpression - SimpleUDeclarationsExpression - KotlinUVariable - KotlinDumbUElement - KotlinULiteralExpression - KotlinUType - KotlinStringTemplateUBinaryExpression - KotlinStringTemplateUBinaryExpression - KotlinStringULiteralExpression - KotlinUSimpleReferenceExpression - KotlinStringULiteralExpression - KotlinStringTemplateUBinaryExpression - KotlinStringTemplateUBinaryExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinStringTemplateUBinaryExpression - KotlinStringTemplateUBinaryExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinStringTemplateUBinaryExpression - KotlinStringTemplateUBinaryExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinStringTemplateUBinaryExpression - KotlinStringTemplateUBinaryExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinUIfExpression - KotlinUBinaryExpression - KotlinULiteralExpression - KotlinULiteralExpression - KotlinUBlockExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinStringULiteralExpression - KotlinUForEachExpression - KotlinParameterUVariable - KotlinDumbUElement - KotlinUType - KotlinStringULiteralExpression - KotlinUBlockExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUForEachExpression - KotlinParameterUVariable - KotlinDumbUElement - KotlinUType - KotlinStringULiteralExpression - KotlinUBlockExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUQualifiedExpression - KotlinUSimpleReferenceExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - SimpleUDeclarationsExpression - KotlinUVariable - KotlinDumbUElement - KotlinULiteralExpression - KotlinUType - KotlinUWhileExpression - KotlinUBinaryExpression - KotlinUSimpleReferenceExpression - KotlinULiteralExpression - KotlinUBlockExpression - KotlinUPostfixExpression - KotlinUSimpleReferenceExpression - KotlinUIfExpression - KotlinUBinaryExpression - KotlinUSimpleReferenceExpression - KotlinULiteralExpression - KotlinUBreakExpression - KotlinUIfExpression - KotlinUBinaryExpression - KotlinUSimpleReferenceExpression - KotlinULiteralExpression - KotlinUBlockExpression - KotlinUContinueExpression - KotlinUTypeCheckExpression - KotlinStringULiteralExpression - KotlinUType - KotlinUBinaryExpressionWithType - KotlinUParenthesizedExpression - KotlinUBinaryExpressionWithType - KotlinStringULiteralExpression - KotlinUType - KotlinUType - KotlinUQualifiedExpression - KotlinUSuperExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUThisExpression - KotlinUQualifiedExpression - KotlinUThisExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUThisExpression - KotlinUQualifiedExpression - KotlinUThisExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUThisExpression - KotlinUCallableReferenceExpression - KotlinUType - KotlinUCallableReferenceExpression - KotlinUType - KotlinUQualifiedExpression - KotlinUClassLiteralExpression - KotlinUSimpleReferenceExpression - KotlinULabeledExpression - KotlinUForEachExpression - KotlinParameterUVariable - KotlinDumbUElement - KotlinUType - KotlinUBinaryExpression - KotlinULiteralExpression - KotlinULiteralExpression - KotlinUBlockExpression - KotlinULabeledExpression - KotlinUForEachExpression - KotlinParameterUVariable - KotlinDumbUElement - KotlinUType - KotlinUBinaryExpression - KotlinULiteralExpression - KotlinULiteralExpression - KotlinUBlockExpression - KotlinUContinueExpression - KotlinUBreakExpression - KotlinUSafeQualifiedExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinULambdaExpression - KotlinUBlockExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUBinaryExpression - KotlinUSimpleReferenceExpression - KotlinULiteralExpression - KotlinUDoWhileExpression - KotlinUBinaryExpression - KotlinUSimpleReferenceExpression - KotlinULiteralExpression - KotlinUBlockExpression - KotlinUBinaryExpression - KotlinUSimpleReferenceExpression - KotlinULiteralExpression - KotlinUQualifiedExpression - KotlinStringULiteralExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinULambdaExpression - KotlinUBlockExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUArrayAccessExpression - KotlinUQualifiedExpression - KotlinUSimpleReferenceExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinULiteralExpression - KotlinUQualifiedExpression - KotlinUQualifiedExpression - KotlinStringULiteralExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinStringULiteralExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinULambdaExpression - KotlinUBlockExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUBinaryExpression - KotlinUBinaryExpression - KotlinUQualifiedExpression - KotlinUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinStringULiteralExpression - KotlinUQualifiedExpression - KotlinUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - SimpleUDeclarationsExpression - KotlinUVariable - KotlinDumbUElement - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinUType - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUArrayAccessExpression - KotlinUSimpleReferenceExpression - KotlinULiteralExpression - KotlinUDeclarationsExpression - KotlinDestructuringUVariable - KotlinUQualifiedExpression - KotlinStringULiteralExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinStringULiteralExpression -UastErrorType - KotlinDestructuredUVariable - KotlinDumbUElement - KotlinUComponentQualifiedExpression - KotlinStringUSimpleReferenceExpression - KotlinUComponentFunctionCallExpression - KotlinStringUSimpleReferenceExpression - KotlinUType - KotlinDestructuredUVariable - KotlinDumbUElement - KotlinUComponentQualifiedExpression - KotlinStringUSimpleReferenceExpression - KotlinUComponentFunctionCallExpression - KotlinStringUSimpleReferenceExpression - KotlinUType - SimpleUDeclarationsExpression - KotlinUVariable - KotlinDumbUElement - KotlinUIfExpression - KotlinUBinaryExpression - KotlinULiteralExpression - KotlinULiteralExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinUType - SimpleUDeclarationsExpression - KotlinUVariable - KotlinDumbUElement - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinStringULiteralExpression - KotlinUType - SimpleUDeclarationsExpression - KotlinUVariable - KotlinDumbUElement - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinStringULiteralExpression - KotlinUType - SimpleUDeclarationsExpression - KotlinUVariable - KotlinDumbUElement - KotlinUSwitchExpression - KotlinUSimpleReferenceExpression - - KotlinUSwitchEntry - KotlinCustomUBinaryExpression - KotlinStringUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - - KotlinStringULiteralExpression - $special$$inlined$apply$lambda$1 - KotlinUSwitchEntry - KotlinCustomUBinaryExpression - KotlinStringUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - - KotlinStringULiteralExpression - $special$$inlined$apply$lambda$1 - KotlinUSwitchEntry - KotlinCustomUBinaryExpressionWithType - KotlinStringUSimpleReferenceExpression - KotlinUType - - KotlinStringULiteralExpression - $special$$inlined$apply$lambda$1 - KotlinUSwitchEntry - KotlinCustomUBinaryExpressionWithType - KotlinStringUSimpleReferenceExpression - KotlinUType - - KotlinStringULiteralExpression - $special$$inlined$apply$lambda$1 - KotlinUSwitchEntry - - KotlinStringULiteralExpression - $special$$inlined$apply$lambda$1 - KotlinUType - SimpleUDeclarationsExpression - KotlinUVariable - KotlinDumbUElement - KotlinUSwitchExpression - - KotlinUSwitchEntry - KotlinUBinaryExpression - KotlinUSimpleReferenceExpression - KotlinStringULiteralExpression - - KotlinStringULiteralExpression - $special$$inlined$apply$lambda$1 - KotlinUSwitchEntry - KotlinUBinaryExpression - KotlinUBinaryExpression - KotlinULiteralExpression - KotlinULiteralExpression - KotlinULiteralExpression - - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - $special$$inlined$apply$lambda$1 - KotlinUSwitchEntry - KotlinULiteralExpression - - KotlinStringULiteralExpression - $special$$inlined$apply$lambda$1 - KotlinUSwitchEntry - - KotlinStringULiteralExpression - $special$$inlined$apply$lambda$1 - KotlinUType - KotlinUTryExpression - KotlinUBlockExpression - KotlinUBinaryExpression - KotlinULiteralExpression - KotlinULiteralExpression - KotlinUThrowExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUCatchClause - KotlinUBlockExpression - KotlinUQualifiedExpression - KotlinUSimpleReferenceExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinParameterUVariable - KotlinDumbUElement - KotlinUType - KotlinUType - KotlinUCatchClause - KotlinUBlockExpression - KotlinUQualifiedExpression - KotlinUQualifiedExpression - KotlinUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinStringULiteralExpression - KotlinParameterUVariable - KotlinDumbUElement - KotlinUType - KotlinUType - KotlinUBlockExpression - KotlinUQualifiedExpression - KotlinUQualifiedExpression - KotlinUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinStringULiteralExpression - KotlinUReturnExpression - KotlinULiteralExpression - KotlinUType diff --git a/plugins/uast-kotlin/testData/tree/Declarations.txt b/plugins/uast-kotlin/testData/tree/Declarations.txt deleted file mode 100644 index 6f96e708d7b..00000000000 --- a/plugins/uast-kotlin/testData/tree/Declarations.txt +++ /dev/null @@ -1,67 +0,0 @@ -KotlinUFile - KotlinUClass - KotlinNameUSimpleReferenceExpression - KotlinDefaultPrimaryConstructorUFunction - KotlinDumbUElement - KotlinUVariable - KotlinDumbUElement - KotlinStringULiteralExpression - KotlinUType - KotlinUVariable - KotlinDumbUElement - EmptyUExpression - KotlinUType - KotlinUVariable - KotlinDumbUElement - EmptyUExpression - KotlinUType - KotlinUClass - KotlinNameUSimpleReferenceExpression - KotlinDefaultPrimaryConstructorUFunction - KotlinDumbUElement - KotlinUVariable - KotlinDumbUElement - KotlinStringULiteralExpression - KotlinUType - KotlinUClass - KotlinNameUSimpleReferenceExpression - KotlinDefaultPrimaryConstructorUFunction - KotlinDumbUElement - KotlinUVariable - KotlinDumbUElement - KotlinUSimpleReferenceExpression - KotlinUType - KotlinUClass - KotlinDefaultPrimaryConstructorUFunction - KotlinDumbUElement - KotlinUVariable - KotlinDumbUElement - KotlinULiteralExpression - KotlinUType - KotlinUClass - KotlinNameUSimpleReferenceExpression - KotlinDefaultPrimaryConstructorUFunction - KotlinDumbUElement - KotlinUFunction - KotlinDumbUElement - KotlinULiteralExpression - KotlinUType - KotlinUFunction - KotlinDumbUElement - KotlinParameterUVariable - KotlinDumbUElement - KotlinUType - KotlinParameterUVariable - KotlinDumbUElement - KotlinUType - KotlinUBlockExpression - KotlinUReturnExpression - KotlinUBinaryExpression - KotlinUParenthesizedExpression - KotlinUBinaryExpression - KotlinUSimpleReferenceExpression - KotlinULiteralExpression - KotlinUQualifiedExpression - KotlinUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUType diff --git a/plugins/uast-kotlin/testData/tree/Simple.txt b/plugins/uast-kotlin/testData/tree/Simple.txt deleted file mode 100644 index dce95c9f61e..00000000000 --- a/plugins/uast-kotlin/testData/tree/Simple.txt +++ /dev/null @@ -1,36 +0,0 @@ -KotlinUFile - KotlinUClass - KotlinNameUSimpleReferenceExpression - KotlinDefaultPrimaryConstructorUFunction - KotlinDumbUElement - KotlinUVariable - KotlinDumbUElement - KotlinUBinaryExpression - KotlinUBinaryExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinStringULiteralExpression - KotlinUType - KotlinUVariable - KotlinDumbUElement - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinStringULiteralExpression - KotlinUType - KotlinUFunction - KotlinDumbUElement - KotlinUBlockExpression - KotlinUQualifiedExpression - KotlinUQualifiedExpression - KotlinUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUFunctionCallExpression - KotlinNameUSimpleReferenceExpression - KotlinClassViaConstructorUSimpleReferenceExpression - KotlinUSimpleReferenceExpression - KotlinUBinaryExpression - KotlinULiteralExpression - KotlinULiteralExpression - KotlinUType