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

EA-210460: Use 'safeAllLineLocations()' instead of throwing 'allLineLocations()'

Browse Source
This commit is contained in:
Yan Zhulanow
2019-11-15 01:13:54 +09:00
parent aaa45425da
commit ffeef6c18d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt
+1 -1
View File
@@ -306,7 +306,7 @@ private fun DebugProcess.findTargetClasses(outerClass: ReferenceType, lineAt: In
val targetClasses = ArrayList<ReferenceType>(1) val targetClasses = ArrayList<ReferenceType>(1)
try { try {
for (location in outerClass.allLineLocations()) { for (location in outerClass.safeAllLineLocations()) {
val locationLine = location.lineNumber() - 1 val locationLine = location.lineNumber() - 1
if (locationLine < 0) { if (locationLine < 0) {
// such locations are not correspond to real lines in code // such locations are not correspond to real lines in code
idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinSourcePositionProvider.kt
+1 -1
View File
@@ -127,7 +127,7 @@ class KotlinSourcePositionProvider : SourcePositionProvider() {
val debugProcess = context.debugProcess val debugProcess = context.debugProcess
if (debugProcess != null) { if (debugProcess != null) {
try { try {
val locations = type.allLineLocations() val locations = type.safeAllLineLocations()
if (!locations.isEmpty()) { if (!locations.isEmpty()) {
val lastLocation = locations.get(locations.size - 1) val lastLocation = locations.get(locations.size - 1)
return debugProcess.positionManager.getSourcePosition(lastLocation) return debugProcess.positionManager.getSourcePosition(lastLocation)
idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/filter/KotlinSyntheticTypeComponentProviderBase.kt
+1 -1
View File
@@ -47,7 +47,7 @@ abstract class KotlinSyntheticTypeComponentProviderBase: SyntheticTypeComponentP
return false return false
} }
return !typeComponent.declaringType().allLineLocations().any { it.lineNumber() != 1 } return !typeComponent.declaringType().safeAllLineLocations().any { it.lineNumber() != 1 }
} }
catch(e: AbsentInformationException) { catch(e: AbsentInformationException) {
return false return false