paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-06 17:20:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: fix Sql-Hl escaping "\". Issue #40906

Browse Source
This commit is contained in:
Martin 2024-09-25 23:37:10 +02:00
parent 84b64855b1
commit 05030d7c88
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
components/synedit/synhighlightersql.pas
View File

@ -1405,31 +1405,30 @@ begin
NullProc
else begin
fTokenID := tkString;
// else it's end of multiline string
if (fRange = rsString) and (fLine[Run] = #39) then begin
// End of a string after linebreak
Inc(Run);
fRange := rsUnknown;
end
else
if SQLDialect <> sqlMySql then begin
if (Run > 0) or (fRange <> rsString) or (fLine[Run] <> #39) then begin
fRange := rsString;
repeat
Inc(Run);
until fLine[Run] in [#0, #10, #13, #39];
end;
fRange := rsString;
repeat
Inc(Run);
until fLine[Run] in [#0, #10, #13, #39];
if fLine[Run] = #39 then begin
Inc(Run);
fRange := rsUnknown;
end;
end
else begin
if (Run > 0) or (fRange <> rsString) or ((fLine[Run] <> #39) and (fLine[Run-1] <> '\')) then begin
fRange := rsString;
repeat
if (fLine[Run] <> '\') and (fLine[Run+1] = #39) then begin
Inc(Run);
break;
end;
fRange := rsString;
repeat
if (fLine[Run] = '\') and (fLine[Run+1] in [#39, '\']) then
Inc(Run);
until fLine[Run] in [#0, #10, #13];
end;
if (fLine[Run] = #39) and not(fLine[Run-1] = '\') then begin
Inc(Run);
until fLine[Run] in [#0, #10, #13, #39];
if fLine[Run] = #39 then begin
Inc(Run);
fRange := rsUnknown;
end;
@ -1578,7 +1577,7 @@ begin
Inc(Run);
while not (fLine[Run] in [#0, #10, #13]) do begin
case fLine[Run] of
'\': if fLine[Run + 1] = #34 then
'\': if fLine[Run + 1] in [#34, '\'] then
Inc(Run);
#34: if fLine[Run + 1] <> #34 then
begin