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

Uast, Lint: Update and fix tests

Browse Source
This commit is contained in:
Yan Zhulanow
2016-04-06 19:53:11 +03:00
parent 21a2115501
commit c13c24becc
34 changed files with 1073 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/lint/lint-checks/src/com/android/tools/klint/checks/CipherGetInstanceDetector.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class CipherGetInstanceDetector extends Detector implements UastScanner {
UExpression expression = argumentList.get(0); UExpression expression = argumentList.get(0);
if (expression instanceof ULiteralExpression) { if (expression instanceof ULiteralExpression) {
ULiteralExpression argument = (ULiteralExpression)expression; ULiteralExpression argument = (ULiteralExpression)expression;
String parameter = argument.asString(); String parameter = argument.renderString();
checkParameter(context, node, argument, parameter, false); checkParameter(context, node, argument, parameter, false);
} else if (expression instanceof UResolvable) { } else if (expression instanceof UResolvable) {
UDeclaration declaration = ((UResolvable)expression).resolve(context); UDeclaration declaration = ((UResolvable)expression).resolve(context);
plugins/lint/lint-checks/src/com/android/tools/klint/checks/JavaPerformanceDetector.java
+14 -8
View File
@@ -211,16 +211,22 @@ public class JavaPerformanceDetector extends Detector implements UastScanner {
} }
if (mCheckValueOf) { if (mCheckValueOf) {
UType type = UastErrorType.INSTANCE;
if (typeName == null) { if (typeName == null) {
typeName = classReference.getIdentifier(); UDeclaration resolvedDeclaration = classReference.resolve(mContext);
if (resolvedDeclaration instanceof UClass) {
type = ((UClass) resolvedDeclaration).getDefaultType();
typeName = type.getName();
}
} }
if ((typeName.equals(INTEGER) if ((type.isInt()
|| typeName.equals(BOOLEAN) || type.isBoolean()
|| typeName.equals(FLOAT) || type.isFloat()
|| typeName.equals(CHARACTER) || type.isChar()
|| typeName.equals(LONG) || type.isLong()
|| typeName.equals(DOUBLE) || type.isDouble()
|| typeName.equals(BYTE)) || type.isShort()
|| type.isByte())
&& node.getValueArgumentCount() == 1) { && node.getValueArgumentCount() == 1) {
String argument = node.getValueArguments().get(0).renderString(); String argument = node.getValueArguments().get(0).renderString();
mContext.report(USE_VALUE_OF, node, mContext.getLocation(node), getUseValueOfErrorMessage( mContext.report(USE_VALUE_OF, node, mContext.getLocation(node), getUseValueOfErrorMessage(
plugins/uast-common/src/org/jetbrains/uast/declarations/UDeclaration.kt
+1 -1
View File
@@ -37,7 +37,7 @@ interface UDeclaration : UElement, UNamed {
*/ */
open fun matchesNameWithContaining(containingClassFqName: String, name: String): Boolean { open fun matchesNameWithContaining(containingClassFqName: String, name: String): Boolean {
if (!matchesName(name)) return false if (!matchesName(name)) return false
val containingClass = parent as? UClass ?: return false val containingClass = this.getContainingClass() ?: return false
return containingClass.matchesFqName(containingClassFqName) return containingClass.matchesFqName(containingClassFqName)
} }
plugins/uast-common/src/org/jetbrains/uast/expressions/ULiteralExpression.kt
+16 -16
View File
@@ -30,7 +30,8 @@ interface ULiteralExpression : UExpression {
/** /**
* Returns true if the literal is a `null`-literal, false otherwise. * Returns true if the literal is a `null`-literal, false otherwise.
*/ */
val isNull: Boolean open val isNull: Boolean
get() = value == null
/** /**
* Returns true if the literal is a [String] literal, false otherwise. * Returns true if the literal is a [String] literal, false otherwise.
@@ -44,24 +45,23 @@ interface ULiteralExpression : UExpression {
val isBoolean: Boolean val isBoolean: Boolean
get() = evaluate() is Boolean get() = evaluate() is Boolean
/**
* Returns the string representation of the literal expression.
*
* @return the string representation, or "null" if the literal is a "null"-literal.
*/
fun asString(): String {
val value = value
return if (value == null)
"null"
else
value.toString()
}
override fun accept(visitor: UastVisitor) { override fun accept(visitor: UastVisitor) {
visitor.visitLiteralExpression(this) visitor.visitLiteralExpression(this)
visitor.afterVisitLiteralExpression(this) visitor.afterVisitLiteralExpression(this)
} }
override fun logString() = "ULiteralExpression (${asString()})" override fun renderString(): String {
override fun renderString() = if (value is String) "\"$value\"" else asString() val value = value
return when (value) {
null -> "null"
is Char -> "'$value'"
is String -> '"' + value.replace("\\", "\\\\")
.replace("\r", "\\r").replace("\n", "\\n")
.replace("\t", "\\t").replace("\b", "\\b")
.replace("\"", "\\\"") + '"'
else -> value.toString()
}
}
override fun logString() = "ULiteralExpression (${renderString()})"
} }
plugins/uast-java/src/org/jetbrains/uast/java/declarations/JavaUVariable.kt
+2
View File
@@ -16,6 +16,7 @@
package org.jetbrains.uast.java package org.jetbrains.uast.java
import com.intellij.psi.PsiField import com.intellij.psi.PsiField
import com.intellij.psi.PsiLocalVariable
import com.intellij.psi.PsiVariable import com.intellij.psi.PsiVariable
import org.jetbrains.uast.* import org.jetbrains.uast.*
import org.jetbrains.uast.psi.PsiElementBacked import org.jetbrains.uast.psi.PsiElementBacked
@@ -34,6 +35,7 @@ class JavaUVariable(
override val kind = when (psi) { override val kind = when (psi) {
is PsiField -> UastVariableKind.MEMBER is PsiField -> UastVariableKind.MEMBER
is PsiLocalVariable -> UastVariableKind.LOCAL_VARIABLE
else -> UastVariableKind.LOCAL_VARIABLE else -> UastVariableKind.LOCAL_VARIABLE
} }
plugins/uast-java/src/org/jetbrains/uast/java/expressions/JavaULiteralExpression.kt
-5
View File
@@ -15,7 +15,6 @@
*/ */
package org.jetbrains.uast.java package org.jetbrains.uast.java
import com.intellij.psi.PsiKeyword
import com.intellij.psi.PsiLiteralExpression import com.intellij.psi.PsiLiteralExpression
import org.jetbrains.uast.UElement import org.jetbrains.uast.UElement
import org.jetbrains.uast.ULiteralExpression import org.jetbrains.uast.ULiteralExpression
@@ -25,10 +24,6 @@ class JavaULiteralExpression(
override val psi: PsiLiteralExpression, override val psi: PsiLiteralExpression,
override val parent: UElement override val parent: UElement
) : JavaAbstractUElement(), ULiteralExpression, PsiElementBacked, JavaUElementWithType { ) : JavaAbstractUElement(), ULiteralExpression, PsiElementBacked, JavaUElementWithType {
override fun asString() = psi.text
override fun evaluate() = psi.value override fun evaluate() = psi.value
override val value by lz { evaluate() } override val value by lz { evaluate() }
override val isNull: Boolean
get() = asString() == PsiKeyword.NULL
} }
plugins/uast-java/src/org/jetbrains/uast/java/expressions/JavaUPostfixExpression.kt
+1 -1
View File
@@ -28,7 +28,7 @@ class JavaUPostfixExpression(
) : JavaAbstractUElement(), UPostfixExpression, PsiElementBacked, JavaUElementWithType, JavaEvaluatableUElement { ) : JavaAbstractUElement(), UPostfixExpression, PsiElementBacked, JavaUElementWithType, JavaEvaluatableUElement {
override val operand by lz { JavaConverter.convertOrEmpty(psi.operand, this) } override val operand by lz { JavaConverter.convertOrEmpty(psi.operand, this) }
override val operator = when (psi.operationSign) { override val operator = when (psi.operationTokenType) {
JavaTokenType.PLUSPLUS -> UastPostfixOperator.INC JavaTokenType.PLUSPLUS -> UastPostfixOperator.INC
JavaTokenType.MINUSMINUS -> UastPostfixOperator.DEC JavaTokenType.MINUSMINUS -> UastPostfixOperator.DEC
else -> UastPostfixOperator.UNKNOWN else -> UastPostfixOperator.UNKNOWN
plugins/uast-java/src/org/jetbrains/uast/java/expressions/JavaUPrefixExpression.kt
+1 -1
View File
@@ -28,7 +28,7 @@ class JavaUPrefixExpression(
) : JavaAbstractUElement(), UPrefixExpression, PsiElementBacked, JavaUElementWithType, JavaEvaluatableUElement { ) : JavaAbstractUElement(), UPrefixExpression, PsiElementBacked, JavaUElementWithType, JavaEvaluatableUElement {
override val operand by lz { JavaConverter.convertOrEmpty(psi.operand, this) } override val operand by lz { JavaConverter.convertOrEmpty(psi.operand, this) }
override val operator = when (psi.operationSign) { override val operator = when (psi.operationTokenType) {
JavaTokenType.PLUS -> UastPrefixOperator.UNARY_PLUS JavaTokenType.PLUS -> UastPrefixOperator.UNARY_PLUS
JavaTokenType.MINUS -> UastPrefixOperator.UNARY_MINUS JavaTokenType.MINUS -> UastPrefixOperator.UNARY_MINUS
JavaTokenType.PLUSPLUS -> UastPrefixOperator.INC JavaTokenType.PLUSPLUS -> UastPrefixOperator.INC
plugins/uast-java/src/org/jetbrains/uast/java/internal/javaInternalUastUtils.kt
+1
View File
@@ -52,6 +52,7 @@ internal fun PsiModifierListOwner.getVisibility(): UastVisibility {
if (hasModifierProperty(PsiModifier.PUBLIC)) return UastVisibility.PUBLIC if (hasModifierProperty(PsiModifier.PUBLIC)) return UastVisibility.PUBLIC
if (hasModifierProperty(PsiModifier.PROTECTED)) return UastVisibility.PROTECTED if (hasModifierProperty(PsiModifier.PROTECTED)) return UastVisibility.PROTECTED
if (hasModifierProperty(PsiModifier.PRIVATE)) return UastVisibility.PRIVATE if (hasModifierProperty(PsiModifier.PRIVATE)) return UastVisibility.PRIVATE
if (this is PsiLocalVariable) return UastVisibility.LOCAL
return JavaUastVisibilities.PACKAGE_LOCAL return JavaUastVisibilities.PACKAGE_LOCAL
} }
plugins/uast-java/testData/log/ControlStructures.txt
Vendored
+8 -6
View File
@@ -1,4 +1,4 @@
UFile (package = null) UFile (package = )
UClass (_Dummy_, kind = class) UClass (_Dummy_, kind = class)
UClass (ControlStructures, kind = class) UClass (ControlStructures, kind = class)
UFunction (main, kind = function, paramCount = 1) UFunction (main, kind = function, paramCount = 1)
@@ -10,8 +10,8 @@ UFile (package = null)
USimpleReferenceExpression (length) USimpleReferenceExpression (length)
ULiteralExpression (0) ULiteralExpression (0)
UBlockExpression UBlockExpression
USpecialExpressionList (return) UReturnExpression
<no element>
EmptyExpression EmptyExpression
UDeclarationsExpression UDeclarationsExpression
UVariable (mode, kind = local) UVariable (mode, kind = local)
@@ -23,7 +23,9 @@ UFile (package = null)
ULiteralExpression (1) ULiteralExpression (1)
ULiteralExpression ("singleArg") ULiteralExpression ("singleArg")
ULiteralExpression ("multiArgs") ULiteralExpression ("multiArgs")
UForEachExpression (arg) UForEachExpression
UVariable (arg, kind = parameter)
<no initializer>
USimpleReferenceExpression (args) USimpleReferenceExpression (args)
UBlockExpression UBlockExpression
UQualifiedExpression UQualifiedExpression
@@ -79,7 +81,7 @@ UFile (package = null)
USimpleReferenceExpression (i) USimpleReferenceExpression (i)
UPostfixExpression (++) UPostfixExpression (++)
USimpleReferenceExpression (i) USimpleReferenceExpression (i)
UAssignmentExpression (=) UBinaryExpression (=)
USimpleReferenceExpression (i) USimpleReferenceExpression (i)
ULiteralExpression (0) ULiteralExpression (0)
UDoWhileExpression UDoWhileExpression
@@ -96,6 +98,6 @@ UFile (package = null)
UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1)
USimpleReferenceExpression (println) USimpleReferenceExpression (println)
USimpleReferenceExpression (i) USimpleReferenceExpression (i)
UAssignmentExpression (+=) UBinaryExpression (+=)
USimpleReferenceExpression (i) USimpleReferenceExpression (i)
ULiteralExpression (1) ULiteralExpression (1)
plugins/uast-java/testData/log/Lambda.txt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
UFile (package = null) UFile (package = )
UClass (_Dummy_, kind = class) UClass (_Dummy_, kind = class)
UClass (Lambda, kind = class) UClass (Lambda, kind = class)
UFunction (example, kind = function, paramCount = 0) UFunction (example, kind = function, paramCount = 0)
@@ -27,4 +27,4 @@ UFile (package = null)
USimpleReferenceExpression (arg) USimpleReferenceExpression (arg)
UClass (Job, kind = interface) UClass (Job, kind = interface)
UFunction (doJob, kind = function, paramCount = 1) UFunction (doJob, kind = function, paramCount = 1)
EmptyExpression <no element>
plugins/uast-java/testData/log/NestedClasses.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
UFile (package = null) UFile (package = )
UClass (_Dummy_, kind = class) UClass (_Dummy_, kind = class)
UClass (NestedClasses, kind = class) UClass (NestedClasses, kind = class)
UClass (Nested, kind = class) UClass (Nested, kind = class)
plugins/uast-java/testData/log/Simple.txt
Vendored
+5 -5
View File
@@ -1,22 +1,22 @@
UFile (package = null) UFile (package = )
UClass (_Dummy_, kind = class) UClass (_Dummy_, kind = class)
UClass (Simple, kind = class) UClass (Simple, kind = class)
UVariable (name, kind = member) UVariable (name, kind = member)
EmptyExpression EmptyExpression
UFunction (<init>, kind = CONSTRUCTOR, paramCount = 1) UFunction (<init>, kind = constructor, paramCount = 1)
UBlockExpression UBlockExpression
UAssignmentExpression (=) UBinaryExpression (=)
UQualifiedExpression UQualifiedExpression
UThisExpression UThisExpression
USimpleReferenceExpression (name) USimpleReferenceExpression (name)
USimpleReferenceExpression (name) USimpleReferenceExpression (name)
UFunction (getName, kind = function, paramCount = 0) UFunction (getName, kind = function, paramCount = 0)
UBlockExpression UBlockExpression
USpecialExpressionList (return) UReturnExpression
USimpleReferenceExpression (name) USimpleReferenceExpression (name)
UFunction (setName, kind = function, paramCount = 1) UFunction (setName, kind = function, paramCount = 1)
UBlockExpression UBlockExpression
UAssignmentExpression (=) UBinaryExpression (=)
UQualifiedExpression UQualifiedExpression
UThisExpression UThisExpression
USimpleReferenceExpression (name) USimpleReferenceExpression (name)
plugins/uast-java/testData/log/SpecialExpressions.txt
Vendored
+27 -31
View File
@@ -1,28 +1,27 @@
UFile (package = null) UFile (package = )
UClass (_Dummy_, kind = class) UClass (_Dummy_, kind = class)
UClass (SpecialExpressions, kind = class) UClass (SpecialExpressions, kind = class)
UFunction (test, kind = function, paramCount = 0) UFunction (test, kind = function, paramCount = 0)
UBlockExpression UBlockExpression
USpecialExpressionList (assert) UFunctionCallExpression (UastCallKind(name='assert'), argCount = 1)
<no element>
UBinaryExpression (>) UBinaryExpression (>)
ULiteralExpression (5) ULiteralExpression (5)
ULiteralExpression (3) ULiteralExpression (3)
EmptyExpression UFunctionCallExpression (UastCallKind(name='assert'), argCount = 2)
USpecialExpressionList (assert) <no element>
UBinaryExpression (>) UBinaryExpression (>)
ULiteralExpression (5) ULiteralExpression (5)
ULiteralExpression (3) ULiteralExpression (3)
ULiteralExpression ("Message") ULiteralExpression ("Message")
USpecialExpressionList (synchronized) UBlockExpression
UThisExpression UQualifiedExpression
UBlockExpression
UQualifiedExpression UQualifiedExpression
UQualifiedExpression USimpleReferenceExpression (System)
USimpleReferenceExpression (System) USimpleReferenceExpression (out)
USimpleReferenceExpression (out) UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1)
UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) USimpleReferenceExpression (println)
USimpleReferenceExpression (println) ULiteralExpression ("A")
ULiteralExpression ("A")
UDeclarationsExpression UDeclarationsExpression
UVariable (a, kind = local) UVariable (a, kind = local)
ULiteralExpression (5) ULiteralExpression (5)
@@ -40,8 +39,7 @@ UFile (package = null)
USimpleReferenceExpression (a) USimpleReferenceExpression (a)
ULiteralExpression (3) ULiteralExpression (3)
UBlockExpression UBlockExpression
USpecialExpressionList (break) UBreakExpression (<no label>)
EmptyExpression EmptyExpression
UIfExpression UIfExpression
UBinaryExpression (===) UBinaryExpression (===)
@@ -50,8 +48,7 @@ UFile (package = null)
ULiteralExpression (5) ULiteralExpression (5)
ULiteralExpression (0) ULiteralExpression (0)
UBlockExpression UBlockExpression
USpecialExpressionList (continue) UContinueExpression (<no label>)
EmptyExpression EmptyExpression
UPostfixExpression (--) UPostfixExpression (--)
USimpleReferenceExpression (a) USimpleReferenceExpression (a)
@@ -71,26 +68,25 @@ UFile (package = null)
USwitchExpression USwitchExpression
USimpleReferenceExpression (a) USimpleReferenceExpression (a)
UBlockExpression UBlockExpression
UExpressionSwitchClauseExpression USwitchClauseExpression
ULiteralExpression (1) ULiteralExpression (1)
UBlockExpression UBlockExpression
UAssignmentExpression (=) UBinaryExpression (=)
USimpleReferenceExpression (x) USimpleReferenceExpression (x)
ULiteralExpression ("1") ULiteralExpression ("1")
USpecialExpressionList (break) UBreakExpression (<no label>)
USwitchClauseExpression
UExpressionSwitchClauseExpression
ULiteralExpression (3) ULiteralExpression (3)
UAssignmentExpression (=) UBinaryExpression (=)
USimpleReferenceExpression (x) USimpleReferenceExpression (x)
ULiteralExpression ("3") ULiteralExpression ("3")
UExpressionSwitchClauseExpression USwitchClauseExpression
ULiteralExpression (4) ULiteralExpression (4)
UAssignmentExpression (=) UBinaryExpression (=)
USimpleReferenceExpression (x) USimpleReferenceExpression (x)
ULiteralExpression ("4") ULiteralExpression ("4")
UDefaultSwitchClause DefaultUSwitchClauseExpression
UAssignmentExpression (=) UBinaryExpression (=)
USimpleReferenceExpression (x) USimpleReferenceExpression (x)
ULiteralExpression ("") ULiteralExpression ("")
UIfExpression UIfExpression
@@ -105,7 +101,7 @@ UFile (package = null)
USimpleReferenceExpression (equals) USimpleReferenceExpression (equals)
ULiteralExpression ("1") ULiteralExpression ("1")
UBlockExpression UBlockExpression
USpecialExpressionList (throw) UThrowExpression
UFunctionCallExpression (UastCallKind(name='constructor_call'), argCount = 1) UFunctionCallExpression (UastCallKind(name='constructor_call'), argCount = 1)
<no element> <no element>
ULiteralExpression ("Err") ULiteralExpression ("Err")
@@ -119,12 +115,12 @@ UFile (package = null)
ULiteralExpression (1000) UCatchClause ULiteralExpression (1000) UCatchClause
UBlockExpression UBlockExpression
UBlockExpression UBlockExpression
UAssignmentExpression (=) UBinaryExpression (=)
USimpleReferenceExpression (a) USimpleReferenceExpression (a)
ULiteralExpression (3) ULiteralExpression (3)
UBlockExpression UBlockExpression
UAssignmentExpression (=) UBinaryExpression (=)
USimpleReferenceExpression (a) USimpleReferenceExpression (a)
ULiteralExpression (5) ULiteralExpression (5)
USpecialExpressionList (return) UReturnExpression
ULiteralExpression (true) ULiteralExpression (true)
plugins/uast-java/testData/render/ControlStructures.txt
Vendored
+6 -7
View File
@@ -1,20 +1,20 @@
default class _Dummy_ { package_local class _Dummy_ {
default class ControlStructures { package_local class ControlStructures {
public fun main(args: String[]): void { public static fun main(args: String[]): void {
if (args.length === 0) { if (args.length === 0) {
return return
} }
var mode: String = (args.length === 1) ? ("singleArg") : ("multiArgs") local var mode: String = (args.length === 1) ? ("singleArg") : ("multiArgs")
for (arg : args) { for (arg : args) {
System.out.println(arg) System.out.println(arg)
} }
for (var i: int = 0; i < args.length; ++i) { for (local var i: int = 0; i < args.length; ++i) {
System.out.println(i + ": " + args[i]) System.out.println(i + ": " + args[i])
} }
var i: int = 0 local var i: int = 0
while (i < args.length) { while (i < args.length) {
System.out.println("Index " + i) System.out.println("Index " + i)
i++ i++
@@ -28,6 +28,5 @@ default class _Dummy_ {
while (i < args.length) while (i < args.length)
} }
} }
} }
plugins/uast-java/testData/render/Lambda.txt
Vendored
+7 -7
View File
@@ -1,17 +1,17 @@
default class _Dummy_ { package_local class _Dummy_ {
default class Lambda { package_local class Lambda {
default fun example(): void { package_local fun example(): void {
doJob({ arg: String -> doJob({ arg: String ->
arg + arg arg + arg
}, "Mary") }, "Mary")
} }
default fun doJob(job: Job, arg: String): void { package_local fun doJob(job: Job, arg: String): void {
System.out.println(job.doJob(arg)) System.out.println(job.doJob(arg))
} }
} }
default abstract static interface Job {
public fun doJob(arg: String): String = EmptyExpression package_local abstract static interface Job {
public abstract fun doJob(arg: String): String
} }
} }
plugins/uast-java/testData/render/NestedClasses.txt
Vendored
+6 -7
View File
@@ -1,14 +1,13 @@
default class _Dummy_ { package_local class _Dummy_ {
default class NestedClasses { package_local class NestedClasses {
public static class Nested { public static class Nested {
default fun func1(): void { package_local fun func1(): void {
} }
} }
public class Inner {
default fun func2(): void {
}
public class Inner {
package_local fun func2(): void {
}
} }
} }
} }
plugins/uast-java/testData/render/Simple.txt
Vendored
+3 -4
View File
@@ -1,6 +1,6 @@
default class _Dummy_ { package_local class _Dummy_ {
default class Simple { package_local class Simple {
var name: String private var name: String
public fun <init>(name: String) { public fun <init>(name: String) {
this.name = name this.name = name
@@ -13,6 +13,5 @@ default class _Dummy_ {
public fun setName(name: String): void { public fun setName(name: String): void {
this.name = name this.name = name
} }
} }
} }
plugins/uast-java/testData/render/SpecialExpressions.txt
Vendored
+10 -14
View File
@@ -1,15 +1,15 @@
default class _Dummy_ { package_local class _Dummy_ {
default class SpecialExpressions { package_local class SpecialExpressions {
default fun test(): boolean { package_local fun test(): boolean {
assert 5 > 3 : EmptyExpression <assert>(5 > 3)
assert 5 > 3 : "Message" <assert>(5 > 3, "Message")
synchronized this : { {
System.out.println("A") System.out.println("A")
} }
var a: int = 5 local var a: int = 5
var b: int = 7 local var b: int = 7
var c: int local var c: int
while (a > 0) { while (a > 0) {
if (a === 3) { if (a === 3) {
break break
@@ -24,7 +24,7 @@ default class _Dummy_ {
this.test() this.test()
super.hashCode() super.hashCode()
var x: String local var x: String
switch (a) switch (a)
{ {
1 -> 1 ->
@@ -49,20 +49,16 @@ default class _Dummy_ {
try { try {
Thread.sleep(1000) Thread.sleep(1000)
} }
catch (e) { catch (e) {
} }
finally { finally {
a = 3 a = 3
} }
{ {
a = 5 a = 5
} }
return true return true
} }
} }
} }
plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/KotlinUastLanguagePlugin.kt
+1 -1
View File
@@ -117,7 +117,7 @@ internal object KotlinConverter : UastConverter {
is KtStringTemplateExpression -> { is KtStringTemplateExpression -> {
if (expression.entries.isEmpty()) if (expression.entries.isEmpty())
KotlinStringULiteralExpression(expression, parent) KotlinStringULiteralExpression(expression, parent, "")
else if (expression.entries.size == 1) else if (expression.entries.size == 1)
convert(expression.entries[0], parent) convert(expression.entries[0], parent)
else else
plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinULiteralExpression.kt
-2
View File
@@ -39,8 +39,6 @@ class KotlinStringULiteralExpression(
override val parent: UElement, override val parent: UElement,
val text: String? = null val text: String? = null
) : KotlinAbstractUElement(), ULiteralExpression, PsiElementBacked, KotlinUElementWithType{ ) : KotlinAbstractUElement(), ULiteralExpression, PsiElementBacked, KotlinUElementWithType{
override val isNull = false
override val value: String override val value: String
get() = text ?: StringUtil.unescapeStringCharacters(psi.text) get() = text ?: StringUtil.unescapeStringCharacters(psi.text)
plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/extensions/PropertyAsCallAndroidUastVisitorExtension.kt
+1 -1
View File
@@ -47,7 +47,7 @@ class PropertyAsCallAndroidUastVisitorExtension : UastVisitorExtension {
else else
null null
val callExpression: UCallExpression = object : UCallExpression, PsiElementBacked, SynthetizedUElement { val callExpression: UCallExpression = object : UCallExpression, PsiElementBacked, SynthesizedUElement {
override val parent = element.parent override val parent = element.parent
override val psi = ktElement override val psi = ktElement
plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/internal/kotlinInternalUastUtils.kt
+2 -1
View File
@@ -49,7 +49,8 @@ internal fun KtModifierListOwner.hasModifier(modifier: UastModifier): Boolean {
if (this is KtClassOrObject && !hasModifier(KtTokens.INNER_KEYWORD)) { if (this is KtClassOrObject && !hasModifier(KtTokens.INNER_KEYWORD)) {
return true return true
} }
if (this is KtDeclaration && parent is KtObjectDeclaration) { if (this is KtDeclaration && (parent is KtObjectDeclaration ||
parent is KtClassBody && parent?.parent is KtObjectDeclaration)) {
return true return true
} }
return false return false
plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/AbstractKotlinUastStructureTest.kt
+5 -5
View File
@@ -51,17 +51,17 @@ abstract class AbstractKotlinUastStructureTest : KotlinLightCodeInsightFixtureTe
private fun genTree(node: UElement): String { private fun genTree(node: UElement): String {
val builder = StringBuilder() val builder = StringBuilder()
val visitor = object : AbstractUastVisitor() { val visitor = object : AbstractUastVisitor() {
private tailrec fun getParentCount(node: UElement): Int { private tailrec fun height(node: UElement, current: Int): Int {
val parent = node.parent ?: return 0 val parent = node.parent ?: return current
return getParentCount(parent) return height(parent, current + 1)
} }
override fun visitElement(node: UElement): Boolean { override fun visitElement(node: UElement): Boolean {
builder.appendln(" ".repeat(getParentCount(node)) + node.javaClass.name) builder.appendln(" ".repeat(height(node, 0)) + node.javaClass.simpleName)
return super.visitElement(node) return super.visitElement(node)
} }
} }
visitor.visitElement(node) node.accept(visitor)
return builder.toString() return builder.toString()
} }
plugins/uast-kotlin/testData/ControlStructures.kt
Vendored
+111 -98
View File
@@ -4,104 +4,117 @@ class ControlStructures {
fun nullFun(): String? = null fun nullFun(): String? = null
fun test(): Boolean { fun test(): Boolean {
"" " "
// " " "Z"
// "Z Z" "Z Z"
//
// val qwe = 2
// " $qwe "
// "5\n 2"
// "\t\t\t"
// if (5 > 3) { 'c'
// println("5 > 3") 5
// } 5.0
// 5.0f
// for (c in "ABC") { -5
// println(c) +5
// } 0.0
// -0.0
// for (c: Char in "DEF") { 1E10
// println(c.toByte()) 1E-10
// }
// val qwe = 2
// var i = 5 " $qwe "
// while (i > 0) { "a\"b"
// i-- "a'b\r\n"
// if (i == 3) break "5\n 2"
// if (i == 2) { "\t\t\t"
// continue
// } if (5 > 3) {
// } println("5 > 3")
// }
// "" is String
// ("" as Any) as String? for (c in "ABC") {
// println(c)
// super.equals(this) }
// this.equals(this)
// for (c: Char in "DEF") {
// this@ControlStructures.equals(this) println(c.toByte())
// }
// ControlStructures::test
// ControlStructures::prop var i = 5
// ControlStructures::class.java while (i > 0) {
// i--
// outer@ for (outerVal in 1..2) { if (i == 3) break
// inner@ for (innerVal in 3..4) { if (i == 2) {
// continue@outer continue
// } }
// break@outer }
// }
// "" is String
// nullFun()?.let { println(it) } ("" as Any) as String?
//
// i = 5 super.equals(this)
// do { this.equals(this)
// i -= 1
// } while (i > 0) this@ControlStructures.equals(this)
//
// "ABC".forEach { println(it.toString()[0]) } ControlStructures::test
// ControlStructures::prop
// "ABC".zip("DEF").forEach { println(it.first + " " + it.second) } ControlStructures::class.java
//
// val arr = arrayOf("A", "B", "C") outer@ for (outerVal in 1..2) {
// println(arr[2]) inner@ for (innerVal in 3..4) {
// continue@outer
// val (a, b) = "ABC".zip("DEF") }
// break@outer
// val value = if (5 > 3) "a" else "b" }
// val list = listOf("A")
// val list2 = listOf("A") nullFun()?.let { println(it) }
//
// val type = when (value) { i = 5
// in list -> "inlist" do {
// !in list2 -> "notinlist2" i -= 1
// is String -> "string" } while (i > 0)
// is CharSequence -> "cs"
// else -> "unknown" "ABC".forEach { println(it.toString()[0]) }
// }
// "ABC".zip("DEF").forEach { println(it.first + " " + it.second) }
// val x = when {
// value == "b" -> "B" val arr = arrayOf("A", "B", "C")
// 5 % 2 == 0 -> { println(arr[2])
// println("A")
// "Q" val (a, b) = "ABC".zip("DEF")
// }
// false -> "!" val value = if (5 > 3) "a" else "b"
// else -> "A" val list = listOf("A")
// } val list2 = listOf("A")
//
// try { val type = when (value) {
// 5 + 1 in list -> "inlist"
// throw Exception() !in list2 -> "notinlist2"
// } catch (e: Exception) { is String -> "string"
// e.printStackTrace() is CharSequence -> "cs"
// } catch (thr: Throwable) { else -> "unknown"
// System.out.println("error!") }
// } finally {
// System.out.println("finally") val x = when {
// } value == "b" -> "B"
// 5 % 2 == 0 -> {
// return false 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
} }
} }
plugins/uast-kotlin/testData/log/ControlStructures.txt
Vendored
+195 -34
View File
@@ -1,9 +1,57 @@
UFile (package = null) UFile (package = )
UClass (ControlStructures, kind = class) UClass (ControlStructures, kind = class)
UFunction (<init>, kind = CONSTRUCTOR, paramCount = 0) UFunction (<init>, kind = constructor, paramCount = 0)
EmptyExpression <no element>
UVariable (prop, kind = member)
ULiteralExpression (3)
UFunction (nullFun, kind = function, paramCount = 0)
ULiteralExpression (null)
UFunction (test, kind = function, paramCount = 0) UFunction (test, kind = function, paramCount = 0)
UBlockExpression 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 UIfExpression
UBinaryExpression (>) UBinaryExpression (>)
ULiteralExpression (5) ULiteralExpression (5)
@@ -13,13 +61,17 @@ UFile (package = null)
USimpleReferenceExpression (println) USimpleReferenceExpression (println)
ULiteralExpression ("5 > 3") ULiteralExpression ("5 > 3")
<no element> <no element>
UForEachExpression (c) UForEachExpression
UVariable (c, kind = parameter)
<no initializer>
ULiteralExpression ("ABC") ULiteralExpression ("ABC")
UBlockExpression UBlockExpression
UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1)
USimpleReferenceExpression (println) USimpleReferenceExpression (println)
USimpleReferenceExpression (c) USimpleReferenceExpression (c)
UForEachExpression (c) UForEachExpression
UVariable (c, kind = parameter)
<no initializer>
ULiteralExpression ("DEF") ULiteralExpression ("DEF")
UBlockExpression UBlockExpression
UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1)
@@ -43,17 +95,71 @@ UFile (package = null)
UBinaryExpression (==) UBinaryExpression (==)
USimpleReferenceExpression (i) USimpleReferenceExpression (i)
ULiteralExpression (3) ULiteralExpression (3)
USpecialExpressionList (break) UBreakExpression (<no label>)
<no element> <no element>
UIfExpression UIfExpression
UBinaryExpression (==) UBinaryExpression (==)
USimpleReferenceExpression (i) USimpleReferenceExpression (i)
ULiteralExpression (2) ULiteralExpression (2)
UBlockExpression UBlockExpression
USpecialExpressionList (continue) UContinueExpression (<no label>)
<no element> <no element>
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)
<no initializer>
UBinaryExpression (..)
ULiteralExpression (1)
ULiteralExpression (2)
UBlockExpression
ULabeledExpression (inner)
UForEachExpression
UVariable (innerVal, kind = parameter)
<no initializer>
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 (=) UBinaryExpression (=)
USimpleReferenceExpression (i) USimpleReferenceExpression (i)
ULiteralExpression (5) ULiteralExpression (5)
@@ -103,6 +209,18 @@ UFile (package = null)
UQualifiedExpression UQualifiedExpression
USimpleReferenceExpression (it) USimpleReferenceExpression (it)
USimpleReferenceExpression (second) 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 UDeclarationsExpression
UVariable (var1496943053, kind = local) UVariable (var1496943053, kind = local)
UQualifiedExpression UQualifiedExpression
@@ -145,58 +263,101 @@ UFile (package = null)
USwitchExpression USwitchExpression
USimpleReferenceExpression (value) USimpleReferenceExpression (value)
USpecialExpressionList (when) USpecialExpressionList (when)
KotlinUSwitchEntry USwitchClauseExpressionWithBody
UBinaryExpression (in)
USimpleReferenceExpression (it)
USimpleReferenceExpression (list)
USpecialExpressionList (when_entry) USpecialExpressionList (when_entry)
ULiteralExpression ("inlist") ULiteralExpression ("inlist")
USpecialExpressionList (break) UBreakExpression (<no label>)
USwitchClauseExpressionWithBody
KotlinUSwitchEntry UBinaryExpression (in)
USimpleReferenceExpression (it)
USimpleReferenceExpression (list2)
USpecialExpressionList (when_entry) USpecialExpressionList (when_entry)
ULiteralExpression ("notinlist2") ULiteralExpression ("notinlist2")
USpecialExpressionList (break) UBreakExpression (<no label>)
USwitchClauseExpressionWithBody
KotlinUSwitchEntry UBinaryExpressionWithType (null, is)
USimpleReferenceExpression (it)
USpecialExpressionList (when_entry) USpecialExpressionList (when_entry)
ULiteralExpression ("string") ULiteralExpression ("string")
USpecialExpressionList (break) UBreakExpression (<no label>)
USwitchClauseExpressionWithBody
KotlinUSwitchEntry UBinaryExpressionWithType (null, is)
USimpleReferenceExpression (it)
USpecialExpressionList (when_entry) USpecialExpressionList (when_entry)
ULiteralExpression ("cs") ULiteralExpression ("cs")
USpecialExpressionList (break) UBreakExpression (<no label>)
USwitchClauseExpressionWithBody
KotlinUSwitchEntry
USpecialExpressionList (when_entry) USpecialExpressionList (when_entry)
ULiteralExpression ("unknown") ULiteralExpression ("unknown")
USpecialExpressionList (break) UBreakExpression (<no label>)
UDeclarationsExpression UDeclarationsExpression
UVariable (x, kind = local) UVariable (x, kind = local)
USwitchExpression USwitchExpression
<no element> <no element>
USpecialExpressionList (when) USpecialExpressionList (when)
KotlinUSwitchEntry USwitchClauseExpressionWithBody
UBinaryExpression (==)
USimpleReferenceExpression (value)
ULiteralExpression ("b")
USpecialExpressionList (when_entry) USpecialExpressionList (when_entry)
ULiteralExpression ("B") ULiteralExpression ("B")
USpecialExpressionList (break) UBreakExpression (<no label>)
USwitchClauseExpressionWithBody
KotlinUSwitchEntry UBinaryExpression (==)
UBinaryExpression (%)
ULiteralExpression (5)
ULiteralExpression (2)
ULiteralExpression (0)
USpecialExpressionList (when_entry) USpecialExpressionList (when_entry)
UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1)
USimpleReferenceExpression (println) USimpleReferenceExpression (println)
ULiteralExpression ("A") ULiteralExpression ("A")
ULiteralExpression ("Q") ULiteralExpression ("Q")
USpecialExpressionList (break) UBreakExpression (<no label>)
USwitchClauseExpressionWithBody
KotlinUSwitchEntry ULiteralExpression (false)
USpecialExpressionList (when_entry) USpecialExpressionList (when_entry)
ULiteralExpression ("!") ULiteralExpression ("!")
USpecialExpressionList (break) UBreakExpression (<no label>)
USwitchClauseExpressionWithBody
KotlinUSwitchEntry
USpecialExpressionList (when_entry) USpecialExpressionList (when_entry)
ULiteralExpression ("A") ULiteralExpression ("A")
USpecialExpressionList (break) UBreakExpression (<no label>)
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)
USpecialExpressionList (return) 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) ULiteralExpression (false)
plugins/uast-kotlin/testData/log/Declarations.txt
Vendored
+5 -5
View File
@@ -1,7 +1,7 @@
UFile (package = ) UFile (package = )
UClass (Declarations, kind = class) UClass (Declarations, kind = class)
UFunction (<init>, kind = constructor, paramCount = 0) UFunction (<init>, kind = constructor, paramCount = 0)
EmptyExpression <no element>
UVariable (a, kind = member) UVariable (a, kind = member)
ULiteralExpression ("a") ULiteralExpression ("a")
UVariable (b, kind = member) UVariable (b, kind = member)
@@ -10,22 +10,22 @@ UFile (package = )
EmptyExpression EmptyExpression
UClass (NestedClass, kind = class) UClass (NestedClass, kind = class)
UFunction (<init>, kind = constructor, paramCount = 0) UFunction (<init>, kind = constructor, paramCount = 0)
EmptyExpression <no element>
UVariable (b, kind = member) UVariable (b, kind = member)
ULiteralExpression ("b") ULiteralExpression ("b")
UClass (InnerClass, kind = class) UClass (InnerClass, kind = class)
UFunction (<init>, kind = constructor, paramCount = 0) UFunction (<init>, kind = constructor, paramCount = 0)
EmptyExpression <no element>
UVariable (c, kind = member) UVariable (c, kind = member)
USimpleReferenceExpression (a) USimpleReferenceExpression (a)
UClass (Companion, kind = companion object) UClass (Companion, kind = companion object)
UFunction (<init>, kind = constructor, paramCount = 0) UFunction (<init>, kind = constructor, paramCount = 0)
EmptyExpression <no element>
UVariable (CONST_VAL, kind = member) UVariable (CONST_VAL, kind = member)
ULiteralExpression (1) ULiteralExpression (1)
UClass (A, kind = companion object) UClass (A, kind = companion object)
UFunction (<init>, kind = constructor, paramCount = 0) UFunction (<init>, kind = constructor, paramCount = 0)
EmptyExpression <no element>
UFunction (b, kind = function, paramCount = 0) UFunction (b, kind = function, paramCount = 0)
ULiteralExpression (true) ULiteralExpression (true)
UFunction (func, kind = function, paramCount = 2) UFunction (func, kind = function, paramCount = 2)
plugins/uast-kotlin/testData/log/Simple.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
UFile (package = ) UFile (package = )
UClass (Simple, kind = class) UClass (Simple, kind = class)
UFunction (<init>, kind = constructor, paramCount = 0) UFunction (<init>, kind = constructor, paramCount = 0)
EmptyExpression <no element>
UVariable (a, kind = member) UVariable (a, kind = member)
UBinaryExpression (+) UBinaryExpression (+)
UBinaryExpression (+) UBinaryExpression (+)
@@ -21,5 +21,5 @@ UFile (package = )
UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1) UFunctionCallExpression (UastCallKind(name='function_call'), argCount = 1)
USimpleReferenceExpression (println) USimpleReferenceExpression (println)
UBinaryExpression (/) UBinaryExpression (/)
ULiteralExpression (5.0f) ULiteralExpression (5.0)
ULiteralExpression (2) ULiteralExpression (2)
plugins/uast-kotlin/testData/render/ControlStructures.txt
Vendored
+80 -15
View File
@@ -1,6 +1,31 @@
public static class ControlStructures { public static class ControlStructures {
public fun <init>() = EmptyExpression public fun <init>()
public immutable var prop: Int = 3
public fun nullFun(): String? = null
public fun test(): Boolean { 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) { if (5 > 3) {
println("5 > 3") println("5 > 3")
} }
@@ -13,7 +38,8 @@ public static class ControlStructures {
println(c.toByte()) println(c.toByte())
} }
var i: Int = 5 public var i: Int = 5
while (i > 0) { while (i > 0) {
i-- i--
if (i == 3) break if (i == 3) break
@@ -23,6 +49,25 @@ public static class ControlStructures {
} }
"" !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 i = 5
do { do {
i -= 1 i -= 1
@@ -35,13 +80,19 @@ public static class ControlStructures {
"ABC".zip("DEF").forEach({ "ABC".zip("DEF").forEach({
println(it.first + " " + it.second) println(it.first + " " + it.second)
}) })
var var1496943053: <error> = "ABC".zip("DEF") public immutable var arr: Array<String> = arrayOf("A", "B", "C")
var a: Pair<Char, Char> = var1496943053.component1()
var b: Pair<Char, Char> = var1496943053.component2() println(arr[2])
var value: String = if (5 > 3) "a" else "b" local var var1496943053: <error> = "ABC".zip("DEF")
var list: List<String> = listOf("A") local immutable var a: Pair<Char, Char> = var1496943053.component1()
var list2: List<String> = listOf("A") local immutable var b: Pair<Char, Char> = var1496943053.component2()
var type: String = switch (value) { public immutable var value: String = if (5 > 3) "a" else "b"
public immutable var list: List<String> = listOf("A")
public immutable var list2: List<String> = listOf("A")
public immutable var type: String = switch (value) {
it in list -> { it in list -> {
"inlist" "inlist"
break break
@@ -52,24 +103,25 @@ public static class ControlStructures {
break break
} }
(it) is null -> { it is String -> {
"string" "string"
break break
} }
(it) is null -> { it is CharSequence -> {
"cs" "cs"
break break
} }
else -> { -> {
"unknown" "unknown"
break break
} }
} }
var x: String = switch {
public immutable var x: String = switch {
value == "b" -> { value == "b" -> {
"B" "B"
break break
@@ -86,14 +138,27 @@ public static class ControlStructures {
break break
} }
else -> { -> {
"A" "A"
break break
} }
} }
try {
5 + 1
throw <init>()
}
catch (e) {
e.printStackTrace()
}
catch (e) {
System.out.println("error!")
}
finally {
System.out.println("finally")
}
return false return false
} }
} }
plugins/uast-kotlin/testData/render/Declarations.txt
Vendored
+5 -5
View File
@@ -1,5 +1,5 @@
public static class Declarations { public static class Declarations {
public fun <init>() = EmptyExpression public fun <init>()
public immutable var a: String = "a" public immutable var a: String = "a"
@@ -13,25 +13,25 @@ public static class Declarations {
public immutable var c: String public immutable var c: String
public static class NestedClass { public static class NestedClass {
public fun <init>() = EmptyExpression public fun <init>()
public immutable var b: String = "b" public immutable var b: String = "b"
} }
public class InnerClass { public class InnerClass {
public fun <init>() = EmptyExpression public fun <init>()
public immutable var c: CharSequence = a public immutable var c: CharSequence = a
} }
public static companion object Companion { public static companion object Companion {
public fun <init>() = EmptyExpression public fun <init>()
public immutable var CONST_VAL: Int = 1 public immutable var CONST_VAL: Int = 1
} }
public static companion object A { public static companion object A {
public fun <init>() = EmptyExpression public fun <init>()
public fun b(): Boolean = true public fun b(): Boolean = true
} }
plugins/uast-kotlin/testData/render/Simple.txt
Vendored
+3 -3
View File
@@ -1,11 +1,11 @@
public static class Simple { public static class Simple {
public fun <init>() = EmptyExpression public fun <init>()
public immutable var a: String = "text" + "other" + "text" public immutable var a: String = "text" + "other" + "text"
public immutable var b: List<String> = listOf("A") public immutable var b: List<String> = listOf("A")
public fun test(): Unit { public fun test(): Unit {
System.out.println(5.0f / 2) System.out.println(5.0 / 2)
} }
} }
plugins/uast-kotlin/testData/tree/ControlStructures.txt
Vendored
+448
View File
@@ -0,0 +1,448 @@
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
plugins/uast-kotlin/testData/tree/Declarations.txt
Vendored
+67
View File
@@ -0,0 +1,67 @@
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
plugins/uast-kotlin/testData/tree/Simple.txt
Vendored
+36
View File
@@ -0,0 +1,36 @@
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