Skip to content

Commit 3f8f4b2

Browse files
committed
started changing Ids so Items and Entities can have builtin data
1 parent c1d929a commit 3f8f4b2

File tree

4 files changed

+78
-67
lines changed

4 files changed

+78
-67
lines changed

syntax/mcfunction/data/Difficulty

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
peaceful
2+
easy
3+
normal
4+
hard

syntax/mcfunction/data/Gamemode

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
survival
2+
creative
3+
adventure
4+
spectator

syntax/mcfunction/data/Slot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
armor\.(chest|feet|head|legs)
2-
container\.([1-4]?d|5[0-3])
2+
container\.([1-4]?\d|5[0-3])
33
(inventory|enderchest)\.(1?d|2[0-6])
44
horse\.(armor|saddle|chest|d|1[0-5])
55
hotbar\.[0-8]

syntax/mcfunction/mcfunction.vim

Lines changed: 69 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ syn match mcFloat contained /-\?\(\d*\.\)\?\d\+/
154154

155155
hi def link mcUInt mcInt
156156
hi def link mcUIntE6 mcInt
157-
hi def link mcUInt6 mcInt
157+
hi def link mcUInt6i mcInt
158158
hi def link mcUInt8 mcInt
159159
hi def link mcUFloat mcFloat
160160
hi def link mcInt mcValue
@@ -181,12 +181,15 @@ hi def link mcDoubleSpace mcBadWhitespace
181181
syn match mcOptionalSlash /^\/\?/ nextgroup=mcCommand
182182
hi def link mcOptionalSlash mcCommand
183183

184+
" Errors
184185
syn match mcBadWhitespace /\t/
185186
syn match mcBadDecimal /\.\ze[^.]/ contained
186187
syn match mcFourDots /\.\{4,}/ contained containedin=ALLBUT,mcChatMessage
188+
syn match mcTheRestIsBad /\S.*/ contained
187189
hi def link mcBadDecimal mcError
188190
hi def link mcFourDots mcError
189191
hi def link mcBadWhitespace mcError
192+
hi def link mcTheRestIsBad mcError
190193

191194
syn sync minlines=1
192195

@@ -259,9 +262,12 @@ function! s:addInstance(type,group,nextgroup)
259262
execute 'syn cluster mcNBT add=mcNBTTag'.a:group
260263
execute 'syn match mcNBTPad'.a:group '/\ze\_[ ]/ skipwhite contained nextgroup=mcDoubleSpace,'.a:nextgroup
261264
elseif a:type=~ 'Block$'
262-
execute 'syn match mc'.a:type.a:group '/#\?[[:alnum:]_:]\+/ contained contains=mcSimple'.a:type 'skipwhite nextgroup=mcDoubleSpace,mcBadBlockWhitespace,mcBlockStateB'.a:group.',mcNBTTagBlock'.a:group.','.a:nextgroup
263-
call s:addInstance('BlockState','B'.a:group,a:nextgroup.',mcBadBlockWhitespace,mcNBTTagBlock'.a:group)
265+
execute 'syn match mc'.a:type.a:group '/#\?[[:alnum:]_:]\+/ contained contains=mcSimple'.a:type 'skipwhite nextgroup=mcDoubleSpace,mcBadBlockWhitespace,mcBlockState'.a:group.',mcNBTTagBlock'.a:group.','.a:nextgroup
266+
call s:addInstance('BlockState',a:group,a:nextgroup.',mcBadBlockWhitespace,mcNBTTagBlock'.a:group)
264267
call s:addInstance('NBTTag','Block'.a:group,a:nextgroup)
268+
elseif a:type=~ 'Item$'
269+
execute 'syn match mc'.a:type.a:group '/#\?[[:alnum:]_:]\+/ contained contains=mcSimple'.a:type 'skipwhite nextgroup=mcDoubleSpace,mcBadBlockWhitespace,mcNBTTagItem'.a:group.','.a:nextgroup
270+
call s:addInstance('NBTTag','Item'.a:group,a:nextgroup)
265271
elseif a:nextgroup == ""
266272
execute 'syn match mc'.a:type.a:group '/[^ =,\t\r\]\n]\+/ contained contains=mc'.a:type
267273
else
@@ -347,7 +353,7 @@ syn keyword mcBossbarKeyword contained
347353
syn keyword mcBossbarKeyword contained skipwhite nextgroup=mcDoubleSpace,mcNsBossbarId remove
348354

