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

fix, D2 highlighter, ranges were not handled in token string

This commit is contained in:
Basile Burg 2015-03-13 22:30:05 +01:00
parent c849f563d6
commit 33b557c5d8
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ce_d2syn.pas
View File

@ -490,7 +490,9 @@ begin
end; end;
// line comment / region beg-end // line comment / region beg-end
if (fCurrRange.rangeKinds = []) or (fCurrRange.rangeKinds = [rkAsm]) then if readDelim(reader, fTokStop, '//') then if (fCurrRange.rangeKinds = []) or (fCurrRange.rangeKinds = [rkTokString]) or
(fCurrRange.rangeKinds = [rkAsm])
then if readDelim(reader, fTokStop, '//') then
begin begin
fTokKind := tkCommt; fTokKind := tkCommt;
if readDelim(reader, fTokStop, '/') then if readDelim(reader, fTokStop, '/') then
@ -516,7 +518,8 @@ begin
end else readerReset; end else readerReset;
// block comments 1 // block comments 1
if fCurrRange.rangeKinds = [] then if readDelim(reader, fTokStop, '/*') then if (fCurrRange.rangeKinds = []) or (fCurrRange.rangeKinds = [rkTokString])
then if readDelim(reader, fTokStop, '/*') then
begin begin
fTokKind := tkCommt; fTokKind := tkCommt;
if readDelim(reader, fTokStop, '*') then if readDelim(reader, fTokStop, '*') then
@ -547,7 +550,8 @@ begin
end; end;
// block comments 2 // block comments 2
if fCurrRange.rangeKinds = [] then if readDelim(reader, fTokStop, '/+') then if (fCurrRange.rangeKinds = []) or (fCurrRange.rangeKinds = [rkTokString])
then if readDelim(reader, fTokStop, '/+') then
begin begin
fTokKind := tkCommt; fTokKind := tkCommt;
if readDelim(reader, fTokStop, '+') then if readDelim(reader, fTokStop, '+') then
@ -584,7 +588,8 @@ begin
end; end;
// string 1 // string 1
if fCurrRange.rangeKinds = [] then if readDelim(reader, fTokStop, stringPrefixes) then if (fCurrRange.rangeKinds = []) or (fCurrRange.rangeKinds = [rkTokString])
then if readDelim(reader, fTokStop, stringPrefixes) then
begin begin
if readerPrev^ in ['r','x','q'] then if readerPrev^ in ['r','x','q'] then
begin begin
@ -647,7 +652,8 @@ begin
end; end;
// string 2 // string 2
if fCurrRange.rangeKinds = [] then if readDelim(reader, fTokStop, '`') then if (fCurrRange.rangeKinds = []) or (fCurrRange.rangeKinds = [rkTokString]) then
if readDelim(reader, fTokStop, '`') then
begin begin
fTokKind := tkStrng; fTokKind := tkStrng;
if readUntil(reader, fTokStop, '`') then if readUntil(reader, fTokStop, '`') then
@ -685,7 +691,8 @@ begin
end else readerReset; end else readerReset;
// char literals // char literals
if fCurrRange.rangeKinds = [] then if readDelim(reader, fTokStop, #39) then if (fCurrRange.rangeKinds = []) or (fCurrRange.rangeKinds = [rkTokString])
then if readDelim(reader, fTokStop, #39) then
begin begin
fTokKind := tkStrng; fTokKind := tkStrng;
while true do while true do