forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #42 - The expression parser used by GDB commander doesn't support tabs

This commit is contained in:
Basile Burg 2020-05-27 20:10:04 +02:00
parent 146fcc5732
commit 4b4b376b36
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -6,6 +6,8 @@
## Bugs fixed ## Bugs fixed
- GDB commander: automatic break on exception did not work if the cprogram was compiled with LDC2. (#41)
- GDB commander: expressions obtained by mouse motion were not correct when the source used tabulations to indent. (#42)
- Messages: force auto scrolling to bottom once and if the messages context is modified. - Messages: force auto scrolling to bottom once and if the messages context is modified.
- Terminal: after launching dexed, the current directory was not constrained even when the settings to follow the current project or document path were activated. (#5) - Terminal: after launching dexed, the current directory was not constrained even when the settings to follow the current project or document path were activated. (#5)

20
src/u_synmemo.pas
View File

@ -203,7 +203,8 @@ type
fMultiDocSubject: TObject; fMultiDocSubject: TObject;
fDefaultFontSize: Integer; fDefaultFontSize: Integer;
fPositions: TSynMemoPositions; fPositions: TSynMemoPositions;
fMousePos: TPoint; fMousePhysical: TPoint;
fMouseLogical: TPoint;
fCallTipWin: TEditorCallTipWindow; fCallTipWin: TEditorCallTipWindow;
fDDocWin: TEditorHintWindow; fDDocWin: TEditorHintWindow;
fDDocDelay: Integer; fDDocDelay: Integer;
@ -2769,7 +2770,7 @@ begin
if assigned(fDebugger) and fDebugger.running then if assigned(fDebugger) and fDebugger.running then
begin begin
lexWholeText([TLexOption.lxoNoComments]); lexWholeText([TLexOption.lxoNoComments]);
exp := getExpressionAt(fLexToks, fMousePos); exp := getExpressionAt(fLexToks, fMouseLogical);
ev1 := fDebugger.evaluate(exp); ev1 := fDebugger.evaluate(exp);
if ev1.isEmpty then if ev1.isEmpty then
ev1 := '???'; ev1 := '???';
@ -3518,15 +3519,15 @@ var
i, len, llen: Integer; i, len, llen: Integer;
begin begin
result := 0; result := 0;
if fMousePos.y-1 > Lines.Count-1 then if fMousePhysical.y-1 > Lines.Count-1 then
exit; exit;
llen := Lines[fMousePos.y-1].length; llen := Lines[fMousePhysical.y-1].length;
if fMousePos.X > llen then if fMousePhysical.X > llen then
exit; exit;
len := getSysLineEndLen; len := getSysLineEndLen;
for i:= 0 to fMousePos.y-2 do for i:= 0 to fMousePhysical.y-2 do
result += Lines[i].length + len; result += Lines[i].length + len;
result += fMousePos.x; result += fMousePhysical.x;
end; end;
procedure TDexedMemo.patchClipboardIndentation; procedure TDexedMemo.patchClipboardIndentation;
@ -3727,8 +3728,9 @@ begin
(((dx < 0) and (dx > -5) or (dx > 0) and (dx < 5)) or (((dx < 0) and (dx > -5) or (dx > 0) and (dx < 5)) or
((dy < 0) and (dy > -5) or (dy > 0) and (dy < 5))) then ((dy < 0) and (dy > -5) or (dy > 0) and (dy < 5))) then
fCanShowHint:=true; fCanShowHint:=true;
fOldMousePos := Point(X, Y); fOldMousePos := Point(X, Y);
fMousePos := PixelsToRowColumn(fOldMousePos); fMousePhysical := PixelsToRowColumn(fOldMousePos);
fMouseLogical := PixelsToLogicalPos(fOldMousePos);
if ssLeft in Shift then if ssLeft in Shift then
highlightCurrentIdentifier; highlightCurrentIdentifier;