349355
" Bossbar set
350-
syn keyword mcBossbarKeyword contained skipwhite nextgroup=mcDoubleSpace,mcBossbarIdSet set
356+
syn keyword mcBossbarKeyword contained skipwhite nextgroup=mcDoubleSpace,mcNsBossbarIdSet set
351357
call s:addInstance('NsBossbarId','Set','mcBossbarSetKeyword')
352358

353359
syn keyword mcBossbarSetKeyword contained skipwhite nextgroup=mcDoubleSpace,mcBossbarSetColor color
@@ -430,10 +436,10 @@ call s:addInstance('NBTPath',"DataModify","mcDataModifyHow")
430436

431437
syn keyword mcDataModifyHow contained skipwhite nextgroup=mcDoubleSpace,mcDataModifySource append merge prepend set
432438
syn keyword mcDataModifySource contained skipwhite nextgroup=mcDoubleSpace,@mcNBTValue value
433-
syn keyword mcDataModifySource contained skipwhite nextgroup=mcDoubleSpace,mcDataKeywordRemove from
439+
syn keyword mcDataModifySource contained skipwhite nextgroup=mcDoubleSpace,mcEBSDataRemove from
434440

435-
syn keyword mcDataModifyHow contained skipwhite nextgroup=mcDoubleSpace,mcUINTDataModifyIndex insert
436-
call s:addInstance('UInt', 'DataModifyInder', 'mcDataModifySource')
441+
syn keyword mcDataModifyHow contained skipwhite nextgroup=mcDoubleSpace,mcUIntDataModifyIndex insert
442+
call s:addInstance('UInt', 'DataModifyIndex', 'mcDataModifySource')
437443
endif
438444

439445
" Data remove
@@ -469,18 +475,17 @@ syn keyword mcDatapackListKeyword contained
469475

470476
hi def link mcDatapackEnableKeyword mcKeyword
471477
hi def link mcDatapackListKeyword mcKeyword
478+
hi def link mcDatapackKeyword mcKeyword
472479

473-
hi def link mcDatapackNameEnable mcId
474-
hi def link mcDatapackNameEnableRel mcId
480+
hi def link mcDatapackNameEnable mcDatapackName
481+
hi def link mcDatapackNameEnableRel mcDatapackName
482+
hi def link mcDatapackName mcId
475483

476484
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
477485
" Difficulty
478486
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
479487
syn keyword mcCommand difficulty contained skipwhite nextgroup=mcDoubleSpace,mcDifficulty
480488

481-
syn keyword mcDifficulty contained peaceful easy normal hard
482-
hi def link mcDifficulty mcKeyValue
483-
484489
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
485490
" Effect
486491
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -509,7 +514,7 @@ syn keyword mcCommand enchant contained skipwhite nextgroup=mcDoubleSpace,mcSele
509514
call s:addInstance('Selector',"Enchant", "mcNsEnchantmentEnchant")
510515

511516
call s:addInstance('NsEnchantment','Enchant','mcEnchantLevel')
512-
syn match mcEnchantLevel contained /[1-5]/
517+
syn match mcEnchantLevel contained /[1-5]/ skipwhite nextgroup=mcTheRestIsBad
513518
hi def link mcEnchantLevel mcValue
514519

515520
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -519,7 +524,7 @@ syn keyword mcCommand execute contained skipwhite nextgroup=mcDoubleSpace,mcExec
519524

520525
" Execute align
521526
syn keyword mcExecuteKeyword contained skipwhite nextgroup=mcDoubleSpace,mcExecuteAlignValue align
522-
syn match mcExecuteAlignValue contained skipwhite nextgroup=mcDoubleSpace,mcExecuteKeyword /\v<%(x%([^ x]*x)@!|y%([^ y]*y)@!\|z%([^ z]*z)@!){1,3}>/
527+
syn match mcExecuteAlignValue contained skipwhite nextgroup=mcDoubleSpace,mcExecuteKeyword /\v<%(x%([^ ]*x)@!|y%([^ ]*y)@!|z%([^ ]*z)@!){1,3}>/
523528

