paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-01 11:59:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: PascalHighlighter, added ModifierAttr

Browse Source
This commit is contained in:
Martin 2024-01-24 23:37:52 +01:00
parent 0ce675d692
commit 4a8561b0d5
22 changed files with 293 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/synedit/languages/syneditstrconst.ca.po
View File

@ -253,6 +253,10 @@ msgstr ""
msgid "Miscellaneous"
msgstr ""
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr ""

4
components/synedit/languages/syneditstrconst.cs.po
View File

@ -255,6 +255,10 @@ msgstr "Zpráva"
msgid "Miscellaneous"
msgstr "Různé"
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr "Jméno atributu jmenného prostoru"

4
components/synedit/languages/syneditstrconst.de.po
View File

@ -257,6 +257,10 @@ msgstr "Nachricht"
msgid "Miscellaneous"
msgstr "Verschiedenes"
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr "Namensraum Attribut Name"

4
components/synedit/languages/syneditstrconst.es.po
View File

@ -255,6 +255,10 @@ msgstr "Mensaje"
msgid "Miscellaneous"
msgstr "Miscelaneo"
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr "Nombre de Atributo del Espacio de Nombres"

4
components/synedit/languages/syneditstrconst.fi.po
View File

@ -248,6 +248,10 @@ msgstr "Viesti"
msgid "Miscellaneous"
msgstr "Sekalainen"
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr "Nimiavaruuden attribuutin nimi"

4
components/synedit/languages/syneditstrconst.fr.po
View File

@ -255,6 +255,10 @@ msgstr "Message"
msgid "Miscellaneous"
msgstr "Divers"
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr "Nom de l'attribut de nommage"

4
components/synedit/languages/syneditstrconst.he.po
View File

@ -253,6 +253,10 @@ msgstr "הודעה"
msgid "Miscellaneous"
msgstr "שונות"
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr "שם של מאפיין מרחב-השמות"

4
components/synedit/languages/syneditstrconst.hu.po
View File

@ -255,6 +255,10 @@ msgstr "Üzenet"
msgid "Miscellaneous"
msgstr "Vegyes"
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr "Névtér tulajdonság neve"

4
components/synedit/languages/syneditstrconst.id.po
View File

@ -256,6 +256,10 @@ msgstr ""
msgid "Miscellaneous"
msgstr ""
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr ""

4
components/synedit/languages/syneditstrconst.it.po
View File

@ -256,6 +256,10 @@ msgstr "Messaggio"
msgid "Miscellaneous"
msgstr "Varie"
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr "Nome attributo namespace"

4
components/synedit/languages/syneditstrconst.lt.po
View File

@ -256,6 +256,10 @@ msgstr "Pranešimas"
msgid "Miscellaneous"
msgstr "Kita"
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr "Vardų srities atributo pavadinimas"

4
components/synedit/languages/syneditstrconst.nl.po
View File

@ -253,6 +253,10 @@ msgstr ""
msgid "Miscellaneous"
msgstr ""
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr ""

4
components/synedit/languages/syneditstrconst.pl.po
View File

@ -256,6 +256,10 @@ msgstr "Komunikat"
msgid "Miscellaneous"
msgstr "Pozostałe"
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr ""

4
components/synedit/languages/syneditstrconst.pot
View File

@ -245,6 +245,10 @@ msgstr ""
msgid "Miscellaneous"
msgstr ""
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr ""

4
components/synedit/languages/syneditstrconst.pt_BR.po
View File

@ -255,6 +255,10 @@ msgstr "Mensagem"
msgid "Miscellaneous"
msgstr "Miscelânea"
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr "Nome Atributo \"Namespace\""

4
components/synedit/languages/syneditstrconst.ru.po
View File

@ -255,6 +255,10 @@ msgstr "Сообщение"
msgid "Miscellaneous"
msgstr "Разное"
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr "Имя атрибута пространства имён"

4
components/synedit/languages/syneditstrconst.tr.po
View File

@ -256,6 +256,10 @@ msgstr ""
msgid "Miscellaneous"
msgstr ""
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr ""

4
components/synedit/languages/syneditstrconst.uk.po
View File

@ -258,6 +258,10 @@ msgstr "Повідомлення"
msgid "Miscellaneous"
msgstr "Різне"
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr "Назва атрибута простору назв"

4
components/synedit/languages/syneditstrconst.zh_CN.po
View File

@ -256,6 +256,10 @@ msgstr "信息"
msgid "Miscellaneous"
msgstr ""
#: syneditstrconst.syns_attrmodifier
msgid "Modifier"
msgstr ""
#: syneditstrconst.syns_attrnamespaceattrname
msgid "Namespace Attribute Name"
msgstr "命名空间属性名称"

2
components/synedit/syneditstrconst.pp
View File

@ -112,6 +112,7 @@ resourcestring
SYNS_AttrQualifier = 'Qualifier';
SYNS_AttrRegister = 'Register';
SYNS_AttrReservedWord = 'Reserved word';
SYNS_AttrModifier = 'Modifier';
SYNS_AttrRpl = 'Rpl';
SYNS_AttrRplKey = 'Rpl key';
SYNS_AttrRplComment = 'Rpl comment';
@ -233,6 +234,7 @@ const
SYNS_XML_AttrQualifier = 'Qualifier';
SYNS_XML_AttrRegister = 'Register';
SYNS_XML_AttrReservedWord = 'Reserved word';
SYNS_XML_AttrModifier = 'Modifier';
SYNS_XML_AttrRpl = 'Rpl';
SYNS_XML_AttrRplKey = 'Rpl key';
SYNS_XML_AttrRplComment = 'Rpl comment';

118
components/synedit/synhighlighterpas.pp
View File

