paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-11 02:48:31 +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 
(cherry picked from commit 889c2339f6)
This commit is contained in:
Maxim Ganetsky 2024-01-07 19:50:57 +03:00
parent 2e6008c8fa
commit a7413b60db
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
FAttributeChangeNeedScan: Boolean;
fDefaultFilter: string;
fDefaultFilterInitialValue: string;
fUpdateChange: boolean; //mh 2001-09-13
FIsInNextToEOL: Boolean;
procedure AddAttribute(AAttrib: TSynHighlighterAttributes);
@ -1316,6 +1317,7 @@ begin
fAttributes.Sorted := TRUE;
fAttrChangeHooks := TMethodList.Create;
fDefaultFilter := '';
fDefaultFilterInitialValue := '';
end;
destructor TSynCustomHighlighter.Destroy;

5
components/synedit/synhighlighterjscript.pas
View File

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

5
components/synedit/synhighlighterpas.pp
View File

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

5
components/synedit/synhighlightervb.pas
View File

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