524529
" Execute anchored
525530
syn keyword mcExecuteKeyword contained skipwhite nextgroup=mcDoubleSpace,mcExecuteAnchoredValue anchored
@@ -530,21 +535,21 @@ syn keyword mcExecuteKeyword contained skipwhite nextgroup=mcDoubleSp
530535
call s:addInstance('Selector',"Execute", "mcExecuteKeyword")
531536

532537
" Execute facing
533-
syn keyword mcExecuteKeyword contained skipwhite nextgroup=mcDoubleSpace,mcExecuteFacingEntityKeyword,mcCoordinate facing
538+
syn keyword mcExecuteKeyword contained skipwhite nextgroup=mcDoubleSpace,mcExecuteFacingEntityKeyword,mcCoordinateExecute facing
534539
syn keyword mcExecuteFacingEntityKeyword contained skipwhite nextgroup=mcDoubleSpace,mcSelectorExecuteFacing entity
535540
call s:addInstance('Selector', "ExecuteFacing", "mcExecuteAnchoredValue")
536541

537542
" Execute in
538-
syn keyword mcExecuteKeyword contained skipwhite nextgroup=mcDoubleSpace,mcNsDimensionExecute in
543+
syn keyword mcExecuteKeyword contained skipwhite nextgroup=mcDoubleSpace,mcNsDimensionExecuteIn in
539544
call s:addInstance("NsDimension","ExecuteIn","mcExecuteKeyword")
540545

541546
" Execute positioned
542-
syn keyword mcExecuteKeyword contained skipwhite nextgroup=mcDoubleSpace,mcCoordinateExecute,mcExecutePosAs positioned
543-
syn keyword mcExecutePosAs contained skipwhite nextgroup=mcDoubleSpace,mcSelectorExecute as
544-
call s:addInstance('Coordinte',"Execute","mcExecuteKeyword")
547+
syn keyword mcExecuteKeyword contained skipwhite nextgroup=mcDoubleSpace,mcCoordinateExecute,mcExecuteAs positioned
548+
syn keyword mcExecuteAs contained skipwhite nextgroup=mcDoubleSpace,mcSelectorExecute as
549+
call s:addInstance('Coordinate',"Execute","mcExecuteKeyword")
545550

546551
" Execute rotated
547-
syn keyword mcExecuteKeyword contained skipwhite nextgroup=mcDoubleSpace,mcRotationExecute,mcExecuteAsKeyword rotated
552+
syn keyword mcExecuteKeyword contained skipwhite nextgroup=mcDoubleSpace,mcRotationExecute,mcExecuteAs rotated
548553
call s:addInstance('Rotation',"Execute","mcExecuteKeyword")
549554

550555
" Execute run
@@ -559,7 +564,7 @@ syn keyword mcExecuteStoreWhat contained skipwhite nextgroup=mcDoubleSp
559564
call s:mcEBS('ExecuteStore','@mcNBTPathExecuteStore')
560565
call s:addInstance('NBTPath',"ExecuteStore","mcExecuteStoreType")
561566
syn keyword mcExecuteStoreType contained skipwhite nextgroup=mcDoubleSpace,mcFloatExecuteStoreScale byte short int long float double
562-
call s:addInstance('Float','mcExecuteStoreScale','mcExecuteKeyword')
567+
call s:addInstance('Float','ExecuteStoreScale','mcExecuteKeyword')
563568

564569
" bossbar
565570
syn keyword mcExecuteStoreWhere contained skipwhite nextgroup=mcDoubleSpace,mcNsBossbarIdExecuteStore bossbar
@@ -620,6 +625,7 @@ endif
620625
hi def link mcExecuteAsKeyword mcExecuteKeyword
621626

