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

Merge branch 'a12_2_a13'

This commit is contained in:
Basile Burg 2015-02-22 09:43:37 +01:00
parent 6344593802 d386e723ae
commit 858be53ef3
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ce_d2syn.pas
View File

@ -143,6 +143,7 @@ type
public public
constructor create(aOwner: TComponent); override; constructor create(aOwner: TComponent); override;
destructor destroy; override; destructor destroy; override;
procedure Assign(Source: TPersistent); override;
procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
function GetDefaultAttribute(Index: integer): TSynHighlighterAttributes; override; function GetDefaultAttribute(Index: integer): TSynHighlighterAttributes; override;
procedure setLine(const NewValue: String; LineNumber: Integer); override; procedure setLine(const NewValue: String; LineNumber: Integer); override;
@ -337,6 +338,18 @@ begin
inherited; inherited;
end; end;
procedure TSynD2Syn.Assign(Source: TPersistent);
var
srcsyn: TSynD2Syn;
begin
inherited;
if Source is TSynD2Syn then
begin
srcsyn := TSynD2Syn(Source);
FoldKinds := srcsyn.FoldKinds;
end;
end;
function TSynD2Syn.GetRangeClass: TSynCustomHighlighterRangeClass; function TSynD2Syn.GetRangeClass: TSynCustomHighlighterRangeClass;
begin begin
result := TSynD2SynRange; result := TSynD2SynRange;

1
src/ce_synmemo.pas
View File

@ -337,7 +337,6 @@ begin
end; end;
// //
Highlighter := D2Syn; Highlighter := D2Syn;
D2Syn.FoldKinds := [fkBrackets, fkComments1, fkComments2, fkStrings, fkRegion];
// //
fTempFileName := GetTempDir(false) + 'temp_' + uniqueObjStr(self) + '.d'; fTempFileName := GetTempDir(false) + 'temp_' + uniqueObjStr(self) + '.d';
fFilename := '<new document>'; fFilename := '<new document>';