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

Fix accessing nullable location() method

Browse Source
This commit is contained in:
Nikolay Krasko
2017-10-25 19:12:48 +03:00
parent 3fe2298855
commit 6420f50f2e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt
+2 -2
View File
@@ -253,7 +253,7 @@ class KotlinFieldBreakpoint(
} }
fun matchesEvent(event: LocatableEvent): Boolean { fun matchesEvent(event: LocatableEvent): Boolean {
val method = event.location().method() val method = event.location()?.method()
// TODO check property type // TODO check property type
return method != null && method.name() in getMethodsName() return method != null && method.name() in getMethodsName()
} }
@@ -264,7 +264,7 @@ class KotlinFieldBreakpoint(
} }
override fun getEventMessage(event: LocatableEvent): String { override fun getEventMessage(event: LocatableEvent): String {
val location = event.location() val location = event.location()!!
val locationQName = location.declaringType().name() + "." + location.method().name() val locationQName = location.declaringType().name() + "." + location.method().name()
val locationFileName = try { val locationFileName = try {
location.sourceName() location.sourceName()
idea/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt
+1 -1
View File
@@ -169,7 +169,7 @@ fun suspendFunctionFirstLineLocation(location: Location): Int? {
return null return null
} }
val lineNumber = location.method().location().lineNumber() val lineNumber = location.method().location()?.lineNumber()
if (lineNumber == -1) { if (lineNumber == -1) {
return null return null
} }
idea/src/org/jetbrains/kotlin/idea/debugger/filter/KotlinSyntheticTypeComponentProvider.kt
+1 -1
View File
@@ -39,7 +39,7 @@ class KotlinSyntheticTypeComponentProvider: SyntheticTypeComponentProvider {
try { try {
if (typeComponent.isDelegateToDefaultInterfaceImpl()) return true if (typeComponent.isDelegateToDefaultInterfaceImpl()) return true
if (typeComponent.location().lineNumber() != 1) return false if (typeComponent.location()?.lineNumber() != 1) return false
if (typeComponent.allLineLocations().any { it.lineNumber() != 1 }) { if (typeComponent.allLineLocations().any { it.lineNumber() != 1 }) {
return false return false