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

Minor: fix warnings in SmartStepIntoHandler

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-11-25 17:17:04 +03:00
parent 9bcc9e4b1d
commit e3e5fce3eb
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSmartStepIntoHandler.kt
+27 -27
View File
@@ -41,25 +41,25 @@ import org.jetbrains.kotlin.resolve.inline.InlineUtil
public class KotlinSmartStepIntoHandler : JvmSmartStepIntoHandler() { public class KotlinSmartStepIntoHandler : JvmSmartStepIntoHandler() {
override fun isAvailable(position: SourcePosition?) = position?.getFile() is KtFile override fun isAvailable(position: SourcePosition?) = position?.file is KtFile
override fun findSmartStepTargets(position: SourcePosition): List<SmartStepTarget> { override fun findSmartStepTargets(position: SourcePosition): List<SmartStepTarget> {
if (position.getLine() < 0) return emptyList() if (position.line < 0) return emptyList()
val file = position.getFile() val file = position.file
val lineStart = CodeInsightUtils.getStartLineOffset(file, position.getLine()) ?: return emptyList() val lineStart = CodeInsightUtils.getStartLineOffset(file, position.line) ?: return emptyList()
val elementAtOffset = file.findElementAt(lineStart) ?: return emptyList() val elementAtOffset = file.findElementAt(lineStart) ?: return emptyList()
val element = CodeInsightUtils.getTopmostElementAtOffset(elementAtOffset, lineStart) val element = CodeInsightUtils.getTopmostElementAtOffset(elementAtOffset, lineStart)
if (element !is KtElement) return emptyList() if (element !is KtElement) return emptyList()
val elementTextRange = element.getTextRange() ?: return emptyList() val elementTextRange = element.textRange ?: return emptyList()
val doc = PsiDocumentManager.getInstance(file.getProject()).getDocument(file) ?: return emptyList() val doc = PsiDocumentManager.getInstance(file.project).getDocument(file) ?: return emptyList()
val lines = Range(doc.getLineNumber(elementTextRange.getStartOffset()), doc.getLineNumber(elementTextRange.getEndOffset())) val lines = Range(doc.getLineNumber(elementTextRange.startOffset), doc.getLineNumber(elementTextRange.endOffset))
val bindingContext = element.analyzeFully() val bindingContext = element.analyzeFully()
val result = OrderedSet<SmartStepTarget>() val result = OrderedSet<SmartStepTarget>()
@@ -98,23 +98,23 @@ public class KotlinSmartStepIntoHandler : JvmSmartStepIntoHandler() {
} }
override fun visitIfExpression(expression: KtIfExpression) { override fun visitIfExpression(expression: KtIfExpression) {
expression.getCondition()?.accept(this) expression.condition?.accept(this)
} }
override fun visitWhileExpression(expression: KtWhileExpression) { override fun visitWhileExpression(expression: KtWhileExpression) {
expression.getCondition()?.accept(this) expression.condition?.accept(this)
} }
override fun visitDoWhileExpression(expression: KtDoWhileExpression) { override fun visitDoWhileExpression(expression: KtDoWhileExpression) {
expression.getCondition()?.accept(this) expression.condition?.accept(this)
} }
override fun visitForExpression(expression: KtForExpression) { override fun visitForExpression(expression: KtForExpression) {
expression.getLoopRange()?.accept(this) expression.loopRange?.accept(this)
} }
override fun visitWhenExpression(expression: KtWhenExpression) { override fun visitWhenExpression(expression: KtWhenExpression) {
expression.getSubjectExpression()?.accept(this) expression.subjectExpression?.accept(this)
} }
override fun visitArrayAccessExpression(expression: KtArrayAccessExpression) { override fun visitArrayAccessExpression(expression: KtArrayAccessExpression) {
@@ -123,17 +123,17 @@ public class KotlinSmartStepIntoHandler : JvmSmartStepIntoHandler() {
} }
override fun visitUnaryExpression(expression: KtUnaryExpression) { override fun visitUnaryExpression(expression: KtUnaryExpression) {
recordFunction(expression.getOperationReference()) recordFunction(expression.operationReference)
super.visitUnaryExpression(expression) super.visitUnaryExpression(expression)
} }
override fun visitBinaryExpression(expression: KtBinaryExpression) { override fun visitBinaryExpression(expression: KtBinaryExpression) {
recordFunction(expression.getOperationReference()) recordFunction(expression.operationReference)
super.visitBinaryExpression(expression) super.visitBinaryExpression(expression)
} }
override fun visitCallExpression(expression: KtCallExpression) { override fun visitCallExpression(expression: KtCallExpression) {
val calleeExpression = expression.getCalleeExpression() val calleeExpression = expression.calleeExpression
if (calleeExpression != null) { if (calleeExpression != null) {
recordFunction(calleeExpression) recordFunction(calleeExpression)
} }
@@ -143,24 +143,24 @@ public class KotlinSmartStepIntoHandler : JvmSmartStepIntoHandler() {
override fun visitSimpleNameExpression(expression: KtSimpleNameExpression) { override fun visitSimpleNameExpression(expression: KtSimpleNameExpression) {
val resolvedCall = expression.getResolvedCall(bindingContext) val resolvedCall = expression.getResolvedCall(bindingContext)
if (resolvedCall != null) { if (resolvedCall != null) {
val propertyDescriptor = resolvedCall.getResultingDescriptor() val propertyDescriptor = resolvedCall.resultingDescriptor
if (propertyDescriptor is PropertyDescriptor) { if (propertyDescriptor is PropertyDescriptor) {
val getterDescriptor = propertyDescriptor.getGetter() val getterDescriptor = propertyDescriptor.getter
if (getterDescriptor != null && !getterDescriptor.isDefault()) { if (getterDescriptor != null && !getterDescriptor.isDefault) {
val delegatedResolvedCall = bindingContext[BindingContext.DELEGATED_PROPERTY_RESOLVED_CALL, getterDescriptor] val delegatedResolvedCall = bindingContext[BindingContext.DELEGATED_PROPERTY_RESOLVED_CALL, getterDescriptor]
if (delegatedResolvedCall == null) { if (delegatedResolvedCall == null) {
val getter = DescriptorToSourceUtilsIde.getAnyDeclaration(file.getProject(), getterDescriptor) val getter = DescriptorToSourceUtilsIde.getAnyDeclaration(file.project, getterDescriptor)
if (getter is KtPropertyAccessor && (getter.getBodyExpression() != null || getter.getEqualsToken() != null)) { if (getter is KtPropertyAccessor && (getter.bodyExpression != null || getter.equalsToken != null)) {
val label = KotlinMethodSmartStepTarget.calcLabel(getterDescriptor) val label = KotlinMethodSmartStepTarget.calcLabel(getterDescriptor)
result.add(KotlinMethodSmartStepTarget(getter, label, expression, lines)) result.add(KotlinMethodSmartStepTarget(getter, label, expression, lines))
} }
} }
else { else {
val delegatedPropertyGetterDescriptor = delegatedResolvedCall.getResultingDescriptor() val delegatedPropertyGetterDescriptor = delegatedResolvedCall.resultingDescriptor
if (delegatedPropertyGetterDescriptor is CallableMemberDescriptor) { if (delegatedPropertyGetterDescriptor is CallableMemberDescriptor) {
val function = DescriptorToSourceUtilsIde.getAnyDeclaration(file.getProject(), delegatedPropertyGetterDescriptor) val function = DescriptorToSourceUtilsIde.getAnyDeclaration(file.project, delegatedPropertyGetterDescriptor)
if (function is KtNamedFunction || function is KtSecondaryConstructor) { if (function is KtNamedFunction || function is KtSecondaryConstructor) {
val label = "${propertyDescriptor.getName()}." + KotlinMethodSmartStepTarget.calcLabel(delegatedPropertyGetterDescriptor) val label = "${propertyDescriptor.name}." + KotlinMethodSmartStepTarget.calcLabel(delegatedPropertyGetterDescriptor)
result.add(KotlinMethodSmartStepTarget(function as KtFunction, label, expression, lines)) result.add(KotlinMethodSmartStepTarget(function as KtFunction, label, expression, lines))
} }
} }
@@ -174,9 +174,9 @@ public class KotlinSmartStepIntoHandler : JvmSmartStepIntoHandler() {
private fun recordFunction(expression: KtExpression) { private fun recordFunction(expression: KtExpression) {
val resolvedCall = expression.getResolvedCall(bindingContext) ?: return val resolvedCall = expression.getResolvedCall(bindingContext) ?: return
val descriptor = resolvedCall.getResultingDescriptor() val descriptor = resolvedCall.resultingDescriptor
if (descriptor is FunctionDescriptor && !isIntrinsic(descriptor)) { if (descriptor is FunctionDescriptor && !isIntrinsic(descriptor)) {
val resolvedElement = DescriptorToSourceUtilsIde.getAnyDeclaration(file.getProject(), descriptor) val resolvedElement = DescriptorToSourceUtilsIde.getAnyDeclaration(file.project, descriptor)
if (resolvedElement is KtNamedFunction || resolvedElement is KtConstructor<*>) { if (resolvedElement is KtNamedFunction || resolvedElement is KtConstructor<*>) {
val label = KotlinMethodSmartStepTarget.calcLabel(descriptor) val label = KotlinMethodSmartStepTarget.calcLabel(descriptor)
result.add(KotlinMethodSmartStepTarget(resolvedElement as KtFunction, label, expression, lines)) result.add(KotlinMethodSmartStepTarget(resolvedElement as KtFunction, label, expression, lines))
@@ -199,8 +199,8 @@ public class KotlinSmartStepIntoHandler : JvmSmartStepIntoHandler() {
override fun createMethodFilter(stepTarget: SmartStepTarget?): MethodFilter? { override fun createMethodFilter(stepTarget: SmartStepTarget?): MethodFilter? {
return when (stepTarget) { return when (stepTarget) {
is KotlinMethodSmartStepTarget -> KotlinBasicStepMethodFilter(stepTarget.resolvedElement, stepTarget.getCallingExpressionLines()!!) is KotlinMethodSmartStepTarget -> KotlinBasicStepMethodFilter(stepTarget.resolvedElement, stepTarget.callingExpressionLines!!)
is KotlinLambdaSmartStepTarget -> KotlinLambdaMethodFilter(stepTarget.getLambda(), stepTarget.getCallingExpressionLines()!!, stepTarget.isInline) is KotlinLambdaSmartStepTarget -> KotlinLambdaMethodFilter(stepTarget.getLambda(), stepTarget.callingExpressionLines!!, stepTarget.isInline)
else -> super.createMethodFilter(stepTarget) else -> super.createMethodFilter(stepTarget)
} }
} }