fix, wysiwyg double quoted string

This commit is contained in:
Basile Burg 2014-12-01 00:01:02 +01:00
parent 96422af474
commit efbeae9e3c
1 changed files with 5 additions and 3 deletions

View File

@ -82,6 +82,7 @@ type
rangeKinds: TRangeKinds; rangeKinds: TRangeKinds;
primaryRange: TPrimaryRange; primaryRange: TPrimaryRange;
secondaryRange: TSecondaryRange; secondaryRange: TSecondaryRange;
rString: boolean;
public public
procedure Assign(Src: TSynCustomHighlighterRange); override; procedure Assign(Src: TSynCustomHighlighterRange); override;
function Compare(Range: TSynCustomHighlighterRange): integer; override; function Compare(Range: TSynCustomHighlighterRange): integer; override;
@ -562,6 +563,7 @@ begin
begin begin
if readerPrev^ in ['r','x','q'] then if readerPrev^ in ['r','x','q'] then
begin begin
fCurrRange.rString := reader^ = 'r';
if not (readerNext^ = '"') then if not (readerNext^ = '"') then
begin begin
readerPrev; readerPrev;
@ -574,12 +576,12 @@ begin
begin begin
if not readUntilAmong(reader, fTokStop, stringStopChecks) then if not readUntilAmong(reader, fTokStop, stringStopChecks) then
break; break;
if reader^ = '\' then if (reader^ = '\') then
begin begin
readerNext; readerNext;
if readWhile(reader, fTokStop, '\') then if readWhile(reader, fTokStop, '\') then
continue; continue;
if reader^ = '"' then if reader^ = '"' then if not fCurrRange.rString then
readerNext; readerNext;
continue; continue;
end end
@ -607,7 +609,7 @@ begin
readerNext; readerNext;
if readWhile(reader, fTokStop, '\') then if readWhile(reader, fTokStop, '\') then
continue; continue;
if reader^ = '"' then if reader^ = '"' then if not fCurrRange.rString then
readerNext; readerNext;
continue; continue;
end end