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

sxsyn, misc style changes

This commit is contained in:
Basile Burg 2021-10-31 17:49:54 +01:00
parent 959e20d137
commit d4b700fbbc
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/u_sxsyn.pas
View File

@ -5,7 +5,7 @@ unit u_sxsyn;
interface interface
uses uses
Classes, SysUtils, Graphics, Classes,
SynEditHighlighter, SynEditHighlighterFoldBase, SynEditTypes, SynEditHighlighter, SynEditHighlighterFoldBase, SynEditTypes,
u_common; u_common;
@ -41,7 +41,6 @@ type
TSynSxSynRange = class (TSynCustomHighlighterRange) TSynSxSynRange = class (TSynCustomHighlighterRange)
private private
attribParenCount : Integer;
rangeKind : TRangeKind; rangeKind : TRangeKind;
public public
procedure Assign(source: TSynCustomHighlighterRange); override; procedure Assign(source: TSynCustomHighlighterRange); override;
@ -133,7 +132,7 @@ type
implementation implementation
{$PUSH}{$R-}{$COPERATORS ON} {$PUSH}{$R-}
class function KeywordMatch.hash(const w: string): Word; class function KeywordMatch.hash(const w: string): Word;
var var
i: integer; i: integer;
@ -537,7 +536,7 @@ begin
begin begin
if not firstChar and (fLineBuf[fTokStop] = '_') then if not firstChar and (fLineBuf[fTokStop] = '_') then
fTokKind:=TTokenKind.tkError; fTokKind:=TTokenKind.tkError;
fTokStop += 1; fTokStop += 1;
firstChar := true; firstChar := true;
continue; continue;
end end
@ -565,7 +564,7 @@ begin
begin begin
if not firstChar and (fLineBuf[fTokStop] = '_') then if not firstChar and (fLineBuf[fTokStop] = '_') then
fTokKind:=TTokenKind.tkError; fTokKind:=TTokenKind.tkError;
fTokStop += 1; fTokStop += 1;
firstChar := true; firstChar := true;
continue; continue;
end; end;
@ -595,7 +594,7 @@ begin
'\' : fTokStop += 2; '\' : fTokStop += 2;
'"' : '"' :
begin begin
fTokStop += 1; fTokStop += 1;
terminate := true; terminate := true;
break; break;
end end
@ -621,7 +620,7 @@ begin
begin begin
if fLineBuf[fTokStop] = '`' then if fLineBuf[fTokStop] = '`' then
begin begin
fTokStop += 1; fTokStop += 1;
terminate := true; terminate := true;
break; break;
end end
@ -714,12 +713,15 @@ begin
fTokKind := tkNone; fTokKind := tkNone;
fTokStart := fTokStop; fTokStart := fTokStop;
llen := length(fLineBuf); llen := length(fLineBuf);
// EOL // EOL
if fTokStop > llen then if fTokStop > llen then
exit; exit;
if fCurrRange.isNotAssigned then if fCurrRange.isNotAssigned then
fCurrRange := TSynSxSynRange.Create(nil); fCurrRange := TSynSxSynRange.Create(nil);
// special lines
if (fLineBuf.length > 1) then if (fLineBuf.length > 1) then
begin begin
// she bang // she bang
@ -736,10 +738,11 @@ begin
end; end;
end; end;
// continue partial multi-line ranges
case fCurrRange.rangeKind of case fCurrRange.rangeKind of
TRangeKind.rkString1: begin lexStringLiteral(); exit; end; TRangeKind.rkString1: begin lexStringLiteral(); exit; end;
TRangeKind.rkString2: begin lexRawStringLiteral(); exit; end; TRangeKind.rkString2: begin lexRawStringLiteral(); exit; end;
TRangeKind.rkBlockCom1: begin lexStarComment(); exit; end; TRangeKind.rkBlockCom1: begin lexStarComment(); exit; end;
end; end;
case fLineBuf[fTokStop] of case fLineBuf[fTokStop] of
@ -747,7 +750,6 @@ begin
begin begin
fTokStop += 1; fTokStop += 1;
fTokKind := TTokenKind.tkBlank; fTokKind := TTokenKind.tkBlank;
exit;
end; end;
// `//comment` `/*comment` `/=` `/` // `//comment` `/*comment` `/=` `/`
'/': '/':
@ -806,7 +808,7 @@ begin
end; end;
'@': '@':
begin begin
fTokKind := TTokenKind.tkError; fTokKind := TTokenKind.tkError;
fTokStop += 1; fTokStop += 1;
if fTokStop <= llen then if fTokStop <= llen then
begin begin
@ -829,7 +831,6 @@ begin
else begin else begin
fTokStop += 1; fTokStop += 1;
fTokKind := TTokenKind.tkError; fTokKind := TTokenKind.tkError;
exit;
end; end;
end; end;
end; end;