paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-13 11:29:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: fix shell HL multi-line string. Issue #40584

Browse Source
This commit is contained in:
Martin 2024-10-01 14:40:14 +02:00
parent 233d6bee21
commit ec3a425203
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
components/synedit/synhighlighterunixshellscript.pas
View File

@ -66,7 +66,11 @@ type
TtkTokenKind = (tkComment, tkIdentifier, tkKey, tkNull, tkNumber, tkSecondKey,
tkSpace, tkString, tkSymbol, tkVariable, tkUnknown);
TRangeState = (rsUnknown, rsAnsi, rsPasStyle, rsCStyle);
TRangeState = (
rsUnknown,
rsString, rsStringEsc, rsStringDbl, rsStringDblEsc
//rsAnsi, rsPasStyle, rsCStyle
);
TProcTableProc = procedure of object;
@ -630,13 +634,31 @@ procedure TSynUNIXShellScriptSyn.DoStringProc(AnEndChar: Char; AnEscape: Boolean
);
begin
fTokenID := tkString;
fRange := rsUnknown;
repeat
case FLine[Run] of
#0, #10, #13:
break;
'\':
if AnEscape then inc(Run);
if AnEscape then begin
inc(Run);
if FLine[Run] in [#0, #10, #13] then begin
if AnEndChar = '"' then begin
if AnEscape
then fRange := rsStringDblEsc
else fRange := rsStringDbl;
end
else begin
if AnEscape
then fRange := rsStringEsc
else fRange := rsString;
end;
if FLine[Run] = #0 then
dec(Run);
break;
end;
end;
end;
inc(Run);
until FLine[Run] = AnEndChar;
@ -664,13 +686,17 @@ end;
procedure TSynUNIXShellScriptSyn.Next;
begin
fTokenPos := Run;
case fRange of
rsAnsi: AnsiProc;
rsPasStyle: PasStyleProc;
rsCStyle: CStyleProc;
else
fProcTable[fLine[Run]];
if Run = 0 then begin
case fRange of
rsString: DoStringProc('''', False);
rsStringEsc: DoStringProc('''', True);
rsStringDbl: DoStringProc('"', False);
rsStringDblEsc: DoStringProc('"', True);
else fProcTable[fLine[Run]];
end;
exit;
end;
fProcTable[fLine[Run]];
end;
function TSynUNIXShellScriptSyn.GetDefaultAttribute(Index: integer): TSynHighlighterAttributes;