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

KotlinFunctionBreakpoint: fix INRE

Browse Source 
#KT-35316 Fixed
#EA-219418 Fixed
This commit is contained in:
Dmitry Gridin
2019-12-04 14:24:45 +07:00
parent 09bcfab047
commit 4d7fe78a51
1 changed files with 5 additions and 4 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/breakpoints/KotlinFunctionBreakpoint.java
+5 -4
View File
@@ -28,6 +28,7 @@ import com.intellij.openapi.editor.Document;
import com.intellij.openapi.progress.*; import com.intellij.openapi.progress.*;
import com.intellij.openapi.progress.impl.BackgroundableProcessIndicator; import com.intellij.openapi.progress.impl.BackgroundableProcessIndicator;
import com.intellij.openapi.progress.util.ProgressWindow; import com.intellij.openapi.progress.util.ProgressWindow;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Comparing;
@@ -111,7 +112,7 @@ public class KotlinFunctionBreakpoint extends BreakpointWithHighlighter<JavaMeth
public void run(@NotNull ProgressIndicator indicator) { public void run(@NotNull ProgressIndicator indicator) {
SourcePosition sourcePosition = KotlinFunctionBreakpoint.this.getSourcePosition(); SourcePosition sourcePosition = KotlinFunctionBreakpoint.this.getSourcePosition();
MethodDescriptor descriptor = sourcePosition == null MethodDescriptor descriptor = sourcePosition == null
? null : ReadAction.compute(() -> getMethodDescriptor(project, sourcePosition)); ? null : DumbService.getInstance(project).runReadActionInSmartMode(() -> getMethodDescriptor(project, sourcePosition));
ProgressIndicatorProvider.checkCanceled(); ProgressIndicatorProvider.checkCanceled();
@@ -156,7 +157,7 @@ public class KotlinFunctionBreakpoint extends BreakpointWithHighlighter<JavaMeth
return null; return null;
} }
return ReadAction.compute(() -> LightClassUtilsKt.toLightClass(declaration)); return DumbService.getInstance(myProject).runReadActionInSmartMode(() -> LightClassUtilsKt.toLightClass(declaration));
} }
// MODIFICATION: End Kotlin implementation // MODIFICATION: End Kotlin implementation
@@ -238,7 +239,7 @@ public class KotlinFunctionBreakpoint extends BreakpointWithHighlighter<JavaMeth
DebugProcessImpl debugProcess, DebugProcessImpl debugProcess,
boolean forPreparedClass boolean forPreparedClass
) { ) {
return ReadAction.compute(() -> { return DumbService.getInstance(debugProcess.getProject()).runReadActionInSmartMode(() -> {
JavaDebugProcess process = debugProcess.getXdebugProcess(); JavaDebugProcess process = debugProcess.getXdebugProcess();
return process != null return process != null
&& debugProcess.isAttached() && debugProcess.isAttached()
@@ -535,7 +536,7 @@ public class KotlinFunctionBreakpoint extends BreakpointWithHighlighter<JavaMeth
//final int endOffset = document.getLineEndOffset(sourcePosition); //final int endOffset = document.getLineEndOffset(sourcePosition);
//final MethodDescriptor descriptor = docManager.commitAndRunReadAction(new Computable<MethodDescriptor>() { //final MethodDescriptor descriptor = docManager.commitAndRunReadAction(new Computable<MethodDescriptor>() {
// conflicts with readAction on initial breakpoints creation // conflicts with readAction on initial breakpoints creation
MethodDescriptor descriptor = ReadAction.compute(() -> { MethodDescriptor descriptor = DumbService.getInstance(project).runReadActionInSmartMode(() -> {
// MODIFICATION: Start Kotlin implementation // MODIFICATION: Start Kotlin implementation
PsiMethod method = resolveJvmMethodFromKotlinDeclaration(project, sourcePosition); PsiMethod method = resolveJvmMethodFromKotlinDeclaration(project, sourcePosition);
// MODIFICATION: End Kotlin implementation // MODIFICATION: End Kotlin implementation