paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-16 04:59:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit, Highlighters: actually use initial value of DefaultFilter when deciding whether to store this value to LFM or not

Browse Source
This commit is contained in:
Maxim Ganetsky 2024-01-07 19:50:57 +03:00
parent 9f756357f4
commit 889c2339f6
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/synedit/synedithighlighter.pp
View File

@ -350,6 +350,7 @@ type
protected protected
FAttributeChangeNeedScan: Boolean; FAttributeChangeNeedScan: Boolean;
fDefaultFilter: string; fDefaultFilter: string;
fDefaultFilterInitialValue: string;
fUpdateChange: boolean; //mh 2001-09-13 fUpdateChange: boolean; //mh 2001-09-13
FIsInNextToEOL: Boolean; FIsInNextToEOL: Boolean;
function GetInstanceLanguageName: string; virtual; function GetInstanceLanguageName: string; virtual;
@ -1318,6 +1319,7 @@ begin
fAttributes.Sorted := TRUE; fAttributes.Sorted := TRUE;
fAttrChangeHooks := TMethodList.Create; fAttrChangeHooks := TMethodList.Create;
fDefaultFilter := ''; fDefaultFilter := '';
fDefaultFilterInitialValue := '';
end; end;
destructor TSynCustomHighlighter.Destroy; destructor TSynCustomHighlighter.Destroy;

5
components/synedit/synhighlighterjscript.pas
View File

@ -1550,7 +1550,8 @@ begin
SetAttributesOnChange(@DefHighlightChange); SetAttributesOnChange(@DefHighlightChange);
InitIdent; InitIdent;
MakeMethodTables; MakeMethodTables;
fDefaultFilter := SYNS_FilterJScript; fDefaultFilterInitialValue := SYNS_FilterJScript;
fDefaultFilter := fDefaultFilterInitialValue;
fRange := rsUnknown; fRange := rsUnknown;
end; end;
@ -1876,7 +1877,7 @@ end;
function TSynJScriptSyn.IsFilterStored: Boolean; function TSynJScriptSyn.IsFilterStored: Boolean;
begin begin
Result := fDefaultFilter <> SYNS_FilterJScript; Result := fDefaultFilter <> fDefaultFilterInitialValue;
end; end;
function TSynJScriptSyn.StartJScriptCodeFoldBlock( function TSynJScriptSyn.StartJScriptCodeFoldBlock(

5
components/synedit/synhighlighterpas.pp
View File

@ -3065,7 +3065,8 @@ begin
MakeMethodTables; MakeMethodTables;
fRange := []; fRange := [];
fAsmStart := False; fAsmStart := False;
fDefaultFilter := SYNS_FilterPascal; fDefaultFilterInitialValue := SYNS_FilterPascal;
fDefaultFilter := fDefaultFilterInitialValue;
end; { Create } end; { Create }
destructor TSynPasSyn.Destroy; destructor TSynPasSyn.Destroy;
@ -5459,7 +5460,7 @@ end;
{begin} //mh 2000-10-08 {begin} //mh 2000-10-08
function TSynPasSyn.IsFilterStored: boolean; function TSynPasSyn.IsFilterStored: boolean;
begin begin
Result := fDefaultFilter <> SYNS_FilterPascal; Result := fDefaultFilter <> fDefaultFilterInitialValue;
end; end;
procedure TSynPasSyn.CreateRootCodeFoldBlock; procedure TSynPasSyn.CreateRootCodeFoldBlock;

5
components/synedit/synhighlightervb.pas
View File

@ -1032,7 +1032,8 @@ begin
SetAttributesOnChange(@DefHighlightChange); SetAttributesOnChange(@DefHighlightChange);
InitIdent; InitIdent;
MakeMethodTables; MakeMethodTables;
fDefaultFilter := SYNS_FilterVisualBASIC; fDefaultFilterInitialValue := SYNS_FilterVisualBASIC;
fDefaultFilter := fDefaultFilterInitialValue;
end; end;
procedure TSynVBSyn.SetLine(const NewValue: String; LineNumber: Integer); procedure TSynVBSyn.SetLine(const NewValue: String; LineNumber: Integer);
@ -1238,7 +1239,7 @@ end;
function TSynVBSyn.IsFilterStored: Boolean; function TSynVBSyn.IsFilterStored: Boolean;
begin begin
Result := fDefaultFilter <> SYNS_FilterVisualBASIC; Result := fDefaultFilter <> fDefaultFilterInitialValue;
end; end;
class function TSynVBSyn.GetLanguageName: string; class function TSynVBSyn.GetLanguageName: string;