From e05279af09e3abd87c8d4a4b7406b661193d5e52 Mon Sep 17 00:00:00 2001
From: Martin <laz.git@mfriebe.de>
Date: Sun, 23 Mar 2025 12:57:15 +0100
Subject: [PATCH] IDE, SynEdit: add ecDeleteLineKeepX

---
 components/synedit/synedit.pp              | 9 ++++++---
 components/synedit/syneditkeycmds.pp       | 4 +++-
 components/synedit/syneditpointclasses.pas | 6 ++++++
 components/synedit/synpluginmulticaret.pp  | 2 +-
 ide/keymapping.pp                          | 2 ++
 ide/lazarusidestrconsts.pas                | 1 +
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/components/synedit/synedit.pp b/components/synedit/synedit.pp
index fcab93c7c0..af82a270dc 100644
--- a/components/synedit/synedit.pp
+++ b/components/synedit/synedit.pp
@@ -7362,16 +7362,19 @@ begin
             FCaret.LineBytePos := WP;
           end;
         end;
-      ecDeleteLine:
+      ecDeleteLine, ecDeleteLineKeepX:
         if not ReadOnly
         then begin
           CY := FCaret.LinePos;
           if (Cy < FTheLinesView.Count) then
-            FTheLinesView.EditLinesDelete(CaretY, 1)
+            FTheLinesView.EditLinesDelete(CY, 1)
           else
           if (Cy = FTheLinesView.Count) and (FTheLinesView[CY-1] <> '') then
             FTheLinesView.EditDelete(1, Cy, length(FTheLinesView[Cy-1]));
-          CaretXY := Point(1, CaretY); // like seen in the Delphi editor
+          if Command = ecDeleteLineKeepX then
+            FCaret.ValidateXPos
+          else
+            CaretXY := Point(1, CY); // like seen in the Delphi editor
         end;
       ecClearAll:
         begin
diff --git a/components/synedit/syneditkeycmds.pp b/components/synedit/syneditkeycmds.pp
index 374abf6208..971c6f431d 100644
--- a/components/synedit/syneditkeycmds.pp
+++ b/components/synedit/syneditkeycmds.pp
@@ -251,6 +251,7 @@ const
   ecChar            = 511;  // Insert a character at current position
   ecSmartUnindent   = 512;  // NOT regocniced as command, used for group-undo, set by beautifier
   ecDeleteCharNoCrLf= 513;  // Delete char at cursor (i.e. delete key), but do not join lines
+  ecDeleteLineKeepX = 514;  // Delete current line
 
   ecImeStr          = 550;  // Insert character(s) from IME
 
@@ -436,7 +437,7 @@ implementation
 { Command mapping routines }
 
 const
-  EditorCommandStrs: array[0..183] of TIdentMapEntry = (
+  EditorCommandStrs: array[0..184] of TIdentMapEntry = (
     (Value: ecNone; Name: 'ecNone'),
     (Value: ecLeft; Name: 'ecLeft'),
     (Value: ecRight; Name: 'ecRight'),
@@ -516,6 +517,7 @@ const
     (Value: ecDeleteBOL; Name: 'ecDeleteBOL'),
     (Value: ecDeleteEOL; Name: 'ecDeleteEOL'),
     (Value: ecDeleteLine; Name: 'ecDeleteLine'),
+    (Value: ecDeleteLineKeepX; Name: 'ecDeleteLineKeepX'),
     (Value: ecClearAll; Name: 'ecClearAll'),
     (Value: ecLineBreak; Name: 'ecLineBreak'),
     (Value: ecInsertLine; Name: 'ecInsertLine'),
diff --git a/components/synedit/syneditpointclasses.pas b/components/synedit/syneditpointclasses.pas
index 2b9cfd727a..585870a215 100644
--- a/components/synedit/syneditpointclasses.pas
+++ b/components/synedit/syneditpointclasses.pas
@@ -380,6 +380,7 @@ type
     procedure DecAutoMoveOnEdit;
     procedure ChangeOnTouch;
     procedure Touch(aChangeOnTouch: Boolean = False);
+    procedure ValidateXPos;
 
     function WasAtLineChar(aPoint: TPoint): Boolean;
     function WasAtLineByte(aPoint: TPoint): Boolean;
@@ -1654,6 +1655,11 @@ begin
   FTouched := True;
 end;
 
+procedure TSynEditCaret.ValidateXPos;
+begin
+  InternalSetLineCharPos(FLinePos, FCharPos, [scuForceSet]);
+end;
+
 
 function TSynEditCaret.WasAtLineChar(aPoint: TPoint): Boolean;
 begin
diff --git a/components/synedit/synpluginmulticaret.pp b/components/synedit/synpluginmulticaret.pp
index c1e3693a75..fee85fb29d 100644
--- a/components/synedit/synpluginmulticaret.pp
+++ b/components/synedit/synpluginmulticaret.pp
@@ -2666,7 +2666,7 @@ begin
 
   case Command of
   // TODO: delete and smColumn -- only delete once
-    ecDeleteLastChar..ecDeleteLine, ecDeleteCharNoCrLf,
+    ecDeleteLastChar..ecDeleteLine, ecDeleteCharNoCrLf, ecDeleteLineKeepX,
     ecLineBreak..ecChar:
       begin
         StartEditing;
diff --git a/ide/keymapping.pp b/ide/keymapping.pp
index 2ba8bccdfb..b0fc3ce132 100644
--- a/ide/keymapping.pp
+++ b/ide/keymapping.pp
@@ -518,6 +518,7 @@ begin
     ecDeleteBOL               : Result:= srkmecDeleteBOL;
     ecDeleteEOL               : Result:= srkmecDeleteEOL;
     ecDeleteLine              : Result:= srkmecDeleteLine;
+    ecDeleteLineKeepX         : Result:= srkmecDeleteLineKeepX;
     ecClearAll                : Result:= srkmecClearAll;
     ecLineBreak               : Result:= srkmecLineBreak;
     ecInsertLine              : Result:= srkmecInsertLine;
@@ -2978,6 +2979,7 @@ begin
   AddDefault(C, 'Delete to beginning of line', srkmecDeleteBOL, ecDeleteBOL);
   AddDefault(C, 'Delete to end of line', srkmecDeleteEOL, ecDeleteEOL);
   AddDefault(C, 'Delete current line', srkmecDeleteLine, ecDeleteLine);
+  AddDefault(C, 'Delete current line keep x', srkmecDeleteLineKeepX, ecDeleteLineKeepX);
   AddDefault(C, 'Delete whole text', srkmecClearAll, ecClearAll);
   AddDefault(C, 'Break line and move cursor', srkmecLineBreak, ecLineBreak);
   AddDefault(C, 'Break line, leave cursor', srkmecInsertLine, ecInsertLine);
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 1b2bd8a51b..f986d2762d 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -3110,6 +3110,7 @@ resourcestring
   srkmecDeleteBOL             = 'Delete to beginning of line';
   srkmecDeleteEOL             = 'Delete to end of line';
   srkmecDeleteLine            = 'Delete current line';
+  srkmecDeleteLineKeepX       = 'Delete current line (keep X pos)';
   srkmecClearAll              = 'Delete whole text';
   srkmecLineBreak             = 'Break line and move cursor';
   srkmecInsertLine            = 'Break line, leave cursor';