[debugger] IDEA-392757 IJ-CR-219708 Review fixes

GitOrigin-RevId: d5eb58c3ac747bf9e2f2ffcd45e2e62fd70105a0

Author: AlexVanGogen

java/debugger/impl/resources/META-INF/java-debugger.xml

@@ -68,9 +68,9 @@
       <with attribute="implementationClass" implements="com.intellij.debugger.engine.dfaassist.DfaAssistProvider"/>
     </extensionPoint>
 
-    <extensionPoint qualifiedName="com.intellij.debugger.trickyLineBreakpointLocationProvider" beanClass="com.intellij.lang.LanguageExtensionPoint"
+    <extensionPoint qualifiedName="com.intellij.debugger.specialLineBreakpointCaseProvider" beanClass="com.intellij.lang.LanguageExtensionPoint"
                     dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.debugger.ui.breakpoints.JvmTrickyLineBreakpointLocationProvider"/>
+      <with attribute="implementationClass" implements="com.intellij.debugger.ui.breakpoints.JvmSpecialLineBreakpointCaseProvider"/>
     </extensionPoint>
 
     <extensionPoint qualifiedName="com.intellij.debugger.extraDebugNodesProvider"

java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaBreakpointsUsageCollector.kt

@@ -5,7 +5,6 @@ import com.intellij.internal.statistic.eventLog.EventLogGroup
 import com.intellij.internal.statistic.eventLog.events.EventFields
 import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesCollector
 import com.intellij.internal.statistic.utils.getPluginInfo
-import com.intellij.openapi.application.readAction
 import com.intellij.xdebugger.XDebuggerManager
 import com.intellij.xdebugger.breakpoints.XLineBreakpoint
 import com.intellij.xdebugger.breakpoints.XBreakpointType
@@ -21,13 +20,13 @@ object JavaBreakpointsUsageCollector : CounterUsagesCollector() {
     RETURN,
   }
 
-  private val GROUP = EventLogGroup("debugger.breakpoints.usage.java", 2)
+  private val GROUP = EventLogGroup("debugger.breakpoints.usage.java", 3)
   private val LINE_BREAKPOINT_KIND_FIELD = EventFields.Enum<LineBreakpointKind>("kind")
-  private val LINE_BREAKPOINT_LOCATION_KIND_FIELD = EventFields.NullableEnum<TrickyLineBreakpointLocation>("location_kind")
+  private val LINE_BREAKPOINT_SPECIAL_CASE_FIELD = EventFields.NullableEnum<SpecialLineBreakpointCase>("special_case")
   private val LINE_BREAKPOINT_ADDED = GROUP.registerEvent("line.breakpoint.added",
                                                           EventFields.PluginInfo,
                                                           LINE_BREAKPOINT_KIND_FIELD,
-                                                          LINE_BREAKPOINT_LOCATION_KIND_FIELD)
+                                                          LINE_BREAKPOINT_SPECIAL_CASE_FIELD)
 
   @JvmStatic
   fun reportNewBreakpoint(breakpoint: Breakpoint<*>, type: XBreakpointType<*, *>) {
@@ -48,8 +47,13 @@ object JavaBreakpointsUsageCollector : CounterUsagesCollector() {
       val line = xBreakpoint.line
       val coroutineScope = (XDebuggerManager.getInstance(project) as XDebuggerManagerImpl).coroutineScope
       coroutineScope.launch {
-        val location = readAction { getLineBreakpointLocation(project, fileUrl, line) }
-        LINE_BREAKPOINT_ADDED.log(project, pluginInfo, kind, location)
+        val specialCase = if (kind == LineBreakpointKind.LINE || kind == LineBreakpointKind.LINE_AND_LAMBDAS) {
+          getSpecialLineBreakpointCase(project, fileUrl, line)
+        }
+        else {
+          null
+        }
+        LINE_BREAKPOINT_ADDED.log(project, pluginInfo, kind, specialCase)
       }
     }
   }

java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaLineBreakpointLocation.kt

@@ -0,0 +1,62 @@
+// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.debugger.ui.breakpoints
+
+import com.intellij.lang.LanguageExtension
+import com.intellij.openapi.application.readAction
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.VirtualFileManager
+import com.intellij.psi.PsiFile
+import com.intellij.psi.PsiManager
+import com.intellij.util.concurrency.annotations.RequiresReadLock
+import org.jetbrains.annotations.ApiStatus
+
+/**
+ * A special case of a line breakpoint position where a breakpoint may hit
+ * unexpectedly many times or never hit at all.
+ */
+@ApiStatus.Internal
+enum class SpecialLineBreakpointCase {
+  /** The line starts with the `for`/`while` keyword of a loop statement. */
+  LOOP_START,
+
+  /** The line starts with the closing brace of a loop body. */
+  LOOP_END,
+
+  /** The line starts with the `try`, `catch` or `finally` keyword. */
+  TRY_CATCH_FINALLY_START,
+
+  /** The line starts with the closing brace of a `try`, `catch` or `finally` block. */
+  TRY_CATCH_FINALLY_END,
+
+  /** The line starts with the closing brace of the then-branch of an `if` statement. */
+  IF_THEN_END,
+
+  /** The line starts with the closing brace of the else-branch of an `if` statement. */
+  IF_ELSE_END,
+
+  /** The line starts with the closing brace of a `switch` branch. */
+  SWITCH_CASE_END,
+}
+
+@ApiStatus.Internal
+interface JvmSpecialLineBreakpointCaseProvider {
+  /**
+   * Classifies the given [line] whether it falls to a "special case"
+   * when the breakpoint may (not) hit, counterintuitively to a user.
+   * 
+   * Return `null` if the line does not fall to a "special case" in the file's language.
+   */
+  @RequiresReadLock
+  fun getSpecialCase(project: Project, file: PsiFile, line: Int): SpecialLineBreakpointCase?
+
+  companion object {
+    internal val EP_NAME = LanguageExtension<JvmSpecialLineBreakpointCaseProvider>("com.intellij.debugger.specialLineBreakpointCaseProvider")
+  }
+}
+
+internal suspend fun getSpecialLineBreakpointCase(project: Project, fileUrl: String, line: Int): SpecialLineBreakpointCase? =
+  readAction {
+    val virtualFile = VirtualFileManager.getInstance().findFileByUrl(fileUrl) ?: return@readAction null
+    val file = PsiManager.getInstance(project).findFile(virtualFile) ?: return@readAction null
+    JvmSpecialLineBreakpointCaseProvider.EP_NAME.forLanguage(file.language)?.getSpecialCase(project, file, line)
+  }