6502/65816.tmbundle
1
0
Fork 0
mirror of https://github.com/ksherlock/65816.tmbundle.git synced 2024-11-26 08:49:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:ksherlock/65816.tmbundle

Browse Source
This commit is contained in:
Kelvin Sherlock 2016-02-12 14:00:35 -05:00
commit d1ece35946
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Preferences/Merlin Folding.tmPreferences
View File

@ -11,7 +11,7 @@
<key>foldingStartMarker</key> <key>foldingStartMarker</key>
<string>\b(?i:DUM|DO|IF|MAC|LUP)\b</string> <string>\b(?i:DUM|DO|IF|MAC|LUP)\b</string>
<key>foldingStopMarker</key> <key>foldingStopMarker</key>
<string>\b(?i:DEND|FIN)\b|&lt;&lt;&lt;|--\^</string> <string>\b(?i:DEND|FIN|EOM)\b|&lt;&lt;&lt;|--\^</string>
</dict> </dict>
<key>uuid</key> <key>uuid</key>
<string>9DDC3C1F-C4A9-4888-BFBA-1CFF7448AC47</string> <string>9DDC3C1F-C4A9-4888-BFBA-1CFF7448AC47</string>

14
Syntaxes/Merlin.tmLanguage
View File

@ -6,8 +6,6 @@
<array> <array>
<string>S</string> <string>S</string>
</array> </array>
<key>isDisabled</key>
<false/>
<key>name</key> <key>name</key>
<string>Merlin</string> <string>Merlin</string>
<key>patterns</key> <key>patterns</key>
@ -63,10 +61,8 @@
<string>string.quoted.double</string> <string>string.quoted.double</string>
</dict> </dict>
<dict> <dict>
<key>begin</key> <key>match</key>
<string>'</string> <string>'.*'</string>
<key>end</key>
<string>'</string>
<key>name</key> <key>name</key>
<string>string.quoted.single</string> <string>string.quoted.single</string>
</dict> </dict>
@ -78,13 +74,13 @@
</dict> </dict>
<dict> <dict>
<key>match</key> <key>match</key>
<string>;.*</string> <string>(?&lt;=[ \t])(;.*)</string>
<key>name</key> <key>name</key>
<string>comment.line</string> <string>comment.line</string>
</dict> </dict>
<dict> <dict>
<key>match</key> <key>match</key>
<string>^][0-~]*\b</string> <string>][0-~]*\b</string>
<key>name</key> <key>name</key>
<string>entity.name.label.variable</string> <string>entity.name.label.variable</string>
</dict> </dict>
@ -361,7 +357,7 @@
</dict> </dict>
<dict> <dict>
<key>match</key> <key>match</key>
<string>\b(?i:MAC)\b|&lt;&lt;&lt;</string> <string>\b(?i:MAC|EOM)\b|&lt;&lt;&lt;</string>
<key>name</key> <key>name</key>
<string>keyword.directive.macro</string> <string>keyword.directive.macro</string>
</dict> </dict>