622627
hi def link mcExecuteKeyword mcKeyword
628+
hi def link mcExecuteAs mcKeyword
623629
hi def link mcExecuteCond mcKeyword
624630
hi def link mcExecuteCondData mcKeyword
625631
hi def link mcExecuteCondScoreMatch mcKeyword
@@ -685,11 +691,7 @@ syn keyword mcCommand function contained skipwhite nextgroup=mcDoubleSpace,mcFun
685691
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
686692
syn keyword mcCommand defaultgamemode contained skipwhite nextgroup=mcDoubleSpace,mcGamemode
687693
syn keyword mcCommand gamemode contained skipwhite nextgroup=mcDoubleSpace,mcGamemodeSet
688-
689-
syn keyword mcGamemode contained survival creative adventure spectator
690-
syn keyword mcGamemodeSet contained survival creative adventure spectator skipwhite nextgroup=mcDoubleSpace,mcSelector
691-
hi def link mcGamemodeSet mcGamemode
692-
hi def link mcGamemode mcKeyValue
694+
call s:addInstance('Gamemode','Set','mcSelector')
693695

694696
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
695697
" Gamerule
@@ -731,7 +733,7 @@ hi def link mcHelpCommand mcKeyValue
731733
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
732734
" Kick
733735
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
734-
syn keyword mcCommand kill contained skipwhite nextgroup=mcDoubleSpace,mcSelectorKick
736+
syn keyword mcCommand kick contained skipwhite nextgroup=mcDoubleSpace,mcSelectorKick
735737
call s:addInstance('Selector','Kick','mcChatMessage')
736738

737739
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -780,7 +782,7 @@ syn keyword mcLootTargetKeyword contained skipwhite nextgroup=mc
780782
call s:addInstance('Selector', "Loot", "mcLootSourceKeyword")
781783
syn keyword mcLootTargetKeyword contained skipwhite nextgroup=mcDoubleSpace,mcSelectorBlockLootReplace replace
782784
call s:mcSelectorBlock('LootReplace','mcSlotLoot')
783-
call s:addInstance('Slot','Loot','mcLootCount,mcLootSourceKeyword')
785+
call s:addInstance('Slot','Loot','mcUInt6iLootCount,mcLootSourceKeyword')
784786
call s:addInstance('UInt6i','LootCount','mcLootSourceKeyword')
785787

786788
" Source
@@ -827,7 +829,7 @@ syn keyword mcCommand contained skipwhite nextgroup=mcDoubleSpace,mcNsParticlePa
827829

828830
call s:addInstance('NsParticle', 'Particle','mcCoordinateParticle')
829831
call s:addInstance('Coordinate', 'Particle','mcCoordinate2Particle')
830-
call s:addInstance('Coordinate2', 'Particle','mcParticleSpeed')
832+
call s:addInstance('Coordinate2', 'Particle','mcUFloatParticleSpeed')
831833
call s:addInstance('UFloat','ParticleSpeed','mcUIntParticleCount')
832834
call s:addInstance('UInt','ParticleCount','mcParticleMode')
833835
syn keyword mcParticleMode contained skipwhite nextgroup=mcDoubleSpace,mcSelector force normal
@@ -856,7 +858,7 @@ hi def link mcPlaysoundMinVolume mcUFloat
856858
syn keyword mcCommand contained skipwhite nextgroup=mcDoubleSpace,mcRecipeKeyword recipe
857859

858860
syn keyword mcRecipeKeyword contained skipwhite nextgroup=mcDoubleSpace,mcSelectorRecipe give take
859-
call s:addInstance('Selector', 'Recipe','mcRecipe,mcGlob')
861+
call s:addInstance('Selector', 'Recipe', 'mcRecipe,mcGlob')
860862
hi def link mcRecipeKeyword mcKeyword
861863

