From 80fbbead6813b8dcc0b7dc99799a4aa849886f77 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 29 Sep 2016 18:38:24 +0300
Subject: [PATCH] IDEA-142098 Multiple breakpoints in a single line: don't
 display the whole method body in toggle breakpoint drop-down

---
 .../breakpoints/JavaLineBreakpointType.java   |  40 ++++++++++++++++--
 .../icons/src/debugger/LambdaBreakpoint.png   | Bin 0 -> 452 bytes
 .../src/debugger/LambdaBreakpoint@2x.png      | Bin 0 -> 1049 bytes
 .../src/debugger/MultipleBreakpoints.png      | Bin 0 -> 360 bytes
 .../src/debugger/MultipleBreakpoints@2x.png   | Bin 0 -> 732 bytes
 .../util/src/com/intellij/icons/AllIcons.java |   2 +
 .../breakpoints/XLineBreakpointType.java      |   2 +-
 .../xdebugger/impl/XDebuggerUtilImpl.java     |   2 +-
 8 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 platform/icons/src/debugger/LambdaBreakpoint.png
 create mode 100644 platform/icons/src/debugger/LambdaBreakpoint@2x.png
 create mode 100644 platform/icons/src/debugger/MultipleBreakpoints.png
 create mode 100644 platform/icons/src/debugger/MultipleBreakpoints@2x.png

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaLineBreakpointType.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaLineBreakpointType.java
index daef7fbb4cad..196f354f722e 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaLineBreakpointType.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaLineBreakpointType.java
@@ -19,6 +19,7 @@ import com.intellij.debugger.DebuggerBundle;
 import com.intellij.debugger.HelpID;
 import com.intellij.debugger.SourcePosition;
 import com.intellij.debugger.impl.DebuggerUtilsEx;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
@@ -121,10 +122,9 @@ public class JavaLineBreakpointType extends JavaLineBreakpointTypeBase<JavaLineB
     }
 
     List<JavaBreakpointVariant> res = new SmartList<>();
-    res.add(new JavaBreakpointVariant(position)); //all
 
     if (!(startMethod instanceof PsiLambdaExpression)) {
-      res.add(new ExactJavaBreakpointVariant(position, startMethod, -1)); // base method
+      res.add(new LineJavaBreakpointVariant(position, startMethod, -1)); // base method
     }
 
     int ordinal = 0;
@@ -132,10 +132,17 @@ public class JavaLineBreakpointType extends JavaLineBreakpointTypeBase<JavaLineB
       PsiElement firstElem = DebuggerUtilsEx.getFirstElementOnTheLine(lambda, document, position.getLine());
       XSourcePositionImpl elementPosition = XSourcePositionImpl.createByElement(firstElem);
       if (elementPosition != null) {
-        res.add(new ExactJavaBreakpointVariant(elementPosition, lambda, ordinal++));
+        if (lambda == startMethod) {
+          res.add(0, new LineJavaBreakpointVariant(elementPosition, lambda, ordinal++));
+        }
+        else {
+          res.add(new LambdaJavaBreakpointVariant(elementPosition, lambda, ordinal++));
+        }
       }
     }
 
+    res.add(new JavaBreakpointVariant(position)); //all
+
     return res;
   }
 
@@ -209,6 +216,33 @@ public class JavaLineBreakpointType extends JavaLineBreakpointTypeBase<JavaLineB
     }
   }
 
