Fix AI Debug

Author: meanmail

intellij-plugin/hs-features/ai-debugger-core/src/org/hyperskill/academy/ai/debugger/core/breakpoint/AIBreakPointService.kt

@@ -29,13 +29,13 @@ class AIBreakPointService(private val project: Project, private val scope: Corou
 
   fun initialize() {
     val language = project.course?.languageById ?: return
-    val type = language.getAIBreakpointType()
+    val type = language.findAIBreakpointType() ?: return
     breakpointManager.getBreakpoints(type).forEach(::highlightBreakpoint)
     addListener(type)
   }
 
   fun toggleLineBreakpoint(language: Language, file: VirtualFile, line: Int) = runReadAction {
-    val type = language.getAIBreakpointType()
+    val type = language.findAIBreakpointType() ?: return@runReadAction
     removeBreakpointsOnLine(line)
     breakpointManager.addLineBreakpoint(type, file.url, line, type.createProperties())
   }
@@ -84,8 +84,9 @@ class AIBreakPointService(private val project: Project, private val scope: Corou
   }
 
   companion object {
-    fun Language.getAIBreakpointType(): XLineBreakpointType<XBreakpointProperties<*>> {
-      val breakPointType = BreakpointTypeManager.getInstance(this).getBreakPointType()
+    fun Language.findAIBreakpointType(): XLineBreakpointType<XBreakpointProperties<*>>? {
+      val manager = BreakpointTypeManager.getInstanceOrNull(this) ?: return null
+      val breakPointType = manager.getBreakPointType()
       return XDebuggerUtil.getInstance().findBreakpointType(breakPointType::class.java)
     }
   }

intellij-plugin/hs-features/ai-debugger-core/src/org/hyperskill/academy/ai/debugger/core/breakpoint/AIBreakpointHintMouseMotionListener.kt

@@ -10,7 +10,7 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.xdebugger.XDebuggerManager
 import com.jetbrains.educational.ml.debugger.response.BreakpointHintDetails
-import org.hyperskill.academy.ai.debugger.core.breakpoint.AIBreakPointService.Companion.getAIBreakpointType
+import org.hyperskill.academy.ai.debugger.core.breakpoint.AIBreakPointService.Companion.findAIBreakpointType
 import org.hyperskill.academy.ai.debugger.core.ui.AIBreakpointHint
 import org.hyperskill.academy.learning.course
 import org.hyperskill.academy.learning.courseFormat.ext.languageById
@@ -40,7 +40,7 @@ class AIBreakpointHintMouseMotionListener(
   private fun hasBreakpointAtLine(editor: Editor, line: Int, virtualFile: VirtualFile): Boolean {
     val project = editor.project ?: return false
     val language = project.course?.languageById ?: return false
-    val type = language.getAIBreakpointType()
+    val type = language.findAIBreakpointType() ?: return false
     return XDebuggerManager.getInstance(project).breakpointManager.findBreakpointsAtLine(type, virtualFile, line).isNotEmpty()
   }
 

intellij-plugin/hs-features/ai-debugger-core/src/org/hyperskill/academy/ai/debugger/core/breakpoint/BreakpointTypeManager.kt

@@ -11,6 +11,13 @@ interface BreakpointTypeManager {
   companion object {
     private val EP_NAME = LanguageExtension<BreakpointTypeManager>("HyperskillEducational.breakpointTypeManager")
 
-    fun getInstance(language: Language): BreakpointTypeManager = EP_NAME.forLanguage(language)
+    fun getInstanceOrNull(language: Language): BreakpointTypeManager? =
+      EP_NAME.forLanguage(language) ?: EP_NAME.forLanguage(Language.ANY)
+
+    fun getInstance(language: Language): BreakpointTypeManager =
+      requireNotNull(getInstanceOrNull(language)) {
+        "No BreakpointTypeManager registered for language '${language.id}'. " +
+          "Please register an implementation via 'HyperskillEducational.breakpointTypeManager'."
+      }
   }
 }

intellij-plugin/hs-features/ai-debugger-core/src/org/hyperskill/academy/ai/debugger/core/session/AIDebugSessionRunner.kt

@@ -19,7 +19,7 @@ import com.intellij.xdebugger.XDebugProcess
 import com.intellij.xdebugger.XDebuggerManager
 import com.intellij.xdebugger.XDebuggerManagerListener
 import org.hyperskill.academy.ai.debugger.core.breakpoint.AIBreakPointService
-import org.hyperskill.academy.ai.debugger.core.breakpoint.AIBreakPointService.Companion.getAIBreakpointType
+import org.hyperskill.academy.ai.debugger.core.breakpoint.AIBreakPointService.Companion.findAIBreakpointType
 import org.hyperskill.academy.ai.debugger.core.breakpoint.AIBreakpointHintMouseMotionListener
 import org.hyperskill.academy.ai.debugger.core.utils.AIDebugUtils.failedTestName
 import org.hyperskill.academy.ai.debugger.core.utils.AIDebugUtils.runWithTests
@@ -52,7 +52,8 @@ class AIDebugSessionRunner(
 
   private fun makeBreakpointsRegular() {
     val breakpointManager = XDebuggerManager.getInstance(project).breakpointManager
-    breakpointManager.getBreakpoints(language.getAIBreakpointType()).forEach {
+    val type = language.findAIBreakpointType() ?: return
+    breakpointManager.getBreakpoints(type).forEach {
       breakpointManager.updateBreakpointPresentation(it, AllIcons.Debugger.Db_set_breakpoint, null)
       project.service<AIBreakPointService>().removeHighlighter(it)
     }

intellij-plugin/hs-features/ai-debugger-jvm/resources/ai-debugger-jvm.xml

@@ -6,7 +6,9 @@
   </dependencies>
 
   <extensions defaultExtensionNs="HyperskillEducational">
-    <breakpointTypeManager language="JVM" implementationClass="org.hyperskill.academy.ai.debugger.jvm.JvmBreakpointTypeManager"/>
+    <!-- Register for concrete languages to avoid null from LanguageExtension.forLanguage(...) -->
+    <breakpointTypeManager language="JAVA" implementationClass="org.hyperskill.academy.ai.debugger.jvm.JvmBreakpointTypeManager"/>
+    <breakpointTypeManager language="kotlin" implementationClass="org.hyperskill.academy.ai.debugger.jvm.JvmBreakpointTypeManager"/>
   </extensions>
 
   <extensions defaultExtensionNs="com.intellij">