From 7007261d7b0fc5fb90d3dc293ed23fa86da369c8 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 29 Mar 2016 22:03:02 +0300 Subject: [PATCH] Rename UastHandler to UastCallback --- .../org/jetbrains/uast/check/UastChecker.kt | 18 +++++++++--------- .../{UastHandler.java => UastCallback.java} | 2 +- .../org/jetbrains/uast/UastLanguagePlugin.kt | 2 +- .../src/org/jetbrains/uast/UastUtils.kt | 12 ++++++------ .../src/org/jetbrains/uast/UastVisitor.kt | 2 +- .../jetbrains/uast/baseElements/UElement.kt | 4 ++-- .../org/jetbrains/uast/baseElements/UFile.kt | 6 +++--- .../controlStructures/UDoWhileExpression.kt | 6 +++--- .../uast/controlStructures/UForExpression.kt | 10 +++++----- .../uast/controlStructures/UIfExpression.kt | 8 ++++---- .../controlStructures/USwitchExpression.kt | 12 ++++++------ .../uast/controlStructures/UTryExpression.kt | 12 ++++++------ .../uast/controlStructures/UWhileExpression.kt | 6 +++--- .../org/jetbrains/uast/declarations/UClass.kt | 8 ++++---- .../jetbrains/uast/declarations/UFunction.kt | 14 +++++++------- .../uast/declarations/UImportStatement.kt | 2 +- .../jetbrains/uast/declarations/UVariable.kt | 10 +++++----- .../uast/expressions/UArrayAccessExpression.kt | 6 +++--- .../uast/expressions/UAssignmentExpression.kt | 6 +++--- .../uast/expressions/UBinaryExpression.kt | 6 +++--- .../expressions/UBinaryExpressionWithType.kt | 6 +++--- .../uast/expressions/UBlockExpression.kt | 2 +- .../uast/expressions/UCallExpression.kt | 12 ++++++------ .../UCallableReferenceExpression.kt | 4 ++-- .../expressions/UDeclarationsExpression.kt | 2 +- .../uast/expressions/UExpressionList.kt | 2 +- .../uast/expressions/UForEachExpression.kt | 6 +++--- .../uast/expressions/ULabeledExpression.kt | 4 ++-- .../uast/expressions/ULambdaExpression.kt | 6 +++--- .../uast/expressions/ULiteralExpression.kt | 2 +- .../uast/expressions/UNamedExpression.kt | 4 ++-- .../expressions/UObjectLiteralExpression.kt | 4 ++-- .../expressions/UParenthesizedExpression.kt | 4 ++-- .../uast/expressions/UQualifiedExpression.kt | 6 +++--- .../uast/expressions/USuperExpression.kt | 2 +- .../uast/expressions/UThisExpression.kt | 2 +- .../uast/expressions/UUnaryExpression.kt | 4 ++-- .../uast/declarations/KotlinUAnnotationList.kt | 6 +++--- .../expressions/KotlinUSwitchExpression.kt | 4 ++-- .../expressions/UnknownKotlinExpression.kt | 4 ++-- ...opertyAsCallAndroidUastAdditionalChecker.kt | 4 ++-- 41 files changed, 121 insertions(+), 121 deletions(-) rename plugins/uast-common/src/org/jetbrains/uast/{UastHandler.java => UastCallback.java} (95%) diff --git a/plugins/lint/uast-android/src/org/jetbrains/uast/check/UastChecker.kt b/plugins/lint/uast-android/src/org/jetbrains/uast/check/UastChecker.kt index af50994863f..aa97cee1833 100644 --- a/plugins/lint/uast-android/src/org/jetbrains/uast/check/UastChecker.kt +++ b/plugins/lint/uast-android/src/org/jetbrains/uast/check/UastChecker.kt @@ -43,10 +43,10 @@ object UastChecker { file: File, context: UastAndroidContext, visitor: UastVisitor) { - check(project, file, context, UastHandler { visitor.handle(it) }) + check(project, file, context, UastCallback { visitor.handle(it) }) } - fun check(project: Project, file: File, context: UastAndroidContext, handler: UastHandler) { + fun check(project: Project, file: File, context: UastAndroidContext, callback: UastCallback) { val vfile = VirtualFileManager.getInstance().findFileByUrl("file://" + file.absolutePath) ?: return val plugins = context.languagePlugins @@ -57,7 +57,7 @@ object UastChecker { list } - val handlerWrapper = HandlerWrapper(handler, additionalCheckers, context) + val handlerWrapper = CallbackWrapper(callback, additionalCheckers, context) ApplicationManager.getApplication().runReadAction { val psiFile = PsiManager.getInstance(project).findFile(vfile) @@ -80,11 +80,11 @@ object UastChecker { } } - private class HandlerWrapper( - val original: UastHandler, + private class CallbackWrapper( + val original: UastCallback, val additionalCheckers: List, val context: UastAndroidContext - ) : UastHandler { + ) : UastCallback { override fun invoke(element: UElement) { original(element) for (checker in additionalCheckers) { @@ -100,8 +100,8 @@ object UastChecker { val appliesToResourcesRefs = scanner.appliesToResourceRefs() - var handler: UastHandler? - handler = UastHandler { element -> + var callback: UastCallback? + callback = UastCallback { element -> when (element) { is UCallExpression -> { if (applicableFunctionNames.isNotEmpty()) { @@ -150,7 +150,7 @@ object UastChecker { } } - check(project, file, context, handler) + check(project, file, context, callback) } } \ No newline at end of file diff --git a/plugins/uast-common/src/org/jetbrains/uast/UastHandler.java b/plugins/uast-common/src/org/jetbrains/uast/UastCallback.java similarity index 95% rename from plugins/uast-common/src/org/jetbrains/uast/UastHandler.java rename to plugins/uast-common/src/org/jetbrains/uast/UastCallback.java index dd7cf0f1db6..ec95608e72b 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/UastHandler.java +++ b/plugins/uast-common/src/org/jetbrains/uast/UastCallback.java @@ -15,6 +15,6 @@ */ package org.jetbrains.uast; -public interface UastHandler { +public interface UastCallback { void invoke(UElement element); } diff --git a/plugins/uast-common/src/org/jetbrains/uast/UastLanguagePlugin.kt b/plugins/uast-common/src/org/jetbrains/uast/UastLanguagePlugin.kt index 7ffab018c91..ef237242c18 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/UastLanguagePlugin.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/UastLanguagePlugin.kt @@ -28,7 +28,7 @@ interface UastLanguagePlugin { } interface UastAdditionalChecker { - operator fun invoke(element: UElement, handler: UastHandler, context: UastContext) + operator fun invoke(element: UElement, callback: UastCallback, context: UastContext) } object UastConverterUtils { diff --git a/plugins/uast-common/src/org/jetbrains/uast/UastUtils.kt b/plugins/uast-common/src/org/jetbrains/uast/UastUtils.kt index f63bbaf75e8..2e7db003108 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/UastUtils.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/UastUtils.kt @@ -44,9 +44,9 @@ tailrec fun UElement?.getContainingDeclaration(): UDeclaration? { return parent.getContainingDeclaration() } -fun UElement.handleTraverse(handler: UastHandler) { - handler(this) - this.traverse(handler) +fun UElement.handleTraverse(callback: UastCallback) { + callback(this) + this.traverse(callback) } fun UDeclaration.isTopLevel() = parent is UFile @@ -67,10 +67,10 @@ fun UElement.log(firstLine: String, vararg nested: Any?): String { val String.withMargin: String get() = lines().joinToString("\n") { " " + it } -fun List.handleTraverseList(handler: UastHandler) { +fun List.handleTraverseList(callback: UastCallback) { for (element in this) { - handler(element) - element.traverse(handler) + callback(element) + element.traverse(callback) } } diff --git a/plugins/uast-common/src/org/jetbrains/uast/UastVisitor.kt b/plugins/uast-common/src/org/jetbrains/uast/UastVisitor.kt index 5de0dc84327..5b7e7b06017 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/UastVisitor.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/UastVisitor.kt @@ -118,7 +118,7 @@ abstract class UastVisitor { } fun processChildren(element: UElement) { - element.traverse(UastHandler { handle(it) }) + element.traverse(UastCallback { handle(it) }) } } diff --git a/plugins/uast-common/src/org/jetbrains/uast/baseElements/UElement.kt b/plugins/uast-common/src/org/jetbrains/uast/baseElements/UElement.kt index b11f99f63a4..5f8f722eda0 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/baseElements/UElement.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/baseElements/UElement.kt @@ -19,7 +19,7 @@ interface UElement { val parent: UElement? fun logString(): String fun renderString(): String = logString() - fun traverse(handler: UastHandler) + fun traverse(callback: UastCallback) } interface UNamed { @@ -42,7 +42,7 @@ interface UModifierOwner { } interface NoTraverse : UElement { - override fun traverse(handler: UastHandler) {} + override fun traverse(callback: UastCallback) {} } interface UResolvable { diff --git a/plugins/uast-common/src/org/jetbrains/uast/baseElements/UFile.kt b/plugins/uast-common/src/org/jetbrains/uast/baseElements/UFile.kt index b9ddb9560dd..d65f60e98ee 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/baseElements/UFile.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/baseElements/UFile.kt @@ -26,9 +26,9 @@ interface UFile: UElement { override val parent: UElement? get() = null - override fun traverse(handler: UastHandler) { - declarations.handleTraverseList(handler) - importStatements.handleTraverseList(handler) + override fun traverse(callback: UastCallback) { + declarations.handleTraverseList(callback) + importStatements.handleTraverseList(callback) } override fun logString() = "UFile (package = $packageFqName)\n" + declarations.joinToString("\n") { it.logString().withMargin } diff --git a/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UDoWhileExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UDoWhileExpression.kt index ef8e3e18481..fb4b8e42eb3 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UDoWhileExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UDoWhileExpression.kt @@ -18,9 +18,9 @@ package org.jetbrains.uast interface UDoWhileExpression : ULoopExpression { val condition: UExpression - override fun traverse(handler: UastHandler) { - condition.handleTraverse(handler) - body.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + condition.handleTraverse(callback) + body.handleTraverse(callback) } override fun renderString() = buildString { diff --git a/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UForExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UForExpression.kt index 6d6edd26883..e265c3ea820 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UForExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UForExpression.kt @@ -20,11 +20,11 @@ interface UForExpression : ULoopExpression { val condition: UExpression? val update: UExpression? - override fun traverse(handler: UastHandler) { - declaration?.handleTraverse(handler) - condition?.handleTraverse(handler) - update?.handleTraverse(handler) - body.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + declaration?.handleTraverse(callback) + condition?.handleTraverse(callback) + update?.handleTraverse(callback) + body.handleTraverse(callback) } override fun renderString() = buildString { diff --git a/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UIfExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UIfExpression.kt index 3c737a2ce83..3730b0750d9 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UIfExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UIfExpression.kt @@ -21,10 +21,10 @@ interface UIfExpression : UExpression { val elseBranch: UExpression? val isTernary: Boolean - override fun traverse(handler: UastHandler) { - condition.handleTraverse(handler) - thenBranch?.handleTraverse(handler) - elseBranch?.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + condition.handleTraverse(callback) + thenBranch?.handleTraverse(callback) + elseBranch?.handleTraverse(callback) } override fun logString() = log("UIfExpression", condition, thenBranch, elseBranch) diff --git a/plugins/uast-common/src/org/jetbrains/uast/controlStructures/USwitchExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/controlStructures/USwitchExpression.kt index 2a098d48a14..67b603a285d 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/controlStructures/USwitchExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/controlStructures/USwitchExpression.kt @@ -19,9 +19,9 @@ interface USwitchExpression : UExpression { val expression: UExpression? val body: UExpression - override fun traverse(handler: UastHandler) { - expression?.handleTraverse(handler) - body.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + expression?.handleTraverse(callback) + body.handleTraverse(callback) } override fun logString() = log("USwitchExpression", expression, body) @@ -37,8 +37,8 @@ interface USwitchClauseExpression : UExpression interface UExpressionSwitchClauseExpression : USwitchClauseExpression { val caseValue: UExpression - override fun traverse(handler: UastHandler) { - caseValue.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + caseValue.handleTraverse(callback) } override fun renderString() = caseValue.renderString() + " -> " @@ -46,7 +46,7 @@ interface UExpressionSwitchClauseExpression : USwitchClauseExpression { } interface UDefaultSwitchClauseExpression : USwitchClauseExpression { - override fun traverse(handler: UastHandler) {} + override fun traverse(callback: UastCallback) {} override fun logString() = "UDefaultSwitchClause" override fun renderString() = "else -> " } diff --git a/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UTryExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UTryExpression.kt index b691f7e133c..981f49b1ac6 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UTryExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UTryExpression.kt @@ -21,10 +21,10 @@ interface UTryExpression : UExpression { val catchClauses: List val finallyClause: UExpression? - override fun traverse(handler: UastHandler) { - tryClause.handleTraverse(handler) - catchClauses.handleTraverseList(handler) - finallyClause?.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + tryClause.handleTraverse(callback) + catchClauses.handleTraverseList(callback) + finallyClause?.handleTraverse(callback) } override fun renderString() = buildString { @@ -45,8 +45,8 @@ interface UCatchClause : UElement { val parameters: List val types: List - override fun traverse(handler: UastHandler) { - body.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + body.handleTraverse(callback) } override fun logString() = log("UCatchClause", body) diff --git a/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UWhileExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UWhileExpression.kt index eb8ff6f78bd..04111611640 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UWhileExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/controlStructures/UWhileExpression.kt @@ -18,9 +18,9 @@ package org.jetbrains.uast interface UWhileExpression : ULoopExpression { val condition: UExpression - override fun traverse(handler: UastHandler) { - condition.handleTraverse(handler) - body.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + condition.handleTraverse(callback) + body.handleTraverse(callback) } override fun renderString() = buildString { diff --git a/plugins/uast-common/src/org/jetbrains/uast/declarations/UClass.kt b/plugins/uast-common/src/org/jetbrains/uast/declarations/UClass.kt index 9ee25e52440..1834201d752 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/declarations/UClass.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/declarations/UClass.kt @@ -51,10 +51,10 @@ interface UClass : UDeclaration, UFqNamed, UModifierOwner, UAnnotated { fun getSuperClass(context: UastContext): UClass? - override fun traverse(handler: UastHandler) { - nameElement?.handleTraverse(handler) - declarations.handleTraverseList(handler) - annotations.handleTraverseList(handler) + override fun traverse(callback: UastCallback) { + nameElement?.handleTraverse(callback) + declarations.handleTraverseList(callback) + annotations.handleTraverseList(callback) } override fun renderString(): String { diff --git a/plugins/uast-common/src/org/jetbrains/uast/declarations/UFunction.kt b/plugins/uast-common/src/org/jetbrains/uast/declarations/UFunction.kt index ecdd243ceb0..e715be5a38b 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/declarations/UFunction.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/declarations/UFunction.kt @@ -30,13 +30,13 @@ interface UFunction : UDeclaration, UModifierOwner, UAnnotated { fun getSuperFunctions(context: UastContext): List - override fun traverse(handler: UastHandler) { - nameElement?.handleTraverse(handler) - valueParameters.handleTraverseList(handler) - body.handleTraverse(handler) - annotations.handleTraverseList(handler) - typeParameters.handleTraverseList(handler) - returnType?.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + nameElement?.handleTraverse(callback) + valueParameters.handleTraverseList(callback) + body.handleTraverse(callback) + annotations.handleTraverseList(callback) + typeParameters.handleTraverseList(callback) + returnType?.handleTraverse(callback) } override fun renderString(): String { diff --git a/plugins/uast-common/src/org/jetbrains/uast/declarations/UImportStatement.kt b/plugins/uast-common/src/org/jetbrains/uast/declarations/UImportStatement.kt index a8a2672804c..e6e5633b441 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/declarations/UImportStatement.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/declarations/UImportStatement.kt @@ -22,7 +22,7 @@ interface UImportStatement : UElement { val isStarImport: Boolean val kind: UastImportKind - override fun traverse(handler: UastHandler) {} + override fun traverse(callback: UastCallback) {} override fun logString() = "UImport ($fqNameToImport)" override fun renderString() = "import ${fqNameToImport ?: ""}" } \ No newline at end of file diff --git a/plugins/uast-common/src/org/jetbrains/uast/declarations/UVariable.kt b/plugins/uast-common/src/org/jetbrains/uast/declarations/UVariable.kt index 38e9003580b..460bf2e3b2c 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/declarations/UVariable.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/declarations/UVariable.kt @@ -20,11 +20,11 @@ interface UVariable : UDeclaration, UModifierOwner, UAnnotated { val kind: UastVariableKind val type: UType - override fun traverse(handler: UastHandler) { - nameElement?.handleTraverse(handler) - initializer?.handleTraverse(handler) - annotations.handleTraverseList(handler) - type.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + nameElement?.handleTraverse(callback) + initializer?.handleTraverse(callback) + annotations.handleTraverseList(callback) + type.handleTraverse(callback) } override fun renderString(): String { diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UArrayAccessExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UArrayAccessExpression.kt index 749a069f261..244b373df20 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UArrayAccessExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UArrayAccessExpression.kt @@ -19,9 +19,9 @@ interface UArrayAccessExpression : UExpression { val receiver: UExpression val indices: List - override fun traverse(handler: UastHandler) { - receiver.handleTraverse(handler) - indices.handleTraverseList(handler) + override fun traverse(callback: UastCallback) { + receiver.handleTraverse(callback) + indices.handleTraverseList(callback) } override fun logString() = log("UArrayAccessExpression", receiver, indices) diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UAssignmentExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UAssignmentExpression.kt index 133ea82c24a..b06c9f56d06 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UAssignmentExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UAssignmentExpression.kt @@ -20,9 +20,9 @@ interface UAssignmentExpression : UExpression { val operator: String val value: UExpression - override fun traverse(handler: UastHandler) { - reference.handleTraverse(handler) - value.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + reference.handleTraverse(callback) + value.handleTraverse(callback) } override fun logString() = "UAssignmentExpression ($operator)\n" + reference.logString().withMargin + "\n" + value.logString().withMargin diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UBinaryExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UBinaryExpression.kt index b24019d3a2e..023ad12c8e9 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UBinaryExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UBinaryExpression.kt @@ -20,9 +20,9 @@ interface UBinaryExpression : UExpression { val operator: UastBinaryOperator val rightOperand: UExpression - override fun traverse(handler: UastHandler) { - leftOperand.handleTraverse(handler) - rightOperand.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + leftOperand.handleTraverse(callback) + rightOperand.handleTraverse(callback) } override fun logString() = diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UBinaryExpressionWithType.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UBinaryExpressionWithType.kt index bc1916a2517..e8527f75a33 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UBinaryExpressionWithType.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UBinaryExpressionWithType.kt @@ -23,8 +23,8 @@ interface UBinaryExpressionWithType : UExpression { override fun logString() = log("UBinaryExpressionWithType (${getExpressionType()?.name}, ${operationKind.name})", operand) override fun renderString() = "(${operand.renderString()}) ${operationKind.name} ${getExpressionType()?.name}" - override fun traverse(handler: UastHandler) { - operand.handleTraverse(handler) - type.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + operand.handleTraverse(callback) + type.handleTraverse(callback) } } \ No newline at end of file diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UBlockExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UBlockExpression.kt index 3a6fb9a7148..172d9b3251d 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UBlockExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UBlockExpression.kt @@ -18,7 +18,7 @@ package org.jetbrains.uast interface UBlockExpression : UExpression { val expressions: List - override fun traverse(handler: UastHandler) = expressions.handleTraverseList(handler) + override fun traverse(callback: UastCallback) = expressions.handleTraverseList(callback) override fun logString() = log("UBlockExpression", expressions) override fun renderString() = buildString { diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UCallExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UCallExpression.kt index 41773356988..93d4a8eac2d 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UCallExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UCallExpression.kt @@ -36,12 +36,12 @@ interface UCallExpression : UExpression, UResolvable { override fun resolve(context: UastContext): UFunction? override fun resolveOrEmpty(context: UastContext): UFunction = resolve(context) ?: UFunctionNotResolved - override fun traverse(handler: UastHandler) { - functionReference?.handleTraverse(handler) - classReference?.handleTraverse(handler) - functionNameElement?.handleTraverse(handler) - valueArguments.handleTraverseList(handler) - typeArguments.handleTraverseList(handler) + override fun traverse(callback: UastCallback) { + functionReference?.handleTraverse(callback) + classReference?.handleTraverse(callback) + functionNameElement?.handleTraverse(callback) + valueArguments.handleTraverseList(callback) + typeArguments.handleTraverseList(callback) } override fun logString() = log("UFunctionCallExpression ($kind, argCount = $valueArgumentCount)", functionReference, valueArguments) diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UCallableReferenceExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UCallableReferenceExpression.kt index 42ef013bc47..ca1b7e6c0a9 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UCallableReferenceExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UCallableReferenceExpression.kt @@ -18,8 +18,8 @@ package org.jetbrains.uast interface UCallableReferenceExpression : UExpression { val qualifierType: UType - override fun traverse(handler: UastHandler) { - qualifierType.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + qualifierType.handleTraverse(callback) } override fun logString() = "UCallableReferenceExpression" diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UDeclarationsExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UDeclarationsExpression.kt index afd6bb83de5..a1e856a0f00 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UDeclarationsExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UDeclarationsExpression.kt @@ -22,7 +22,7 @@ interface UDeclarationsExpression : UExpression { get() = declarations.filterIsInstance() override fun evaluate() = null - override fun traverse(handler: UastHandler) = declarations.handleTraverseList(handler) + override fun traverse(callback: UastCallback) = declarations.handleTraverseList(callback) override fun renderString() = declarations.joinToString("\n") { it.renderString() } override fun logString() = log("UDeclarationsExpression", declarations) diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UExpressionList.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UExpressionList.kt index c4725a154e4..6d23b04514a 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UExpressionList.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UExpressionList.kt @@ -19,7 +19,7 @@ interface UExpressionList : UExpression { val expressions: List override fun evaluate(): Any? = null - override fun traverse(handler: UastHandler) = expressions.forEach { it.handleTraverse(handler) } + override fun traverse(callback: UastCallback) = expressions.forEach { it.handleTraverse(callback) } override fun logString() = log("UExpressionList", expressions) override fun renderString() = log("", expressions) diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UForEachExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UForEachExpression.kt index 319c9891e8a..f355c9bc69c 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UForEachExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UForEachExpression.kt @@ -19,9 +19,9 @@ interface UForEachExpression : ULoopExpression { val variableName: String? val iteratedValue: UExpression - override fun traverse(handler: UastHandler) { - iteratedValue.handleTraverse(handler) - body.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + iteratedValue.handleTraverse(callback) + body.handleTraverse(callback) } override fun renderString() = buildString { diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/ULabeledExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/ULabeledExpression.kt index 1be68152c70..cb4100e3a10 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/ULabeledExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/ULabeledExpression.kt @@ -19,8 +19,8 @@ interface ULabeledExpression : UExpression { val label: String val expression: UExpression - override fun traverse(handler: UastHandler) { - expression.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + expression.handleTraverse(callback) } override fun logString() = log("ULabeledExpression ($label)", expression) diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/ULambdaExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/ULambdaExpression.kt index deb3afc94c9..9898c03e480 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/ULambdaExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/ULambdaExpression.kt @@ -19,9 +19,9 @@ interface ULambdaExpression : UExpression { val valueParameters: List val body: UExpression - override fun traverse(handler: UastHandler) { - valueParameters.handleTraverseList(handler) - body.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + valueParameters.handleTraverseList(callback) + body.handleTraverse(callback) } override fun logString() = log("ULambdaExpression", valueParameters, body) diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/ULiteralExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/ULiteralExpression.kt index 9c1ab5055c4..715590389ec 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/ULiteralExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/ULiteralExpression.kt @@ -28,7 +28,7 @@ interface ULiteralExpression : UExpression { val isBoolean: Boolean get() = evaluate() is Boolean - override fun traverse(handler: UastHandler) {} + override fun traverse(callback: UastCallback) {} override fun logString() = "ULiteralExpression ($text)" override fun renderString() = text } diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UNamedExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UNamedExpression.kt index fdeaee98412..fd259508122 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UNamedExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UNamedExpression.kt @@ -21,8 +21,8 @@ class UNamedExpression( ): UExpression, UNamed { lateinit var expression: UExpression - override fun traverse(handler: UastHandler) { - expression.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + expression.handleTraverse(callback) } override fun logString() = log("UNamedExpression ($name)", expression) diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UObjectLiteralExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UObjectLiteralExpression.kt index f22d719d856..4c47b40dc62 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UObjectLiteralExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UObjectLiteralExpression.kt @@ -18,8 +18,8 @@ package org.jetbrains.uast interface UObjectLiteralExpression : UExpression { val declaration: UClass - override fun traverse(handler: UastHandler) { - declaration.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + declaration.handleTraverse(callback) } override fun logString() = log("UObjectLiteralExpression", declaration) diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UParenthesizedExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UParenthesizedExpression.kt index 0d373ea5bb2..4239396c480 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UParenthesizedExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UParenthesizedExpression.kt @@ -18,8 +18,8 @@ package org.jetbrains.uast interface UParenthesizedExpression : UExpression { val expression: UExpression - override fun traverse(handler: UastHandler) { - expression.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + expression.handleTraverse(callback) } override fun logString() = log("UParenthesizedExpression", expression) diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UQualifiedExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UQualifiedExpression.kt index 3495c3c1826..115cf3364b6 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UQualifiedExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UQualifiedExpression.kt @@ -24,9 +24,9 @@ interface UQualifiedExpression : UExpression, UResolvable { override fun renderString() = receiver.renderString() + accessType.name + selector.renderString() - override fun traverse(handler: UastHandler) { - receiver.handleTraverse(handler) - selector.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + receiver.handleTraverse(callback) + selector.handleTraverse(callback) } override fun logString() = log("UQualifiedExpression", receiver, selector) diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/USuperExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/USuperExpression.kt index 36b4cc2519f..8995bc65bd1 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/USuperExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/USuperExpression.kt @@ -18,5 +18,5 @@ package org.jetbrains.uast interface USuperExpression : UExpression { override fun logString() = "USuperExpression" override fun renderString() = "super" - override fun traverse(handler: UastHandler) {} + override fun traverse(callback: UastCallback) {} } \ No newline at end of file diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UThisExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UThisExpression.kt index ef4f8bf757d..9a26dcd025c 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UThisExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UThisExpression.kt @@ -18,5 +18,5 @@ package org.jetbrains.uast interface UThisExpression : UExpression { override fun logString() = "UThisExpression" override fun renderString() = "this" - override fun traverse(handler: UastHandler) {} + override fun traverse(callback: UastCallback) {} } \ No newline at end of file diff --git a/plugins/uast-common/src/org/jetbrains/uast/expressions/UUnaryExpression.kt b/plugins/uast-common/src/org/jetbrains/uast/expressions/UUnaryExpression.kt index fc8b777df2e..7fc8d6c2b55 100644 --- a/plugins/uast-common/src/org/jetbrains/uast/expressions/UUnaryExpression.kt +++ b/plugins/uast-common/src/org/jetbrains/uast/expressions/UUnaryExpression.kt @@ -21,8 +21,8 @@ interface UUnaryExpression : UExpression { val operand: UExpression val operator: UastOperator - override fun traverse(handler: UastHandler) { - operand.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + operand.handleTraverse(callback) } } diff --git a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/declarations/KotlinUAnnotationList.kt b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/declarations/KotlinUAnnotationList.kt index 4bf8dcfe7c5..985487b7a49 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/declarations/KotlinUAnnotationList.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/declarations/KotlinUAnnotationList.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.uast import org.jetbrains.kotlin.psi.KtAnnotation import org.jetbrains.uast.UAnnotation import org.jetbrains.uast.UElement -import org.jetbrains.uast.UastHandler +import org.jetbrains.uast.UastCallback import org.jetbrains.uast.handleTraverseList import org.jetbrains.uast.psi.PsiElementBacked @@ -31,7 +31,7 @@ class KotlinUAnnotationList( override fun logString() = "KotlinUAnnotationList" override fun renderString() = annotations.joinToString(" ") { it.renderString() } - override fun traverse(handler: UastHandler) { - annotations.handleTraverseList(handler) + override fun traverse(callback: UastCallback) { + annotations.handleTraverseList(callback) } } \ No newline at end of file diff --git a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUSwitchExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUSwitchExpression.kt index e9122c8cb4d..6b881f0b4a9 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUSwitchExpression.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/KotlinUSwitchExpression.kt @@ -101,7 +101,7 @@ class KotlinUSwitchEntry( override fun logString() = log("KotlinUSwitchEntry", expression) - override fun traverse(handler: UastHandler) { - expression.handleTraverse(handler) + override fun traverse(callback: UastCallback) { + expression.handleTraverse(callback) } } \ No newline at end of file diff --git a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/UnknownKotlinExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/UnknownKotlinExpression.kt index 07acca8313c..b921a73724e 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/UnknownKotlinExpression.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/expressions/UnknownKotlinExpression.kt @@ -20,13 +20,13 @@ import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.uast.NoEvaluate import org.jetbrains.uast.UElement import org.jetbrains.uast.UExpression -import org.jetbrains.uast.UastHandler +import org.jetbrains.uast.UastCallback import org.jetbrains.uast.psi.PsiElementBacked class UnknownKotlinExpression( override val psi: KtExpression, override val parent: UElement ) : KotlinAbstractUElement(), UExpression, PsiElementBacked, NoEvaluate { - override fun traverse(handler: UastHandler) {} + override fun traverse(callback: UastCallback) {} override fun logString() = "[!] UnknownKotlinExpression ($psi)" } \ No newline at end of file diff --git a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/lint/PropertyAsCallAndroidUastAdditionalChecker.kt b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/lint/PropertyAsCallAndroidUastAdditionalChecker.kt index 429a914b0bd..859d2bc7c05 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/lint/PropertyAsCallAndroidUastAdditionalChecker.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/lint/PropertyAsCallAndroidUastAdditionalChecker.kt @@ -29,7 +29,7 @@ import org.jetbrains.uast.check.AndroidUastAdditionalChecker import org.jetbrains.uast.psi.PsiElementBacked class PropertyAsCallAndroidUastAdditionalChecker : AndroidUastAdditionalChecker { - override fun invoke(element: UElement, handler: UastHandler, context: UastContext) { + override fun invoke(element: UElement, callback: UastCallback, context: UastContext) { val expr = element as? KotlinUSimpleReferenceExpression ?: return if (expr is KotlinNameUSimpleReferenceExpression) return @@ -86,7 +86,7 @@ class PropertyAsCallAndroidUastAdditionalChecker : AndroidUastAdditionalChecker } } - handler(callExpression) + callback(callExpression) } private tailrec fun findAssignment(prev: PsiElement?, element: PsiElement?): KtBinaryExpression? = when (element) {