862864
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -1375,53 +1377,54 @@ hi def link mcFilterEq mcOp
13751377
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
13761378
" Data Values
13771379
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
1378-
for s:x in split('Advancement AdvancementCriteria Attribute BossbarId CustomCriteria Dimension Effect Enchantment Entity Function Item Slot LocatableStructure Objective Particle Predicate Recipe Sound SoundChannel Storage Structure UUID',' ')
1379-
execute 'syn match mcNs'.s:x '/[^ =,\t\r\n\]]\+/ contained contains=mcNamespace,mc'.s:x
1380-
execute 'syn match mcNamespaced'.s:x '/[^ =,\t\r\n\]]\+/ contained contains=mcNamespace,mc'.s:x
1381-
execute 'hi def link mc'.s:x 'mcId'
1382-
execute 'hi def link mcBuiltin'.s:x 'mcKeyId'
1380+
for s:x in split('Advancement AdvancementCriteria Attribute Block BossbarId CustomCriteria Difficulty Dimension Effect Enchantment Entity Function Gamemode Item Slot LocatableStructure Objective Particle Predicate Recipe Sound SoundChannel Storage Structure UUID',' ')
1381+
let s:simple = ''
1382+
if has_key({'Block':0, 'Item':0, 'Entity':0},s:x)
1383+
let s:simple = 'Simple'
1384+
endif
1385+
1386+
execute 'syn match mc'.s:simple.'Ns'.s:x '/[^ =,\t\r\n\]]\+/ contained contains=mcNamespace,mc'.s:simple.s:x
1387+
execute 'syn match mc'.s:simple.'Namespaced'.s:x '/[^ =,\t\r\n\]]\+/ contained contains=mcNamespace,mc'.s:simple.s:x
13831388
if s:x =~ '\cuuid'
1384-
execute 'syn match mc'.s:x '/\v\x{1,8}-(\x{1,4}-){3}\x{1,12}/ contained contains=mcBuiltin'.s:x
1389+
execute 'syn match mc'.s:simple.s:x '/\v\x{1,8}-(\x{1,4}-){3}\x{1,12}/ contained contains=mcBuiltin'.s:x
13851390
else
1386-
execute 'syn match mc'.s:x '/[^ =,\t\r\n\]]\+/ oneline contained contains=mcBuiltin'.s:x
1391+
execute 'syn match mc'.s:simple.s:x '/[^ =,\t\r\n\]]\+/ contained contains=mcBuiltin'.s:x
13871392
endif
1388-
endfor
1389-
syn match mcSimpleNsBlock contained contains=mcNamespace,mcSimpleBlock /\(\w\+:\)\?\w\+/
1390-
syn match mcSimpleNamespaceBlock contained contains=mcNamespace,mcSimpleBlock /\w\+:\w\+/
1391-
syn match mcSimpleBlock contained contains=mcBuiltinBlock /\w\+/
1392-
1393-
syn match mcSimpleNsTagBlock contained contains=mcNamespace,mcSimpleTagBlock /#\(\w\+:\)\?\w\+/
1394-
syn match mcSimpleNamespaceTagBlock contained contains=mcNamespace,mcSimpleTagBlock /#\w\+:\w\+/
1395-
syn match mcSimpleTagBlock contained contains=mcBuiltinTagBlock /#\w\+/
13961393

1397-
syn match mcSimpleNsTBlock contained contains=mcSimpleNsBlock,mcSimpleNsTagBlock /#\?\(\w\+:\)\?\w\+/
1398-
syn match mcSimpleNamespaceTBlock contained contains=mcSimpleNamespaceBlock,mcSimpleNamespaceTagBlock /#\?\w\+:\w\+/
1399-
syn match mcSimpleTBlock contained contains=mcSimpleBlock,mcSimpleTagBlock /#\?\w\+/
1394+
execute 'hi def link mc'.s:simple.s:x 'mcId'
1395+
execute 'hi def link mcBuiltin'.s:x 'mcKeyId'
1396+
endfor
1397+
"syn match mcSimpleNsBlock contained contains=mcNamespace,mcSimpleBlock /\(\w\+:\)\?\w\+/
1398+
"syn match mcSimpleNamespaceBlock contained contains=mcNamespace,mcSimpleBlock /\w\+:\w\+/
1399+
"syn match mcSimpleBlock contained contains=mcBuiltinBlock /\w\+/
1400+
"
1401+
"syn match mcSimpleNsTagBlock contained contains=mcNamespace,mcSimpleTagBlock /#\(\w\+:\)\?\w\+/
1402+
"syn match mcSimpleNamespaceTagBlock contained contains=mcNamespace,mcSimpleTagBlock /#\w\+:\w\+/
1403+
"syn match mcSimpleTagBlock contained contains=mcBuiltinTagBlock /#\w\+/
1404+
"
1405+
"syn match mcSimpleNsTBlock contained contains=mcSimpleNsBlock,mcSimpleNsTagBlock /#\?\(\w\+:\)\?\w\+/
1406+
"syn match mcSimpleNamespaceTBlock contained contains=mcSimpleNamespaceBlock,mcSimpleNamespaceTagBlock /#\?\w\+:\w\+/
1407+
"syn match mcSimpleTBlock contained contains=mcSimpleBlock,mcSimpleTagBlock /#\?\w\+/
14001408