+  public class LineJavaBreakpointVariant extends ExactJavaBreakpointVariant {
+    public LineJavaBreakpointVariant(@NotNull XSourcePosition position, @NotNull PsiElement element, Integer lambdaOrdinal) {
+      super(position, element, lambdaOrdinal);
+    }
+
+    @Override
+    public String getText() {
+      return "Line";
+    }
+
+    @Override
+    public Icon getIcon() {
+      return AllIcons.Debugger.Db_set_breakpoint;
+    }
+  }
+
+  public class LambdaJavaBreakpointVariant extends ExactJavaBreakpointVariant {
+    public LambdaJavaBreakpointVariant(@NotNull XSourcePosition position, @NotNull PsiElement element, Integer lambdaOrdinal) {
+      super(position, element, lambdaOrdinal);
+    }
+
+    @Override
+    public Icon getIcon() {
+      return AllIcons.Debugger.LambdaBreakpoint;
+    }
+  }
+
   @Nullable
   @Override
   public TextRange getHighlightRange(XLineBreakpoint<JavaLineBreakpointProperties> breakpoint) {
diff --git a/platform/icons/src/debugger/LambdaBreakpoint.png b/platform/icons/src/debugger/LambdaBreakpoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b1f0f3b1f39b7ad848a22417ab0a1b224185c0a
GIT binary patch
literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG0004tNkl<Zc-l>p
zOD_Xq6ozNj{s{j?#2P80*R+~gR4R2zgj9<}qv&YRs-US*ks=ZzE*lGC(S;3?>H=}8
zYgI4QLL+&7=cFSR&*bDi&-rHZosoW4BT{8mwUjW_s08hTc+%QfB&aTDD)I<^h@j%Z
z-Fck}PvB#78O5DdWEX=-2ZnLmYsZDD?vxxJ;FFEDr}<bI;!TX9p%I0x6}-*(n8#r!
zgmWfbH4Qj!x@{<|Mew;DLveot%{ndiretL1#*q$s8FI*_f%x;78?O^XOkNDO81%4c
zn~+~$_{+&5S4vvyOE2;Oh}TIE4yXOFYPHNkKt@_*N?*9&Qqrs`J&ia)WTPS2j0Wub
zy-bT<hg@_9N?*7|{-o4k7YE1FGISaZGD{(b>Z70!PosSxhd+t#`Krx~_jy0;CL`88
z{dgXAF;r7VJ#xsU0d>Mucb1uzkrSuBi<?Qg91PWzQBOGMe67mjXcw2QM%?w-aPPD;
uR8vO1|BF+gU!y~CA~yR)P+iVciuViQ{AWt$hB_Gl0000<MNUMnLSTZsB+9!0

literal 0
HcmV?d00001

diff --git a/platform/icons/src/debugger/LambdaBreakpoint@2x.png b/platform/icons/src/debugger/LambdaBreakpoint@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..218bf99ce3e30114badcabd55f2a7aecd8c552c2
GIT binary patch
literal 1049
zcmV+!1m^pRP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000BvNkl<Zc-oDY
z`BPF+6vzEP+NS=Vwx3#T(F_GQTyO!CQU<qF0<%bg#!?F{OGz!IZJK6kn))%DER#SG
zL`Vg(X*->BdH406kIElD!(Glf-+RwJ?_RRr9^IS8i8(LGz_Fc3Ei#1!kgrGrc_)nN
zkv$T71!Cie+a)3d?nizg@E?96H_2yHjLZVQ3f0N^Ds^&RR{*|h4FsF(AbO<(;{A45
z9dbd;X@y8v6OJ3;Q-um<j_v0{w6pAg3gE96ga3^8T42@ffYd_|Y&^R!V{LQ*mU}xz
zA~rM3mF01fUx+TF0CJcN=5f`Du|YVUlcV6StphfmPOx1p_jJezoU4Sl+55Oi_GW<{
z$QrF8Y&Bz$$&3PJ>H=8tdSG?r8bs~w3jD?jzLO-fO)4-z6CX=+VdbU+Hl9q#SbsDQ
zHN{0tWW3t~sYf2R>geS*1#{X{T*S!*wy|o#?S(Cku<WqFm%$zxDeovu+pSEXQlo}7
z?60_;u+-h6fMN&-PZhYE1Pb};m#{h%Tx^E*sS$YEdr?f))a471n!W>33Yx)3vI_$V
zOj5^xwj3f>lY;p5OR(;}3x?8SQJ}i05E3ZxWx$@%CvZ+Y3oi-ysT0Dw4tF-l!R;o;
zhv2!Rn+4XF6fvm%*lvU5<S^Qp6n>$WIxY|-ffRKX&l@4!epW`zWo79xmX)%g-b<Yf
zE|z?78{${H6n<fhB?x>M1wt(bSZq7<hx7I9dwAhYuf75gcV%LjL2Vj))`Pq7++emc
z-_|;r083Gzp^}MkqF3561-GD~T+4!uSz0k&ZiWZjG-lM6FdHgasqccRN|vGr)bZ75
zAY`r)NsRQtD`&cLN>nO{;S~|TYD+UVz{Y6qWv>kqcdkLGsaEv;Tw5qR<Z9}C&}2gp
zl?hgw_uOEvEMq~2T1@FwP#O_x54D=uTqEv~Y{`fFf6yG0mFX`2q512zuz;zeTl0;u
zdQDy)EZ*v4E2lYv+F=}{IkI`}=z`T@7n`FPGwC}?{LqL&Qk=~{0ud@rJltkoIdkr7
ztcN6~C)A{e1^iYBYSUPs$;fQTmV6?X2AC~4%2)4_-bFk4Wf#M%Iyu@egH{~Cl}Vwo
z&35>zNiVzYitBpj#KB+m&;-r3u!LVECuq_^;7o}O8k5<e5Bbg<KS0;@iN8KL!V?JZ
zRfoV=r3SyD_@DTy)y#G)4^Ea}Ur4`udAjJ}-=97NbEP>bmJc|OC8z<PE+0N=b759>
zm_IV&llj+2pZHv!%Mi}w2H(vV9(}h^jagd~*d(Nv{B8Lruz*ZcozveIiM@i~Flej+
TJJ-fv00000NkvXXu0mjf4QuVB

literal 0
HcmV?d00001

diff --git a/platform/icons/src/debugger/MultipleBreakpoints.png b/platform/icons/src/debugger/MultipleBreakpoints.png
new file mode 100644
index 0000000000000000000000000000000000000000..02f67859ae158a5d9166dfbb60fe8099dbfd1815
GIT binary patch
literal 360
zcmV-u0hj)XP)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG0003mNkl<Zc-nQ6
z-Ack>7{_;*-BevbflyXz1vV?AlaW^Rv2cB2K}Q{gw-ML{cqrD9v?)<-`C3tV0U}TT
zzvUXr4t~5mpTF(hG!fBi@rfWKwZvquo=H|84c+C*xR*zLusLF<rf*w?ef4>L;lr4D
z)&~d1o2NU*$JLn$il7V>L0+Mr^*2LnLH~uv=r-2o+l@@J^mcCM-!H8jpop_PcgN;Y
z=qk_(^gfK8^z4f|+0M5Ldu5=o$mPHxbOP-V%-2`qrRMQg5hzEG-D}Wz&`B5=Xulp9
z=JVz%-yx?#(}7OHK)w64kv1L{qQAG~=rbO45{A7L`$pqf@H-qqC(sVTJnB~P>U*~Y
zT?JZkch`LwGtW93`A3ld?|@DAV$^d|Qyrdvn<M?r{ed4ueOS{)FyveS0000<MNUMn
GLSTZ|+NR6^

literal 0
HcmV?d00001

diff --git a/platform/icons/src/debugger/MultipleBreakpoints@2x.png b/platform/icons/src/debugger/MultipleBreakpoints@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ca7bd8ba7c2d41c3018d90aba0d587b7be55a2a
GIT binary patch
literal 732
zcmV<20wev2P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0007`Nkl<Zc-ozn
z%Wo1<7{&2_v8MhBF03xJy72u7qOGmgA#Kqrq76)FHNFDHCI;gpUAkc9#<+23S9IG=
z3*}K{w71f-Fpbfui_de$83H4aVHQ6i_kQP|JNG+t@rj79nU%n?ZVZ4F$bzax)*2gV
zr}4Qo*bUyUTs*Fdq07pcxurH9M@@{`usOy#v*urIPX_xyp*T6LYR?|3`oer$IL8{+
zS{hdd+)aM{wx;T@=2ZQ4synD*Ej9L&bUW`|;C*poNNvAJsO^_Ycc7LUYPm)?gFc*V
zL?z?e*7GMM0+JvDmVxR7G<Hw+cUt@~c!#1IzW<Qbp_8?>YyQQ`-SMY5?-<DN+&f`C
zMasEwKlq4+1<4SkMUWH|q{STLTyEq{&WPXCzs}!JgFH}9D$^4*$Tly20PG+Mf*lBw
z(H73J21Y+CkzitTZYB+sld67$2G!=Be?tNUNf0EWJE&nTOny{jA$>EUXMk#^8VxlJ
zn3g4+nIHjzB)9{$)Z~UwmDHnY9V`Q7vmPF!!4eG)@m$e)K>~V$8fwc^qp6JtcQQcP
z6f{2#(ll7$PI$Inpf*2xcJa%-a1tnD#6osV57MB7jte^P32Ij_ov3||Pep(tYgf;=
zylB7BaY5%jK`q}CL%*&8RR{*`tD?`oDt3?rLFYYzw3r5;B0(*G<=p?5oq3ss#{`}C
z1hrUW3q-7AX}zxT@ur|%5Om%XNDB=<fIU{^eNKa;j2b#GNI*|eLoL=g(&^G{ylCjW
zAOSr=4Yl^po&PPQ<*Gme1W9lOYpDTy?cH`WXk2zkf*=uML?_$AIo7b&()ipO*iXVo
zmi)+RDFyvf9uJuCH^(?<)$}{h+l_(UlR;h~pbUP4?;vN54Yo^5CxgET<BJ&!NnWP_
O0000<MNUMnLSTYBU`$;A

literal 0
HcmV?d00001

diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index b24f4acdf8b8..dbbde2e63206 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -275,6 +275,8 @@ public class AllIcons {
     public static final Icon EvaluateExpression = IconLoader.getIcon("/debugger/evaluateExpression.png"); // 16x16
     public static final Icon Frame = IconLoader.getIcon("/debugger/frame.png"); // 16x16
     public static final Icon KillProcess = IconLoader.getIcon("/debugger/killProcess.png"); // 16x16
+    public static final Icon LambdaBreakpoint = IconLoader.getIcon("/debugger/LambdaBreakpoint.png"); // 12x12
+    public static final Icon MultipleBreakpoints = IconLoader.getIcon("/debugger/MultipleBreakpoints.png"); // 12x12
     public static final Icon MuteBreakpoints = IconLoader.getIcon("/debugger/muteBreakpoints.png"); // 16x16
     public static final Icon NewWatch = IconLoader.getIcon("/debugger/newWatch.png"); // 16x16
     public static final Icon Question_badge = IconLoader.getIcon("/debugger/question_badge.png"); // 6x9
diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XLineBreakpointType.java b/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XLineBreakpointType.java
index 05277c8765a2..d526ead2df76 100644
--- a/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XLineBreakpointType.java
+++ b/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XLineBreakpointType.java
@@ -164,7 +164,7 @@ public abstract class XLineBreakpointType<P extends XBreakpointProperties> exten
     @Nullable
     @Override
     public Icon getIcon() {
-      return null;
+      return AllIcons.Debugger.MultipleBreakpoints;
     }
 
     @Nullable
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java
index a357b81da38b..86bc67959024 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java
@@ -226,7 +226,7 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
 
               final MySelectionListener selectionListener = new MySelectionListener();
               ListPopupImpl popup = new ListPopupImpl(
-                new BaseListPopupStep<XLineBreakpointType.XLineBreakpointVariant>("Create breakpoint for", variants) {
+                new BaseListPopupStep<XLineBreakpointType.XLineBreakpointVariant>("Set Breakpoint", variants) {
                   @NotNull
                   @Override
                   public String getTextFor(XLineBreakpointType.XLineBreakpointVariant value) {