diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockEditorFactory.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockEditorFactory.java index 7473ec9cd2f..db942a72934 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockEditorFactory.java +++ b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockEditorFactory.java @@ -19,6 +19,7 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; +import com.intellij.openapi.editor.EditorKind; import com.intellij.openapi.editor.event.EditorEventMulticaster; import com.intellij.openapi.editor.event.EditorFactoryListener; import com.intellij.openapi.editor.impl.DocumentImpl; @@ -27,6 +28,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.text.CharArrayCharSequence; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public class MockEditorFactory extends EditorFactory { @Override @@ -59,6 +61,27 @@ public class MockEditorFactory extends EditorFactory { return null; } + @Override + public Editor createEditor( + @NotNull Document document, @Nullable Project project, @NotNull EditorKind kind + ) { + return null; + } + + @Override + public Editor createEditor( + @NotNull Document document, Project project, @NotNull VirtualFile file, boolean isViewer, @NotNull EditorKind kind + ) { + return null; + } + + @Override + public Editor createViewer( + @NotNull Document document, @Nullable Project project, @NotNull EditorKind kind + ) { + return null; + } + @Override public void releaseEditor(@NotNull Editor editor) { } diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/NoStrataPositionManagerHelper.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/NoStrataPositionManagerHelper.kt index 637f64c1fb0..97eec82d9d9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/NoStrataPositionManagerHelper.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/NoStrataPositionManagerHelper.kt @@ -146,7 +146,7 @@ private fun readClassFileImpl(project: Project, fun readFromOutput(isForTestClasses: Boolean): ByteArray? { if (!ProjectRootsUtil.isProjectSourceFile(project, file)) return null - val module = ProjectFileIndex.SERVICE.getInstance(project).getModuleForFile(file) + val module = ProjectFileIndex.SERVICE.getInstance(project).getModuleForFile(file) ?: return null val outputDir = CompilerPaths.getModuleOutputDirectory(module, /*forTests = */ isForTestClasses) ?: return null val className = fqNameWithInners.asString().replace('.', '$')