14011409
syn match mcBadBlockWhitespace contained / \ze[[{]/
14021410

14031411
hi def link mcBadBlockWhitespace mcBadWhitespace
1404-
hi def link mcSimpleTagBlock mcSimpleBlock
1405-
hi def link mcSimpleBlock mcId
1406-
hi def link mcBuiltinBlock mcKeyId
1412+
"hi def link mcSimpleTagBlock mcSimpleBlock
1413+
"hi def link mcSimpleBlock mcId
1414+
"hi def link mcBuiltinBlock mcKeyId
14071415

14081416
"Tags
1409-
for s:x in split('Entity Item',' ')
1410-
execute 'syn match mcNsT'.s:x '/#\?\(\w\+:\)\?\w\+/ contained contains=mcNsTag'.s:x.',mcNs'.s:x
1411-
execute 'syn match mcNsTag'.s:x '/#\(\w\+:\)\?\w\+/ contained contains=mcNamespace,mcBuiltinTag'.s:x
1412-
execute 'syn match mcNamespacedT'.s:x '/#\?\w\+:\w\+/ contained contains=mcNamespacedTag'.s:x.',mcNamespaced'.s:x
1413-
execute 'syn match mcNamespacedTag'.s:x '/#\w\+:\w\+/ contained contains=mcNamespace,mcBuiltinTag'.s:x
1414-
execute 'hi def link mcTag'.s:x 'mcId'
1415-
execute 'hi def link mcNsTag'.s:x 'mcId'
1416-
execute 'hi def link mcNamespacedTag'.s:x 'mcId'
1417+
for s:x in split('Block Entity Item',' ')
1418+
execute 'syn match mcSimpleTag'.s:x '/#\w\+/ contained contains=mcBuiltinTag'.s:x
1419+
execute 'syn match mcSimpleNsTag'.s:x '/#\(\w\+:\)\?\w\+/ contained contains=mcNamespace,mcBuiltinTag'.s:x
1420+
execute 'syn match mcSimpleNamespacedTag'.s:x '/#\w\+:\w\+/ contained contains=mcNamespace,mcBuiltinTag'.s:x
1421+
1422+
execute 'syn match mcSimpleT'.s:x '/#\?\w\+/ contained contains=mcSimpleTag'.s:x.',mcSimple'.s:x
1423+
execute 'syn match mcSimpleNsT'.s:x '/#\?\(\w\+:\)\?\w\+/ contained contains=mcSimpleNsTag'.s:x.',mcSimpleNs'.s:x
1424+
execute 'syn match mcSimpleNamespacedT'.s:x '/#\?\w\+:\w\+/ contained contains=mSimplecNamespacedTag'.s:x.',mcSimpleNamespaced'.s:x
1425+
1426+
execute 'hi def link mcSimpleTag'.s:x 'mcId'
14171427
execute 'hi def link mcBuiltinTag'.s:x 'mcKeyId'
1418-
if s:x =~ '\cblock'
1419-
syn match mcTagBlock contained contains=mcTagBlock /#\w\+/
1420-
syn match mcTBlock contained contains=mcTagBlock,mcBlock /#\?\w\+/
1421-
else
1422-
execute 'syn match mcTag'.s:x '/#\w\+/ oneline contained contains=mcBuiltinTag'.s:x
1423-
execute 'syn match mcT'.s:x '/#\?\w\+/ oneline contained contains=mcTag'.s:x.',mc'.s:x
1424-
endif
14251428
endfor
14261429

14271430
hi def link mcTagBlock mcId

0 commit comments

Comments
 (0)