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

fix #143 - ddoc preffix inserted after auto curly brace closing

This commit is contained in:
Basile Burg 2017-05-31 10:36:55 +02:00
parent 8bc5ff59a4
commit 5fc8ea57b3
No known key found for this signature in database
GPG Key ID: 1868039F415CB8CF
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ce_synmemo.pas
View File

@ -2237,12 +2237,13 @@ begin
begin begin
tk2 := fLexToks[i+1]; tk2 := fLexToks[i+1];
if (tk1^.offset < p) and (tk1^.kind in [ltkComment, ltkIllegal]) if (tk1^.offset < p) and (tk1^.kind in [ltkComment, ltkIllegal])
and (tk2^.offset > p) then and (tk1^.Data[1] in ['*','+']) and (tk2^.offset > p) then
exit(tk1^.Data[1]) exit(tk1^.Data[1])
else if (tk1^.offset > p) then else if (tk1^.offset > p) then
exit; exit;
end end
else if (tk1^.offset < p) and (tk1^.kind in [ltkComment, ltkIllegal]) then else if (tk1^.offset < p) and (tk1^.kind in [ltkComment, ltkIllegal])
and (tk1^.Data[1] in ['*','+']) then
exit(tk1^.Data[1]); exit(tk1^.Data[1]);
end; end;
end; end;
@ -2607,6 +2608,7 @@ begin
begin begin
Key := 0; Key := 0;
curlyBraceCloseAndIndent; curlyBraceCloseAndIndent;
lxd := false;
end; end;
end; end;
if (fSmartDdocNewline) then if (fSmartDdocNewline) then
@ -2619,6 +2621,7 @@ begin
ddc := lexInDdoc; ddc := lexInDdoc;
if ddc in ['*', '+'] then if ddc in ['*', '+'] then
begin begin
fLexToks.saveToFile('/home/basile/lx.txt');
inherited; inherited;
insertLeadingDDocSymbol(ddc); insertLeadingDDocSymbol(ddc);
fCanShowHint:=false; fCanShowHint:=false;