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

fix reg, closeCompletionCharsWithSpace_ broken since b65bb860

This commit is contained in:
Basile Burg 2021-09-19 00:11:30 +02:00
parent 8af9aeccdb
commit 22faea8cdc
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -11,6 +11,10 @@
- GDB commander: the context menu of the ASM view allows to resume execution until the selected instruction. (#71)
- Search results: use GNU style messages. (#84)
## Regressions fixed
- editor, _closeCompletionCharsWithSpace_ broken by [git b65bb860](https://gitlab.com/basile.b/dexed/-/commit/b65bb860e45c47e3c48bf513aeafd9968daa2482).
## Bugs fixed
- D2 highlighter: for `Call()`, `Call` wont be considered anymore as a type. (#69)

33
src/u_synmemo.pas
View File

@ -283,7 +283,6 @@ type
procedure completionDeleteKey(sender: TObject);
procedure getCompletionList;
procedure completionFormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure completionFormUTF8KeyPress(Sender: TObject; var UTF8Key: TUTF8Char);
function completionItemPaint(const AKey: string; ACanvas: TCanvas;X, Y: integer;
Selected: boolean; Index: integer): boolean;
procedure completionCodeCompletion(var value: string; SourceValue: string;
@ -1144,7 +1143,6 @@ begin
fCompletion.OnPaintItem:= @completionItemPaint;
fCompletion.OnKeyDelete:= @completionDeleteKey;
fCompletion.OnKeyDown:= @completionFormKeyDown;
fCompletion.OnUTF8KeyPress:= @completionFormUTF8KeyPress;
fCompletion.CaseSensitive:=true;
TStringList(fCompletion.ItemList).CaseSensitive:=true;
fCompletion.LongLineHintType:=sclpNone;
@ -2944,10 +2942,20 @@ begin
else
begin
fLastCompletion := value;
if KeyChar[1] in fCloseCompletionCharsWithSpace then
if (KeyChar[1] in fCloseCompletionCharsWithSpace) then
begin
if value.StartsWith(SourceValue) then
value += ' ' + KeyChar[1]
else if KeyChar[1] in fCloseCompletionChars then
value += KeyChar[1];
else
value := sourceValue + KeyChar[1];
end
else if (KeyChar[1] in fCloseCompletionChars) then
begin
if value.StartsWith(SourceValue) then
value += KeyChar[1]
else
value := sourceValue + KeyChar[1];
end;
end;
end;
@ -2957,21 +2965,6 @@ begin
key := 13;
end;
procedure TDexedMemo.completionFormUTF8KeyPress(Sender: TObject; var UTF8Key: TUTF8Char);
const
s: string = '!()[],<>=+-/*%^|&@;?:{}~';
var
c: char;
begin
for c in s do
if UTF8Key = c then
begin
UTF8Key := #0;
fCompletion.AddCharAtCursor(c);
break;
end
end;
function TDexedMemo.completionItemPaint(const AKey: string; ACanvas: TCanvas;X, Y: integer;
Selected: boolean; Index: integer): boolean;
var