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

more fix related to ranges, switch from ddoc to comment, full block to rescanned due to missing comparison

This commit is contained in:
Basile Burg 2015-11-09 12:49:02 +01:00
parent 2c26619f34
commit c784278e54
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ce_d2syn.pas
View File

@ -88,6 +88,8 @@ type
rangeKinds: TRangeKinds; rangeKinds: TRangeKinds;
primaryRange: TPrimaryRange; primaryRange: TPrimaryRange;
secondaryRange: TSecondaryRange; secondaryRange: TSecondaryRange;
// double quoted multi-line string prefixed with 'r':
// => don't skip '"' following '\'
rString: boolean; rString: boolean;
public public
procedure Assign(Src: TSynCustomHighlighterRange); override; procedure Assign(Src: TSynCustomHighlighterRange); override;
@ -241,19 +243,20 @@ const
begin begin
result := inherited Compare(Range); result := inherited Compare(Range);
assert(Range <> nil); assert(Range <> nil);
{if result <> 0 then exit; if result <> 0 then exit;
// //
if Range is TSynD2SynRange then if Range is TSynD2SynRange then
begin begin
src_t := TSynD2SynRange(Range); src_t := TSynD2SynRange(Range);
if (src_t.rString and rString) then exit(0); if src_t.rangeKinds <> rangeKinds then exit(1);
if src_t.rString <> rString then exit(1);
if src_t.nestedCommentsCount <> nestedCommentsCount then if src_t.nestedCommentsCount <> nestedCommentsCount then
exit(cmpRes[src_t.nestedCommentsCount > nestedCommentsCount]); exit(cmpRes[src_t.nestedCommentsCount > nestedCommentsCount]);
if src_t.tokenStringBracketsCount <> tokenStringBracketsCount then if src_t.tokenStringBracketsCount <> tokenStringBracketsCount then
exit(cmpRes[src_t.tokenStringBracketsCount > tokenStringBracketsCount]); exit(cmpRes[src_t.tokenStringBracketsCount > tokenStringBracketsCount]);
if src_t.namedRegionCount <> namedRegionCount then if src_t.namedRegionCount <> namedRegionCount then
exit(cmpRes[src_t.namedRegionCount > namedRegionCount]); exit(cmpRes[src_t.namedRegionCount > namedRegionCount]);
end; } end;
end; end;
procedure TSynD2SynRange.Clear; procedure TSynD2SynRange.Clear;