@ -60,7 +60,7 @@ type
TSynPasMultilineStringMode = (spmsmDoubleQuote);
TSynPasMultilineStringModes = set of TSynPasMultilineStringMode;
TtkTokenKind = (tkAsm, tkComment, tkIdentifier, tkKey, tkNull, tkNumber,
TtkTokenKind = (tkAsm, tkComment, tkIdentifier, tkKey, tkModifier, tkNull, tkNumber,
tkSpace, tkString, tkSymbol, tkDirective, tkIDEDirective,
tkUnknown);
@ -397,6 +397,7 @@ type
fStringAttri: TSynHighlighterAttributes;
fNumberAttri: TSynHighlighterAttributes;
fKeyAttri: TSynHighlighterAttributes;
fModifierAttri: TSynHighlighterAttributes;
fSymbolAttri: TSynHighlighterAttributes;
fAsmAttri: TSynHighlighterAttributes;
fCommentAttri: TSynHighlighterAttributes;
@ -672,6 +673,7 @@ type
property IdentifierAttri: TSynHighlighterAttributes read fIdentifierAttri
write fIdentifierAttri;
property KeyAttri: TSynHighlighterAttributes read fKeyAttri write fKeyAttri;
property ModifierAttri: TSynHighlighterAttributes read fModifierAttri write fModifierAttri;
property NumberAttri: TSynHighlighterAttributes read fNumberAttri
write fNumberAttri;
property SpaceAttri: TSynHighlighterAttributes read fSpaceAttri
@ -1313,7 +1315,7 @@ begin
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
KeyComp('Far')
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else Result := tkIdentifier;
@ -1326,7 +1328,7 @@ begin
(fRange * [rsInProcHeader, rsProperty, rsAfterEqualOrColon, rsWasInProcHeader] = [rsWasInProcHeader]) and
(TopPascalCodeFoldBlockType in ProcModifierAllowed)
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -1413,7 +1415,7 @@ begin
(TopPascalCodeFoldBlockType in [cfbtClass])
then
begin
Result := tkKey;
Result := tkModifier;
fRange := fRange + [rsAtClass];
end
else
@ -1423,7 +1425,7 @@ begin
KeyComp('name') // procedure foo; public name 'abc';
then
begin
Result := tkKey;
Result := tkModifier;
FNextTokenState := tsAfterExternal; // external 'foo' name 'bar'
end
else
@ -1485,7 +1487,7 @@ begin
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
KeyComp('Near')
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else Result := tkIdentifier;
@ -1571,7 +1573,7 @@ begin
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
KeyComp('Alias')
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -1604,7 +1606,7 @@ begin
KeyComp('CVAR') and
(TopPascalCodeFoldBlockType() in [cfbtVarType, cfbtLocalVarType])
then begin
Result := tkKey;
Result := tkModifier;
FNextTokenState := tsAfterCvar;
end
else
@ -1628,7 +1630,7 @@ begin
(PasCodeFoldRange.BracketNestLevel = 0) and
(TopPascalCodeFoldBlockType in [cfbtClass])
then begin
Result := tkKey;
Result := tkModifier;
fRange := fRange + [rsAtClass]; // forward, in case of further class modifiers
end
else
@ -1669,7 +1671,7 @@ begin
(fRange * [rsInProcHeader, rsProperty, rsAfterEqualOrColon, rsWasInProcHeader] = [rsWasInProcHeader]) and
(TopPascalCodeFoldBlockType in ProcModifierAllowed)
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -1757,7 +1759,7 @@ begin
(fRange * [rsInProcHeader, rsProperty, rsAfterEqualOrColon, rsWasInProcHeader] = [rsWasInProcHeader]) and
(TopPascalCodeFoldBlockType in ProcModifierAllowed)
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -1830,7 +1832,7 @@ begin
) ) )
)
then begin
Result := tkKey;
Result := tkModifier;
FNextTokenState := tsAfterExternal;
end
else
@ -1857,7 +1859,7 @@ begin
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
KeyComp('Inline')
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else Result := tkIdentifier;
@ -1881,7 +1883,7 @@ begin
else if KeyComp('helper') then begin
if (rsAtClass in fRange) and (PasCodeFoldRange.BracketNestLevel = 0)
then begin
Result := tkKey;
Result := tkKey; // tkModifier
fRange := fRange - [rsVarTypeInSpecification, rsAfterEqual] + [rsInTypeHelper];
end
else
@ -1953,9 +1955,12 @@ begin
(rsProperty in fRange)
)
then begin
Result := tkKey;
if rsProperty in fRange then
if rsProperty in fRange then begin
fRange := fRange + [rsAtPropertyOrReadWrite] - [rsVarTypeInSpecification];
Result := tkKey
end
else
Result := tkModifier;
end
else
Result := tkIdentifier;
@ -1965,7 +1970,7 @@ begin
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
KeyComp('Dynamic')
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -1974,7 +1979,7 @@ begin
(TopPascalCodeFoldBlockType in [cfbtClass, cfbtClassSection]) and
(PasCodeFoldRange.BracketNestLevel = 0)
then
Result := tkKey
Result := tkModifier
else
Result := tkIdentifier;
end;
@ -1986,7 +1991,7 @@ begin
(fRange * [rsInProcHeader, rsProperty, rsAfterEqualOrColon, rsWasInProcHeader] = [rsWasInProcHeader]) and
(TopPascalCodeFoldBlockType in ProcModifierAllowed)
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else if KeyComp('Const') then begin
@ -2020,7 +2025,7 @@ begin
(fRange * [rsAfterClassMembers, rsAfterClassField] <> []) and
(PasCodeFoldRange.BracketNestLevel = 0)
then
Result := tkKey
Result := tkModifier
else
Result := tkIdentifier;
end;
@ -2126,7 +2131,7 @@ begin
( fRange *[rsAfterEqualOrColon, rsProperty] = [] ) and
(PasCodeFoldRange.BracketNestLevel = 0)
then
Result := tkKey
Result := tkModifier
else
Result := tkIdentifier;
end
@ -2138,7 +2143,7 @@ function TSynPasSyn.Func84: TtkTokenKind;
begin
if KeyComp('Abstract') and (TopPascalCodeFoldBlockType in [cfbtClass, cfbtClassSection])
then begin
Result := tkKey;
Result := tkModifier;
if (rsAfterClass in fRange) and (PasCodeFoldRange.BracketNestLevel = 0) then
fRange := fRange + [rsAtClass] // forward, in case of further class modifiers end
else
@ -2166,7 +2171,7 @@ begin
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
KeyComp('Forward')
then begin
Result := tkKey;
Result := tkModifier;
if TopPascalCodeFoldBlockType = cfbtProcedure then begin
EndPascalCodeFoldBlock(True);
end;
@ -2216,7 +2221,7 @@ begin
(fRange * [rsInProcHeader, rsProperty, rsAfterEqualOrColon, rsWasInProcHeader] = [rsWasInProcHeader]) and
(TopPascalCodeFoldBlockType in ProcModifierAllowed)
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -2291,11 +2296,11 @@ begin
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
KeyComp('overload')
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
if KeyComp('NoInline') then Result := tkKey
if KeyComp('NoInline') then Result := tkModifier
else
if KeyComp('Inherited') then Result := tkKey
else Result := tkIdentifier;
@ -2308,7 +2313,7 @@ begin
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
KeyComp('Assembler')
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -2333,7 +2338,7 @@ begin
(PasCodeFoldRange.BracketNestLevel = 0) and
(FTokenState = tsNone) // FTokenState <> tsAfterAbsolute
then begin
Result := tkKey;
Result := tkModifier;
// prevent: var foo absolute absolute; // at same address as variable named absolute
// does not prevent: var foo absolute bar absolute abc; // not valid code
FNextTokenState := tsAfterAbsolute;
@ -2365,7 +2370,7 @@ begin
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
KeyComp('Override')
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -2404,14 +2409,19 @@ begin
) and
KeyComp('Export')
then begin
Result := tkKey;
Result := tkModifier;
FNextTokenState := tsAfterExternal;
end
else
if KeyComp('Nodefault') then
begin
if rsProperty in fRange then Result := tkKey else Result := tkIdentifier;
end else Result := tkIdentifier;
if rsProperty in fRange then
Result := tkModifier
else
Result := tkIdentifier;
end
else
Result := tkIdentifier;
end;
function TSynPasSyn.Func99: TtkTokenKind;
@ -2430,7 +2440,7 @@ begin
) and
KeyComp('External')
then begin
Result := tkKey;
Result := tkModifier;
FNextTokenState := tsAfterExternal;
if tbf = cfbtProcedure then begin
EndPascalCodeFoldBlock(True);
@ -2461,7 +2471,7 @@ begin
(fRange * [rsInProcHeader, rsProperty, rsAfterEqualOrColon, rsWasInProcHeader] = [rsWasInProcHeader]) and
(TopPascalCodeFoldBlockType in ProcModifierAllowed)
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -2482,7 +2492,7 @@ begin
( fRange *[rsAfterEqualOrColon, rsProperty] = [] ) and
(PasCodeFoldRange.BracketNestLevel = 0)
then
Result := tkKey
Result := tkModifier
else
Result := tkIdentifier;
end
@ -2540,7 +2550,7 @@ begin
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
KeyComp('Virtual')
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else Result := tkIdentifier;
@ -2640,7 +2650,10 @@ end;
function TSynPasSyn.Func117: TtkTokenKind;
begin
if KeyComp('Exports') then Result := tkKey else Result := tkIdentifier;
if KeyComp('Exports') then
Result := tkKey
else
Result := tkIdentifier;
end;
function TSynPasSyn.Func122: TtkTokenKind;
@ -2684,7 +2697,7 @@ begin
(fRange * [rsInProcHeader, rsProperty, rsAfterEqualOrColon, rsWasInProcHeader] = [rsWasInProcHeader]) and
(TopPascalCodeFoldBlockType in ProcModifierAllowed)
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -2693,7 +2706,7 @@ begin
(fRange * [rsInProcHeader, rsProperty, rsAfterEqualOrColon, rsWasInProcHeader] = [rsWasInProcHeader]) and
(TopPascalCodeFoldBlockType in ProcModifierAllowed)
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -2712,7 +2725,7 @@ begin
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
KeyComp('NoStackFrame')
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -2748,7 +2761,7 @@ begin
Result := tkKey
else
if KeyComp('Enumerator') and (TopPascalCodeFoldBlockType in [cfbtClassSection]) then
Result := tkKey
Result := tkModifier
else
Result := tkIdentifier;
end;
@ -2761,7 +2774,7 @@ begin
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
KeyComp('Reintroduce')
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -2802,7 +2815,7 @@ begin
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
KeyComp('WeakExternal') then
begin
Result := tkKey;
Result := tkModifier;
if TopPascalCodeFoldBlockType = cfbtProcedure then
EndPascalCodeFoldBlock(True);
end
@ -2839,7 +2852,7 @@ begin
( fRange *[rsAfterEqualOrColon, rsProperty] = [] ) and
(PasCodeFoldRange.BracketNestLevel = 0)
then
Result := tkKey
Result := tkModifier
else
Result := tkIdentifier;
end
@ -2877,7 +2890,7 @@ begin
(TopPascalCodeFoldBlockType in ProcModifierAllowed) and
KeyComp('compilerproc')
then begin// fpc modifier
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -2921,7 +2934,7 @@ begin
( fRange *[rsAfterEqualOrColon, rsProperty] = [] ) and
(PasCodeFoldRange.BracketNestLevel = 0)
then
Result := tkKey
Result := tkModifier
else
Result := tkIdentifier;
end
@ -2984,7 +2997,7 @@ begin
(fRange * [rsInProcHeader, rsProperty, rsAfterEqualOrColon, rsWasInProcHeader] = [rsWasInProcHeader]) and
(TopPascalCodeFoldBlockType in ProcModifierAllowed)
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -3041,7 +3054,7 @@ begin
(fRange * [rsInProcHeader, rsProperty, rsAfterEqualOrColon, rsWasInProcHeader] = [rsWasInProcHeader]) and
(TopPascalCodeFoldBlockType in ProcModifierAllowed)
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -3055,7 +3068,7 @@ begin
(fRange * [rsInProcHeader, rsProperty, rsAfterEqualOrColon, rsWasInProcHeader] = [rsWasInProcHeader]) and
(TopPascalCodeFoldBlockType in ProcModifierAllowed)
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -3069,7 +3082,7 @@ begin
(fRange * [rsInProcHeader, rsProperty, rsAfterEqualOrColon, rsWasInProcHeader] = [rsWasInProcHeader]) and
(TopPascalCodeFoldBlockType in ProcModifierAllowed)
then begin
Result := tkKey;
Result := tkModifier;
FRange := FRange + [rsInProcHeader];
end
else
@ -3162,6 +3175,9 @@ begin
fKeyAttri := TSynHighlighterAttributes.Create(@SYNS_AttrReservedWord, SYNS_XML_AttrReservedWord);
fKeyAttri.Style:= [fsBold];
AddAttribute(fKeyAttri);
fModifierAttri := TSynHighlighterAttributes.Create(@SYNS_AttrModifier, SYNS_XML_AttrModifier);
fModifierAttri.Style:= [fsBold];
AddAttribute(fModifierAttri);
fNumberAttri := TSynHighlighterAttributes.Create(@SYNS_AttrNumber, SYNS_XML_AttrNumber);
AddAttribute(fNumberAttri);
fSpaceAttri := TSynHighlighterAttributes.Create(@SYNS_AttrSpace, SYNS_XML_AttrSpace);
@ -4324,6 +4340,7 @@ begin
end;
tkIdentifier: Result := fIdentifierAttri;
tkKey: Result := fKeyAttri;
tkModifier: Result := fModifierAttri;
tkNumber: Result := fNumberAttri;
tkSpace: Result := fSpaceAttri;
tkString: Result := fStringAttri;
@ -5593,6 +5610,7 @@ function TSynPasSyn.UseUserSettings(settingIndex: integer): boolean;
fStringAttri .Assign(tmpStringAttri);
fNumberAttri .Assign(tmpNumberAttri);
fKeyAttri .Assign(tmpKeyAttri);
fModifierAttri .Assign(tmpKeyAttri);
fSymbolAttri .Assign(tmpSymbolAttri);
fAsmAttri .Assign(tmpAsmAttri);
fCommentAttri .Assign(tmpCommentAttri);

