paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-12 09:39:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression and enhance of Del-to-end-of-word (ctrl-t). Handles spaces and punctuation before/after the word as separate entities. Trims spaces on full word del. BUG #12583

Browse Source 
git-svn-id: trunk@17275 -
This commit is contained in:
martin 2008-11-08 12:03:23 +00:00
parent dd34b2fc9f
commit 9ba43b14b7
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/synedit/synedit.pp
View File

@ -826,7 +826,7 @@ type
{$ELSE} {$ELSE}
function LogicalToPhysicalPos(p: TPoint): TPoint; function LogicalToPhysicalPos(p: TPoint): TPoint;
{$ENDIF} {$ENDIF}
function NextWordPos{$IFDEF SYN_LAZARUS}(EndOfWord : Boolean = false){$ENDIF}: TPoint; virtual; function NextWordPos{$IFDEF SYN_LAZARUS}(WordEndForDelete : Boolean = false){$ENDIF}: TPoint; virtual;
procedure Notification(AComponent: TComponent; procedure Notification(AComponent: TComponent;
Operation: TOperation); override; Operation: TOperation); override;
procedure PasteFromClipboard; procedure PasteFromClipboard;
@ -8634,13 +8634,15 @@ begin
end; end;
{$ENDIF} {$ENDIF}
function TCustomSynEdit.NextWordPos{$IFDEF SYN_LAZARUS}(EndOfWord : Boolean = false){$ENDIF}: TPoint; function TCustomSynEdit.NextWordPos{$IFDEF SYN_LAZARUS}(WordEndForDelete : Boolean = false){$ENDIF}: TPoint;
var var
CX, CY, LineLen: integer; CX, CY, LineLen: integer;
Line: string; Line: string;
CurIdentChars, WhiteChars: TSynIdentChars; CurIdentChars, WhiteChars: TSynIdentChars;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
LogCaret: TPoint; LogCaret: TPoint;
WordBrkChars: TSynIdentChars;
bow : Boolean;
{$ENDIF} {$ENDIF}
begin begin
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
@ -8657,9 +8659,10 @@ begin
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
if Assigned(Highlighter) then if Assigned(Highlighter) then
CurIdentChars := [#1..#255] - (Highlighter.WordBreakChars + TSynWhiteChars) WordBrkChars := Highlighter.WordBreakChars
else else
CurIdentChars := [#1..#255] - (TSynWordBreakChars + TSynWhiteChars); WordBrkChars := TSynWordBreakChars;
CurIdentChars := [#1..#255] - (WordBrkChars + TSynWhiteChars);
WhiteChars := TSynWhiteChars + ([#1..#255] - CurIdentChars); WhiteChars := TSynWhiteChars + ([#1..#255] - CurIdentChars);
{$ELSE} {$ELSE}
CurIdentChars:=IdentChars; CurIdentChars:=IdentChars;
@ -8672,17 +8675,28 @@ begin
if CY < Lines.Count then begin if CY < Lines.Count then begin
Line := Lines[CY]; Line := Lines[CY];
Inc(CY); Inc(CY);
{$IFDEF SYN_LAZARUS}
if WordEndForDelete then
CX := Max(1, StrScanForCharInSet(Line, 1, [#1..#255] - TSynWhiteChars))
else
{$ENDIF}
CX := Max(1, StrScanForCharInSet(Line, 1, CurIdentChars)); CX := Max(1, StrScanForCharInSet(Line, 1, CurIdentChars));
end; end;
end else begin end else begin
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
if EndOfWord then begin if WordEndForDelete then begin
// find first "IdentChar" if next char is an "whitespace" if Line[CX] in TSynWhiteChars then
if Line[CX] in WhiteChars then CX := StrScanForCharInSet(Line, CX, [#1..#255] - TSynWhiteChars)
CX := StrScanForCharInSet(Line, CX, CurIdentChars); else begin
// if "IdentChar" found find the first "WhiteSpave" behind bow := (CX = 1) OR (Line[CX-1] in WhiteChars); // Cursor at BeginOfWord
if CX > 0 then if Line[CX] in WordBrkChars then
CX := StrScanForCharInSet(Line, CX, WhiteChars); CX := StrScanForCharInSet(Line, CX, [#1..#255] - WordBrkChars)
else
CX := StrScanForCharInSet(Line, CX, [#1..#255] - CurIdentChars);
// Remove WitheSpaces, if Cursor was at BeginOfWord or in WordBrkchars
if bow and(cx > 0) then
CX := StrScanForCharInSet(Line, CX, [#1..#255] - TSynWhiteChars);
end;
end else begin end else begin
{$ENDIF} {$ENDIF}
// find first "whitespace" if next char is an IdentChar // find first "whitespace" if next char is an IdentChar