293
components/synedit/test/testhighlightpas.pas
View File

@ -342,6 +342,7 @@ begin
case TtkTokenKind(ExpTokens[i].ExpKind) of
tkIdentifier: ExpTokens[i].ExpAttr := PasHighLighter.IdentifierAttri;
tkKey: ExpTokens[i].ExpAttr := PasHighLighter.KeywordAttribute;
tkModifier: ExpTokens[i].ExpAttr := PasHighLighter.ModifierAttri;
tkSymbol: ExpTokens[i].ExpAttr := PasHighLighter.SymbolAttri;
tkString: ExpTokens[i].ExpAttr := PasHighLighter.StringAttri;
tkNumber: ExpTokens[i].ExpAttr := PasHighLighter.NumberAttri;
@ -654,7 +655,7 @@ begin
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, // "Procedure", " ", "message", "("
tkIdentifier, tkSymbol, tkSpace, tkIdentifier, // "message",, ":", " ", "message"
tkSymbol, tkSymbol, tkSpace, // ")", ";", " "
tkKey, // "message" as key
tkModifier, // "message" as key
tkSpace, tkNumber, tkSymbol
]);
CheckTokensForLine('property', 4,
@ -715,7 +716,7 @@ begin
CheckTokensForLine('type cdecl', 2,
[ tkIdentifier, TK_Equal, tkKey, // cdecl=function
TK_Bracket, tkIdentifier, TK_Comma, tkIdentifier, TK_Bracket, // (cdecl:cdecl)
TK_Colon, tkIdentifier, TK_Semi, tkKey, TK_Semi // :cdecl;cdecl;
TK_Colon, tkIdentifier, TK_Semi, tkModifier, TK_Semi // :cdecl;cdecl;
]);
CheckTokensForLine('StdCall=class', 4,
@ -726,8 +727,8 @@ begin
CheckTokensForLine('function/method cdecl', 5,
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, // function cdecl
TK_Bracket, tkIdentifier, TK_Comma, tkIdentifier, TK_Bracket, // (cdecl:cdecl)
TK_Colon, tkIdentifier, TK_Semi, tkKey, TK_Semi, // :cdecl;cdecl;
tkKey, TK_Semi //deprecated;
TK_Colon, tkIdentifier, TK_Semi, tkModifier, TK_Semi, // :cdecl;cdecl;
tkModifier, TK_Semi //deprecated;
]);
CheckTokensForLine('property', 6,
@ -740,14 +741,14 @@ begin
CheckTokensForLine('funciton in recorld', 10,
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, // function cdecl
TK_Bracket, tkIdentifier, TK_Comma, tkIdentifier, TK_Bracket, // (cdecl:cdecl)
TK_Colon, tkIdentifier, TK_Semi, tkKey, TK_Semi, // :cdecl;cdecl;
tkKey, TK_Semi //deprecated;
TK_Colon, tkIdentifier, TK_Semi, tkModifier, TK_Semi, // :cdecl;cdecl;
tkModifier, TK_Semi //deprecated;
]);
CheckTokensForLine('var cdecl function', 14,
[ tkIdentifier, TK_Equal, tkKey, // Stdcall:function
TK_Bracket, tkIdentifier, TK_Comma, tkIdentifier, TK_Bracket, // (cdecl:cdecl)
TK_Colon, tkIdentifier, TK_Semi, tkKey, TK_Semi // :cdecl;cdecl;
TK_Colon, tkIdentifier, TK_Semi, tkModifier, TK_Semi // :cdecl;cdecl;
]);
CheckTokensForLine('var cdecl:cdecl', 16,
@ -757,20 +758,20 @@ begin
CheckTokensForLine('function', 18,
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, // function StdCall
TK_Bracket, tkIdentifier, TK_Comma, tkIdentifier, TK_Bracket, // (cdecl:cdecl)
TK_Colon, tkIdentifier, TK_Semi, tkKey, TK_Semi // :cdecl;cdecl;
TK_Colon, tkIdentifier, TK_Semi, tkModifier, TK_Semi // :cdecl;cdecl;
]);
CheckTokensForLine('var cdecl deprecated:cdecl', 20,
[ tkIdentifier, TK_Colon, tkIdentifier, //cdecl:cdecl
tkSpace, tkKey, TK_Semi //deprecated;
tkSpace, tkModifier, TK_Semi //deprecated;
]);
CheckTokensForLine('function deprecated', 21,
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, // function StdCall
TK_Bracket, tkIdentifier, TK_Comma, tkIdentifier, TK_Bracket, // (cdecl:cdecl)
TK_Colon, tkIdentifier,TK_Semi, // :cdecl;
tkKey, TK_Semi, // cdecl;
tkKey, TK_Semi //deprecated;
tkModifier, TK_Semi, // cdecl;
tkModifier, TK_Semi //deprecated;
]);
end;
@ -813,17 +814,17 @@ begin
CheckTokensForLine('procedure name; external ''name'' name ''name'';', 1,
[tkKey, tkSpace, tkIdentifier+p, TK_Semi, tkSpace,
tkKey, tkSpace, tkString, tkSpace, tkKey, tkSpace, tkString, TK_Semi]);
tkModifier, tkSpace, tkString, tkSpace, tkModifier, tkSpace, tkString, TK_Semi]);
CheckTokensForLine('procedure name; public name ''name'';', 2,
[tkKey, tkSpace, tkIdentifier+p, TK_Semi, tkSpace,
tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi]);
tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi]);
CheckTokensForLine('function name: name; external ''name'' name ''name'';', 4,
[tkKey, tkSpace, tkIdentifier+p, TK_Colon, tkSpace, tkIdentifier, TK_Semi, tkSpace,
tkKey, tkSpace, tkString, tkSpace, tkKey, tkSpace, tkString, TK_Semi]);
tkModifier, tkSpace, tkString, tkSpace, tkModifier, tkSpace, tkString, TK_Semi]);
CheckTokensForLine('function name: name; public name ''name'';', 5,
[tkKey, tkSpace, tkIdentifier+p, TK_Colon, tkSpace, tkIdentifier, TK_Semi, tkSpace,
tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi]);
tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi]);
CheckTokensForLine('CLASS: procedure name; public name: name;', 9,
[tkKey, tkSpace, tkIdentifier+p, TK_Semi, tkSpace,
@ -945,145 +946,145 @@ begin
CheckTokensForLine(n+':'+n+'; public;', 3,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkSpace,
tkKey, TK_Semi
tkModifier, TK_Semi
]);
CheckTokensForLine(n+':'+n+'; public name ''name'';', 4,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkSpace,
tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi
tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
]);
CheckTokensForLine(n+':'+n+'; external;', 5,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkSpace,
tkKey, TK_Semi
tkModifier, TK_Semi
]);
CheckTokensForLine(n+':'+n+'; external ''name'';', 6,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkSpace,
tkKey, tkSpace, tkString, TK_Semi
tkModifier, tkSpace, tkString, TK_Semi
]);
CheckTokensForLine(n+':'+n+'; external name ''name'';', 7,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkSpace,
tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi
tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
]);
CheckTokensForLine(n+':'+n+'; external ''name'' name ''name'';', 8,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkSpace,
tkKey, tkSpace, tkString, tkSpace, tkKey, tkSpace, tkString, TK_Semi
tkModifier, tkSpace, tkString, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
]);
CheckTokensForLine(n+':'+n+'; export;', 9,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkSpace,
tkKey, TK_Semi
tkModifier, TK_Semi
]);
CheckTokensForLine(n+':'+n+'; export name ''name'';', 10,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkSpace,
tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi
tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
]);
CheckTokensForLine(n+':'+n+';cvar; public;', 13,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkKey {cvar}, TK_Semi, tkSpace,
tkKey, TK_Semi
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkModifier {cvar}, TK_Semi, tkSpace,
tkModifier, TK_Semi
]);
CheckTokensForLine(n+':'+n+';cvar; public name ''name'';', 14,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkKey {cvar}, TK_Semi, tkSpace,
tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkModifier {cvar}, TK_Semi, tkSpace,
tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
]);
CheckTokensForLine(n+':'+n+';cvar; external;', 15,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkKey {cvar}, TK_Semi, tkSpace,
tkKey, TK_Semi
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkModifier {cvar}, TK_Semi, tkSpace,
tkModifier, TK_Semi
]);
CheckTokensForLine(n+':'+n+';cvar; external ''name'';', 16,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkKey {cvar}, TK_Semi, tkSpace,
tkKey, tkSpace, tkString, TK_Semi
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkModifier {cvar}, TK_Semi, tkSpace,
tkModifier, tkSpace, tkString, TK_Semi
]);
// CheckTokensForLine(n+':'+n+';cvar; external name ''name'';', 17,
// tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi
// [tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkSpace, tkKey {cvar}, TK_Semi, tkSpace,
// tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
// [tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkSpace, tkModifier {cvar}, TK_Semi, tkSpace,
// ]);
// CheckTokensForLine(n+':'+n+';cvar; external ''name'' name ''name'';', 18,
// [tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkSpace, tkKey {cvar}, TK_Semi, tkSpace,
// tkKey, tkSpace, tkString, tkSpace, tkKey, tkSpace, tkString, TK_Semi
// [tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkSpace, tkModifier {cvar}, TK_Semi, tkSpace,
// tkModifier, tkSpace, tkString, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
// ]);
CheckTokensForLine(n+':'+n+';cvar; export;', 19,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkKey {cvar}, TK_Semi, tkSpace,
tkKey, TK_Semi
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkModifier {cvar}, TK_Semi, tkSpace,
tkModifier, TK_Semi
]);
CheckTokensForLine(n+':'+n+';cvar; export name ''name'';', 20,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkKey {cvar}, TK_Semi, tkSpace,
tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkModifier {cvar}, TK_Semi, tkSpace,
tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
]);
// just another var:
CheckTokensForLine(n+':'+n+';cvar; cvar: cvar; name: name; var', 21,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkKey {cvar}, TK_Semi, tkSpace,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Semi, tkModifier {cvar}, TK_Semi, tkSpace,
tkIdentifier, TK_Colon, tkSpace, tkIdentifier, TK_Semi, tkSpace,
tkIdentifier, TK_Colon, tkSpace, tkIdentifier, TK_Semi,
tkSpace, tkKey
tkSpace, tkkey
]);
CheckTokensForLine(n+':'+n+'=1; public;', 23,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Equal, tkNumber, TK_Semi, tkSpace,
tkKey, TK_Semi
tkModifier, TK_Semi
]);
CheckTokensForLine(n+':'+n+'=1; public name ''name'';', 24,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Equal, tkNumber, TK_Semi, tkSpace,
tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi
tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
]);
// CheckTokensForLine(n+':'+n+'=1; external;', 25,
// [tkIdentifier, TK_Colon, tkIdentifier, TK_Equal, tkNumber, TK_Semi, tkSpace,
// tkKey, TK_Semi
// tkModifier, TK_Semi
// ]);
// CheckTokensForLine(n+':'+n+'=1; external ''name'';', 26,
// [tkIdentifier, TK_Colon, tkIdentifier, TK_Equal, tkNumber, TK_Semi, tkSpace,
// tkKey, tkSpace, tkString, TK_Semi
// tkModifier, tkSpace, tkString, TK_Semi
// ]);
// CheckTokensForLine(n+':'+n+'=1; external name ''name'';', 27,
// [tkIdentifier, TK_Colon, tkIdentifier, TK_Equal, tkNumber, TK_Semi, tkSpace,
// tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi
// tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
// ]);
// CheckTokensForLine(n+':'+n+'=1; external ''name'' name ''name'';', 28,
// [tkIdentifier, TK_Colon, tkIdentifier, TK_Equal, tkNumber, TK_Semi, tkSpace,
// tkKey, tkSpace, tkString, tkSpace, tkKey, tkSpace, tkString, TK_Semi
// tkModifier, tkSpace, tkString, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
// ]);
CheckTokensForLine(n+':'+n+'=1; export;', 29,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Equal, tkNumber, TK_Semi, tkSpace,
tkKey, TK_Semi
tkModifier, TK_Semi
]);
CheckTokensForLine(n+':'+n+'=1; export name ''name'';', 30,
[tkIdentifier, TK_Colon, tkIdentifier, TK_Equal, tkNumber, TK_Semi, tkSpace,
tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi
tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
]);
CheckTokensForLine(n+':'+n+' deprecated; public;', 33,
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkKey{depr}, TK_Semi, tkSpace,
tkKey, TK_Semi
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkModifier{depr}, TK_Semi, tkSpace,
tkModifier, TK_Semi
]);
CheckTokensForLine(n+':'+n+' deprecated; public name ''name'';', 34,
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkKey{depr}, TK_Semi, tkSpace,
tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkModifier{depr}, TK_Semi, tkSpace,
tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
]);
CheckTokensForLine(n+':'+n+' deprecated; external;', 35,
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkKey{depr}, TK_Semi, tkSpace,
tkKey, TK_Semi
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkModifier{depr}, TK_Semi, tkSpace,
tkModifier, TK_Semi
]);
CheckTokensForLine(n+':'+n+' deprecated; external ''name'';', 36,
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkKey{depr}, TK_Semi, tkSpace,
tkKey, tkSpace, tkString, TK_Semi
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkModifier{depr}, TK_Semi, tkSpace,
tkModifier, tkSpace, tkString, TK_Semi
]);
CheckTokensForLine(n+':'+n+' deprecated; external name ''name'';', 37,
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkKey{depr}, TK_Semi, tkSpace,
tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkModifier{depr}, TK_Semi, tkSpace,
tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
]);
CheckTokensForLine(n+':'+n+' deprecated; external ''name'' name ''name'';', 38,
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkKey{depr}, TK_Semi, tkSpace,
tkKey, tkSpace, tkString, tkSpace, tkKey, tkSpace, tkString, TK_Semi
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkModifier{depr}, TK_Semi, tkSpace,
tkModifier, tkSpace, tkString, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
]);
CheckTokensForLine(n+':'+n+' deprecated; export;', 39,
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkKey{depr}, TK_Semi, tkSpace,
tkKey, TK_Semi
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkModifier{depr}, TK_Semi, tkSpace,
tkModifier, TK_Semi
]);
CheckTokensForLine(n+':'+n+' deprecated; export name ''name'';', 40,
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkKey{depr}, TK_Semi, tkSpace,
tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkModifier{depr}, TK_Semi, tkSpace,
tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
]);
CheckTokensForLine(n+':'+n+' absolute '+n+';', 43,
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkKey{absolute}, tkSpace, tkIdentifier, TK_Semi ]);
[tkIdentifier, TK_Colon, tkIdentifier, tkSpace, tkModifier{absolute}, tkSpace, tkIdentifier, TK_Semi ]);
//TYPE / just another type
CheckTokensForLine(n+'='+n+'; '+n+'='+n+';', 48,
@ -1096,7 +1097,7 @@ begin
tkIdentifier, TK_Equal, tkIdentifier, TK_Semi]);
CheckTokensForLine(n+':'+n+'='+n+'; cvar;', 51, // key CVAR
[tkIdentifier, TK_Colon, tkIdentifier, TK_Equal, tkIdentifier, TK_Semi, tkSpace,
tkKey, TK_Semi
tkModifier, TK_Semi
]);
if copy(n,1,6) = 'public' then
@ -1104,15 +1105,15 @@ begin
// NOT for "public"
CheckTokensForLine(n+':'+n+'='+n+'; cvar; public;', 52, // key CVAR
[tkIdentifier, TK_Colon, tkIdentifier, TK_Equal, tkIdentifier, TK_Semi, tkSpace,
tkKey, TK_Semi, tkSpace, tkKey, TK_Semi
tkModifier, TK_Semi, tkSpace, tkModifier, TK_Semi
]);
CheckTokensForLine(n+':'+n+'='+n+'; public;', 53, // key public
[tkIdentifier, TK_Colon, tkIdentifier, TK_Equal, tkIdentifier, TK_Semi, tkSpace,
tkKey, TK_Semi
tkModifier, TK_Semi
]);
CheckTokensForLine(n+':'+n+'='+n+'; public name ''name'';', 54, // key public name
[tkIdentifier, TK_Colon, tkIdentifier, TK_Equal, tkIdentifier, TK_Semi, tkSpace,
tkKey, tkSpace, tkKey, tkSpace, tkString, TK_Semi
tkModifier, tkSpace, tkModifier, tkSpace, tkString, TK_Semi
]);
// NOT for "public"
@ -1304,7 +1305,7 @@ begin
TK_Colon, tkIdentifier, TK_Bracket, TK_Colon, tkIdentifier, // :default]:default
tkSpace, tkKey, tkSpace, tkIdentifier, // read default
tkSpace, tkKey, tkSpace, tkIdentifier, // write default
TK_Semi, tkSpace, tkKey, TK_Semi // ; default;
TK_Semi, tkSpace, tkModifier, TK_Semi // ; default;
]);
CheckTokensForLine('property default:default read default default default;', 11,
@ -1575,18 +1576,18 @@ begin
CheckTokensForLine('var p1:procedure deprecated;', 28,
[ tkIdentifier, TK_Colon, tkKey, tkSpace, tkKey, TK_Semi // p1:procedure deprecated;
[ tkIdentifier, TK_Colon, tkKey, tkSpace, tkModifier, TK_Semi // p1:procedure deprecated;
]);
CheckTokensForLine('var p2:procedure(a:int64) deprecated;', 29,
[ tkIdentifier, TK_Colon, tkKey, // p2:procedure
TK_Bracket, tkIdentifier, TK_Colon, tkIdentifier, TK_Bracket, // (a:int64)
tkSpace, tkKey, TK_Semi //deprecated;
tkSpace, tkModifier, TK_Semi //deprecated;
]);
CheckTokensForLine('var f1:function:int64 deprecated;', 30,
[ tkIdentifier, TK_Colon, tkKey, // f1:function
TK_Colon, tkIdentifier, tkSpace, tkKey, TK_Semi // :int64 deprecated;
TK_Colon, tkIdentifier, tkSpace, tkModifier, TK_Semi // :int64 deprecated;
]);
end;
@ -1681,55 +1682,55 @@ procedure TTestHighlighterPas.TestContextForDeprecated;
//TODO: is nested
CheckTokensForLine('member in class', 3,
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('array of', 4,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('array [1..2] of', 5,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkSymbol, tkNumber, tkSymbol, tkNumber, tkSymbol,
tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('set of', 6,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('class of', 7,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('procedure ', 8,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('procedure of object ', 9,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('procedure(a:s) ', 10,
[tkIdentifier, tkSymbol, tkSpace, tkKey,
TK_Bracket, tkIdentifier, TK_Colon, tkIdentifier, TK_Bracket,
tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('procedure(a:s) of object ', 11,
[tkIdentifier, tkSymbol, tkSpace, tkKey,
TK_Bracket, tkIdentifier, TK_Colon, tkIdentifier, TK_Bracket,
tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('function', 12,
[tkIdentifier, tkSymbol, tkSpace, tkKey, TK_Colon, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, TK_Colon, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('function of object ', 13,
[tkIdentifier, tkSymbol, tkSpace, tkKey, TK_Colon, tkIdentifier, tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, TK_Colon, tkIdentifier, tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('function(a:s)', 14,
[tkIdentifier, tkSymbol, tkSpace, tkKey,
TK_Bracket, tkIdentifier, TK_Colon, tkIdentifier, TK_Bracket,
TK_Colon, tkIdentifier,
tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('function(a:s) of object ', 15,
[tkIdentifier, tkSymbol, tkSpace, tkKey,
TK_Bracket, tkIdentifier, TK_Colon, tkIdentifier, TK_Bracket,
TK_Colon, tkIdentifier,
tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('record end', 16,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"end"}, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"end"}, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('packed record end', 17,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey, tkSpace, tkKey {"end"}, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey, tkSpace, tkKey {"end"}, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('multi member in class', 18,
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace,tkIdentifier, tkSymbol, // ... ":"
tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
if copy(struct, 1,11) = 'record case' then // procedure not allowed in record-case
exit;
CheckTokensForLine('procedure in class', 19,
[tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol { ( }, tkIdentifier, tkSymbol { : },
tkSpace, tkIdentifier, tkSymbol { ) }, tkSymbol, tkSpace, tkKey {the one and only}, tkSymbol
tkSpace, tkIdentifier, tkSymbol { ) }, tkSymbol, tkSpace, tkModifier {the one and only}, tkSymbol
]);
if struct = 'byte;var' then
@ -1760,46 +1761,46 @@ procedure TTestHighlighterPas.TestContextForDeprecated;
]);
CheckTokensForLine('member in class', 3,
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('array of', 4,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('array [1..2] of', 5,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkSymbol, tkNumber, tkSymbol, tkNumber, tkSymbol,
tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('set of', 6,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('class of', 7,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('procedure ', 8,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('procedure of object ', 9,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('procedure(a:s) ', 10,
[tkIdentifier, tkSymbol, tkSpace, tkKey,
TK_Bracket, tkIdentifier, TK_Colon, tkIdentifier, TK_Bracket,
tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('procedure(a:s) of object ', 11,
[tkIdentifier, tkSymbol, tkSpace, tkKey,
TK_Bracket, tkIdentifier, TK_Colon, tkIdentifier, TK_Bracket,
tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('function', 12,
[tkIdentifier, tkSymbol, tkSpace, tkKey, TK_Colon, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, TK_Colon, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('function of object ', 13,
[tkIdentifier, tkSymbol, tkSpace, tkKey, TK_Colon, tkIdentifier, tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, TK_Colon, tkIdentifier, tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('function(a:s)', 14,
[tkIdentifier, tkSymbol, tkSpace, tkKey,
TK_Bracket, tkIdentifier, TK_Colon, tkIdentifier, TK_Bracket,
TK_Colon, tkIdentifier,
tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('function(a:s) of object ', 15,
[tkIdentifier, tkSymbol, tkSpace, tkKey,
TK_Bracket, tkIdentifier, TK_Colon, tkIdentifier, TK_Bracket,
TK_Colon, tkIdentifier,
tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkKey {"of"}, tkSpace, tkKey, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('record end', 16,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"end"}, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey {"end"}, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('packed record end', 17,
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey, tkSpace, tkKey {"end"}, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey, tkSpace, tkKey {"end"}, tkSpace, tkModifier {the one and only}, tkSymbol]);
if (struct = 'record') or (struct = 'byte;') then
exit;
@ -1821,27 +1822,27 @@ procedure TTestHighlighterPas.TestContextForDeprecated;
]);
CheckTokensForLine('member in class', 3,
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('multi member in class', 4,
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace,tkIdentifier, tkSymbol, // ... ":"
tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('procedure in class', 5,
[tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol { ( }, tkIdentifier, tkSymbol { : },
tkSpace, tkIdentifier, tkSymbol { ) }, tkSymbol, tkSpace, tkKey {the one and only}, tkSymbol
tkSpace, tkIdentifier, tkSymbol { ) }, tkSymbol, tkSpace, tkModifier {the one and only}, tkSymbol
]);
CheckTokensForLine('member in class-sect', 7,
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('multi member in class-sect', 8,
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace,tkIdentifier, tkSymbol, // ... ":"
tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('property in class-sect', 9,
[tkKey, tkSpace, tkIdentifier, tkSymbol { : }, tkSpace, tkIdentifier, tkSpace,
tkKey { read }, tkSpace, tkIdentifier, tkSymbol { ; }, tkSpace, tkKey {the one and only}, tkSymbol
tkKey { read }, tkSpace, tkIdentifier, tkSymbol { ; }, tkSpace, tkModifier {the one and only}, tkSymbol
]);
CheckTokensForLine('procedure in class-sect', 10,
[tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol { ( }, tkIdentifier, tkSymbol { : },
tkSpace, tkIdentifier, tkSymbol { ) }, tkSymbol, tkSpace, tkKey {the one and only}, tkSymbol
tkSpace, tkIdentifier, tkSymbol { ) }, tkSymbol, tkSpace, tkModifier {the one and only}, tkSymbol
]);
end;
@ -1864,20 +1865,20 @@ procedure TTestHighlighterPas.TestContextForDeprecated;
''
]);
CheckTokensForLine('var', 2,
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('multi var', 3,
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace,tkIdentifier, tkSymbol, // ... ":"
tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('type', 5,
[tkIdentifier, tkSpace, tkSymbol, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSpace, tkSymbol, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('type', 6,
[tkIdentifier, tkSpace, tkSymbol, tkKey, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSpace, tkSymbol, tkKey, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('procedure', 7,
[tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol { ( }, tkIdentifier, tkSymbol { : },
tkSpace, tkIdentifier, tkSymbol { ) }, tkSymbol, tkSpace, tkKey {the one and only}, tkSymbol
tkSpace, tkIdentifier, tkSymbol { ) }, tkSymbol, tkSpace, tkModifier {the one and only}, tkSymbol
]);
CheckTokensForLine('var a:procedure DEPRECATED;', 9,
[tkIdentifier, TK_Colon, tkKey, tkSpace, tkKey {the one and only}, TK_Semi]);
[tkIdentifier, TK_Colon, tkKey, tkSpace, tkModifier {the one and only}, TK_Semi]);
PushBaseName('class');
@ -1917,10 +1918,10 @@ procedure TTestHighlighterPas.TestContextForDeprecated;
tkSpace, tkIdentifier, tkSymbol { ) }, tkSymbol
]);
CheckTokensForLine('var in procedure', 3,
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
CheckTokensForLine('multi var in procedure', 4,
[tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace,tkIdentifier, tkSymbol, // ... ":"
tkSpace, tkIdentifier, tkSpace, tkKey {the one and only}, tkSymbol]);
tkSpace, tkIdentifier, tkSpace, tkModifier {the one and only}, tkSymbol]);
@ -1934,7 +1935,7 @@ procedure TTestHighlighterPas.TestContextForDeprecated;
''
]);
CheckTokensForLine('after class declaration', 4,
[tkKey, tkSpace, tkKey, tkSymbol]);
[tkKey, tkSpace, tkModifier , tkSymbol]);
// after unit declaration
@ -1960,7 +1961,7 @@ procedure TTestHighlighterPas.TestContextForDeprecated;
''
]);
CheckTokensForLine('after unit', 0,
[tkKey, tkSpace, tkIdentifier, tkSpace, tkKey, tkSymbol]);
[tkKey, tkSpace, tkIdentifier, tkSpace, tkModifier, tkSymbol]);
CheckTokensForLine('after unit - next line', 1,
[tkKey, tkSpace, tkKey, tkSpace, tkIdentifier, tkSymbol]);
@ -1970,7 +1971,7 @@ procedure TTestHighlighterPas.TestContextForDeprecated;
''
]);
CheckTokensForLine('after dotted unit', 0,
[tkKey, tkSpace, tkIdentifier, tkSymbol, tkIdentifier, tkSpace, tkKey, tkSymbol]);
[tkKey, tkSpace, tkIdentifier, tkSymbol, tkIdentifier, tkSpace, tkModifier, tkSymbol]);
CheckTokensForLine('after unit - next line', 1,
[tkKey, tkSpace, tkKey, tkSpace, tkIdentifier, tkSymbol]);
@ -2159,15 +2160,15 @@ begin
if ty[1] = ' ' then begin
case cmod of
0: CheckTokensForLine('TFoo=class', 2, [ tkIdentifier, tkSymbol, tkSpace, tkKey ]);
1: CheckTokensForLine('TFoo=class', 2, [ tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey, tkSpace ]);
2: CheckTokensForLine('TFoo=class', 2, [ tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkKey, tkSpace, tkKey ]);
1: CheckTokensForLine('TFoo=class', 2, [ tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkModifier, tkSpace ]);
2: CheckTokensForLine('TFoo=class', 2, [ tkIdentifier, tkSymbol, tkSpace, tkKey, tkSpace, tkModifier, tkSpace, tkModifier]);
end;
end
else begin
case cmod of
0: CheckTokensForLine('TFoo=class', 2, [ tkIdentifier, tkSymbol, tkKey, tkSpace, tkKey ]);
1: CheckTokensForLine('TFoo=class', 2, [ tkIdentifier, tkSymbol, tkKey, tkSpace, tkKey, tkSpace, tkKey, tkSpace ]);
2: CheckTokensForLine('TFoo=class', 2, [ tkIdentifier, tkSymbol, tkKey, tkSpace, tkKey, tkSpace, tkKey, tkSpace, tkKey ]);
1: CheckTokensForLine('TFoo=class', 2, [ tkIdentifier, tkSymbol, tkKey, tkSpace, tkKey, tkSpace, tkModifier, tkSpace ]);
2: CheckTokensForLine('TFoo=class', 2, [ tkIdentifier, tkSymbol, tkKey, tkSpace, tkKey, tkSpace, tkModifier, tkSpace, tkModifier]);
end;
end;
@ -2255,14 +2256,14 @@ begin
CheckTokensForLine('class declaration"', 2,
[ tkIdentifier, tkSpace, tkSymbol, tkSpace,
tkKey {class}, tkSpace,
tkKey {sealed}, tkSpace, tkKey {abstract}
tkModifier {sealed}, tkSpace, tkModifier {abstract}
]);
CheckTokensForLine('var in class "', 3,
[ tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol,
tkSpace, tkIdentifier, tkSymbol
]);
CheckTokensForLine('procedure in class "', 4,
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkSpace, tkKey, tkSymbol ]);
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkSpace, tkModifier, tkSymbol ]);
@ -2281,14 +2282,14 @@ begin
CheckTokensForLine('class declaration"', 2,
[ tkIdentifier, tkSpace, tkSymbol, tkSpace,
tkKey {class}, tkSpace, tkComment, tkSpace,
tkKey {sealed}, tkSpace, tkKey {abstract}
tkModifier {sealed}, tkSpace, tkModifier {abstract}
]);
CheckTokensForLine('var in class "', 3,
[ tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol,
tkSpace, tkIdentifier, tkSymbol
]);
CheckTokensForLine('procedure in class "', 4,
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkSpace, tkKey, tkSymbol ]);
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkSpace, tkModifier, tkSymbol ]);
@ -2310,14 +2311,14 @@ begin
tkKey {class}, tkSpace, tkComment
]);
CheckTokensForLine('class declaration"', 3,
[ tkSpace, tkKey {sealed}, tkSpace, tkKey {abstract}
[ tkSpace, tkModifier {sealed}, tkSpace, tkModifier {abstract}
]);
CheckTokensForLine('var in class "', 4,
[ tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol,
tkSpace, tkIdentifier, tkSymbol
]);
CheckTokensForLine('procedure in class "', 5,
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkSpace, tkKey, tkSymbol ]);
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkSpace, tkModifier, tkSymbol ]);
@ -2337,15 +2338,15 @@ begin
CheckTokensForLine('class declaration"', 2,
[ tkIdentifier, tkSpace, tkSymbol, tkSpace,
tkKey {class}, tkSymbol, tkIdentifier, tkSymbol, tkSpace,
tkKey {sealed}, tkSpace,
tkKey {abstract}
tkModifier {sealed}, tkSpace,
tkModifier {abstract}
]);
CheckTokensForLine('var in class "', 3,
[ tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol,
tkSpace, tkIdentifier, tkSymbol
]);
CheckTokensForLine('procedure in class "', 4,
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkSpace, tkKey, tkSymbol ]);
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkSpace, tkModifier, tkSymbol ]);
end;
end;
@ -2386,7 +2387,7 @@ begin
tkSpace, tkIdentifier, tkSymbol
]);
CheckTokensForLine('procedure in class "', 4,
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkSpace, tkKey, tkSymbol ]);
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkSpace, tkModifier, tkSymbol ]);
CheckTokensForLine('end', 5,
[ tkKey, tkSymbol ]);
CheckTokensForLine('class declaration"', 6,
@ -2422,7 +2423,7 @@ begin
tkSpace, tkIdentifier, tkSymbol
]);
CheckTokensForLine('procedure in class "', 4,
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkSpace, tkKey, tkSymbol ]);
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkSpace, tkModifier, tkSymbol ]);
CheckTokensForLine('class section', 7,
[ tkKey ]);
end;
@ -2442,7 +2443,7 @@ procedure TTestHighlighterPas.TestContextForTypeHelper;
tkKey {type}, tkSpace, tkKey {helper}, tkSpace, tkKey {for}, tkSpace, tkIdentifier
]);
CheckTokensForLine('procedure in helper', 6,
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkSpace, tkKey, tkSymbol ]);
[ tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkSpace, tkModifier, tkSymbol ]);
CheckTokensForLine('uniq type', 8,
[ tkIdentifier, tkSpace, tkSymbol, tkSpace,
tkKey {type}, tkSpace, tkIdentifier, tkSymbol
@ -2754,13 +2755,13 @@ begin
CheckTokensForLine('Tfoo=class(static)', 3,
[tkIdentifier, tkSymbol, tkKey,tkSymbol, tkIdentifier, tkSymbol]);
CheckTokensForLine('fields', 4,
[tkSpace, tkIdentifier, tkSymbol, tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace, tkKey, tkSymbol]);
[tkSpace, tkIdentifier, tkSymbol, tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace, tkModifier, tkSymbol]);
CheckTokensForLine('fields 2', 5,
[tkSpace, tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace, tkKey, tkSymbol]);
[tkSpace, tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace, tkModifier, tkSymbol]);
CheckTokensForLine('function', 6,
[tkSpace, tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkIdentifier, tkSymbol, tkIdentifier, tkSymbol,
tkSymbol, tkSpace, tkIdentifier, tkSymbol, // : #32 static ;
tkSpace, tkKey, tkSymbol // #32 static ;
tkSpace, tkModifier, tkSymbol // #32 static ;
]);
CheckTokensForLine('property', 7,
[tkSpace, tkKey, tkSpace, tkIdentifier, tkSymbol, tkIdentifier, tkSymbol, tkIdentifier, tkSymbol,
@ -2770,13 +2771,13 @@ begin
tkSymbol // ;
]);
CheckTokensForLine('pup fields', 9,
[tkSpace, tkIdentifier, tkSymbol, tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace, tkKey, tkSymbol]);
[tkSpace, tkIdentifier, tkSymbol, tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace, tkModifier, tkSymbol]);
CheckTokensForLine('pup fields 2', 10,
[tkSpace, tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace, tkKey, tkSymbol]);
[tkSpace, tkIdentifier, tkSymbol, tkSpace, tkIdentifier, tkSymbol, tkSpace, tkModifier, tkSymbol]);
CheckTokensForLine('pup function', 11,
[tkSpace, tkKey, tkSpace, tkIdentifier + FAttrProcName, tkSymbol, tkIdentifier, tkSymbol, tkIdentifier, tkSymbol,
tkSymbol, tkSpace, tkIdentifier, tkSymbol, // : #32 static ;
tkSpace, tkKey, tkSymbol // #32 static ;
tkSpace, tkModifier, tkSymbol // #32 static ;
]);
CheckTokensForLine('pup property', 12,
[tkSpace, tkKey, tkSpace, tkIdentifier, tkSymbol, tkIdentifier, tkSymbol, tkIdentifier, tkSymbol,