Skip to content

Commit b145725

Browse files
lmajanolmajano
committed
Merge branch 'development'
2 parents ef3be05 + 856f3a3 commit b145725

File tree

7 files changed

+334
-126
lines changed

7 files changed

+334
-126
lines changed

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
uses: softprops/action-gh-release@v2
152152
with:
153153
tag_name: v${{ env.VERSION }}
154-
name: BoxLang TextMate Bundle v${{ env.VERSION }}
154+
name: v${{ env.VERSION }}
155155
body_path: changelog.md
156156
files: |
157157
build/artifacts/boxlang-tmbundle-${{ env.VERSION }}.zip

‎Syntaxes/boxlang-template.tmLanguage‎

Lines changed: 100 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
<key>include</key>
1919
<string>#comments</string>
2020
</dict>
21-
<dict>
22-
<key>include</key>
23-
<string>#bx-script</string>
24-
</dict>
2521
<dict>
2622
<key>include</key>
2723
<string>#bx-components</string>
@@ -147,35 +143,15 @@
147143
<array>
148144
<dict>
149145
<key>include</key>
150-
<string>#bx-output</string>
151-
</dict>
152-
<dict>
153-
<key>include</key>
154-
<string>#bx-if</string>
155-
</dict>
156-
<dict>
157-
<key>include</key>
158-
<string>#bx-switch</string>
159-
</dict>
160-
<dict>
161-
<key>include</key>
162-
<string>#bx-try</string>
163-
</dict>
164-
<dict>
165-
<key>include</key>
166-
<string>#bx-while</string>
167-
</dict>
168-
<dict>
169-
<key>include</key>
170-
<string>#bx-function</string>
146+
<string>#bx-generic</string>
171147
</dict>
172148
<dict>
173149
<key>include</key>
174150
<string>#bx-self-closing</string>
175151
</dict>
176152
<dict>
177153
<key>include</key>
178-
<string>#bx-generic</string>
154+
<string>#bx-closing</string>
179155
</dict>
180156
</array>
181157
</dict>
@@ -949,46 +925,7 @@
949925
<key>name</key>
950926
<string>meta.tag.self-closing.boxlang</string>
951927
<key>match</key>
952-
<string>(&lt;)(bx:(set|return|break|continue|include|rethrow|throw))(\s[^&gt;]*)?+(/?&gt;)</string>
953-
<key>captures</key>
954-
<dict>
955-
<key>1</key>
956-
<dict>
957-
<key>name</key>
958-
<string>punctuation.definition.tag.begin.boxlang</string>
959-
</dict>
960-
<key>2</key>
961-
<dict>
962-
<key>name</key>
963-
<string>entity.name.tag.boxlang</string>
964-
</dict>
965-
<key>3</key>
966-
<dict>
967-
<key>name</key>
968-
<string>entity.name.tag.boxlang</string>
969-
</dict>
970-
<key>4</key>
971-
<dict>
972-
<key>patterns</key>
973-
<array>
974-
<dict>
975-
<key>include</key>
976-
<string>#tag-attributes</string>
977-
</dict>
978-
</array>
979-
</dict>
980-
<key>5</key>
981-
<dict>
982-
<key>name</key>
983-
<string>punctuation.definition.tag.end.boxlang</string>
984-
</dict>
985-
</dict>
986-
</dict>
987-
<dict>
988-
<key>name</key>
989-
<string>meta.tag.self-closing.boxlang</string>
990-
<key>match</key>
991-
<string>(&lt;)(bx:(set|return|break|continue|include|rethrow|throw))(\s[^&gt;]*)?+(&gt;)</string>
928+
<string>(&lt;)(bx:([a-zA-Z_][a-zA-Z0-9_\-]*))(\s[^&gt;]*)?+(/&gt;)</string>
992929
<key>captures</key>
993930
<dict>
994931
<key>1</key>
@@ -1072,7 +1009,7 @@
10721009
<key>name</key>
10731010
<string>meta.tag.generic.boxlang</string>
10741011
<key>begin</key>
1075-
<string>(&lt;)(bx:([a-zA-Z_][a-zA-Z0-9_\-]*))(\s[^&gt;]*)?+(&gt;)</string>
1012+
<string>(&lt;)(bx:([a-zA-Z_][a-zA-Z0-9_\-]*))(?=\s|&gt;)</string>
10761013
<key>beginCaptures</key>
10771014
<dict>
10781015
<key>1</key>
@@ -1090,21 +1027,6 @@
10901027
<key>name</key>
10911028
<string>entity.name.tag.boxlang</string>
10921029
</dict>
1093-
<key>4</key>
1094-
<dict>
1095-
<key>patterns</key>
1096-
<array>
1097-
<dict>
1098-
<key>include</key>
1099-
<string>#tag-attributes</string>
1100-
</dict>
1101-
</array>
1102-
</dict>
1103-
<key>5</key>
1104-
<dict>
1105-
<key>name</key>
1106-
<string>punctuation.definition.tag.end.boxlang</string>
1107-
</dict>
11081030
</dict>
11091031
<key>end</key>
11101032
<string>(&lt;/)\s*(bx:[a-zA-Z_][a-zA-Z0-9_\-]*)\s*(&gt;)</string>
@@ -1128,36 +1050,21 @@
11281050
</dict>
11291051
<key>patterns</key>
11301052
<array>
1131-
<dict>
1132-
<key>include</key>
1133-
<string>$base</string>
1134-
</dict>
1135-
</array>
1136-
</dict>
1137-
<dict>
1138-
<key>name</key>
1139-
<string>meta.tag.self-closing.generic.boxlang</string>
1140-
<key>match</key>
1141-
<string>(&lt;)(bx:([a-zA-Z_][a-zA-Z0-9_\-]*))(\s[^&gt;]*)?+(/?&gt;)</string>
1142-
<key>captures</key>
1143-
<dict>
1144-
<key>1</key>
1145-
<dict>
1146-
<key>name</key>
1147-
<string>punctuation.definition.tag.begin.boxlang</string>
1148-
</dict>
1149-
<key>2</key>
1150-
<dict>
1151-
<key>name</key>
1152-
<string>entity.name.tag.boxlang</string>
1153-
</dict>
1154-
<key>3</key>
11551053
<dict>
11561054
<key>name</key>
1157-
<string>entity.name.tag.boxlang</string>
1158-
</dict>
1159-
<key>4</key>
1160-
<dict>
1055+
<string>meta.tag.generic.opening.boxlang</string>
1056+
<key>begin</key>
1057+
<string>\G</string>
1058+
<key>end</key>
1059+
<string>(&gt;)</string>
1060+
<key>endCaptures</key>
1061+
<dict>
1062+
<key>1</key>
1063+
<dict>
1064+
<key>name</key>
1065+
<string>punctuation.definition.tag.end.boxlang</string>
1066+
</dict>
1067+
</dict>
11611068
<key>patterns</key>
11621069
<array>
11631070
<dict>
@@ -1166,12 +1073,11 @@
11661073
</dict>
11671074
</array>
11681075
</dict>
1169-
<key>5</key>
11701076
<dict>
1171-
<key>name</key>
1172-
<string>punctuation.definition.tag.end.boxlang</string>
1077+
<key>include</key>
1078+
<string>$base</string>
11731079
</dict>
1174-
</dict>
1080+
</array>
11751081
</dict>
11761082
</array>
11771083
</dict>
@@ -1742,6 +1648,86 @@
17421648
</dict>
17431649
</array>
17441650
</dict>
1651+
<key>bx-no-body</key>
1652+
<dict>
1653+
<key>patterns</key>
1654+
<array>
1655+
<dict>
1656+
<key>name</key>
1657+
<string>meta.tag.no-body.boxlang</string>
1658+
<key>match</key>
1659+
<string>(&lt;)(bx:([a-zA-Z_][a-zA-Z0-9_\-]*))(\s[^&gt;]*)?+(&gt;)(?!\s*&lt;/bx:)</string>
1660+
<key>captures</key>
1661+
<dict>
1662+
<key>1</key>
1663+
<dict>
1664+
<key>name</key>
1665+
<string>punctuation.definition.tag.begin.boxlang</string>
1666+
</dict>
1667+
<key>2</key>
1668+
<dict>
1669+
<key>name</key>
1670+
<string>entity.name.tag.boxlang</string>
1671+
</dict>
1672+
<key>3</key>
1673+
<dict>
1674+
<key>name</key>
1675+
<string>entity.name.tag.boxlang</string>
1676+
</dict>
1677+
<key>4</key>
1678+
<dict>
1679+
<key>patterns</key>
1680+
<array>
1681+
<dict>
1682+
<key>include</key>
1683+
<string>#tag-attributes</string>
1684+
</dict>
1685+
</array>
1686+
</dict>
1687+
<key>5</key>
1688+
<dict>
1689+
<key>name</key>
1690+
<string>punctuation.definition.tag.end.boxlang</string>
1691+
</dict>
1692+
</dict>
1693+
</dict>
1694+
</array>
1695+
</dict>
1696+
<key>bx-closing</key>
1697+
<dict>
1698+
<key>patterns</key>
1699+
<array>
1700+
<dict>
1701+
<key>name</key>
1702+
<string>meta.tag.closing.boxlang</string>
1703+
<key>match</key>
1704+
<string>(&lt;/)\s*(bx:([a-zA-Z_][a-zA-Z0-9_\-]*))\s*(&gt;)</string>
1705+
<key>captures</key>
1706+
<dict>
1707+
<key>1</key>
1708+
<dict>
1709+
<key>name</key>
1710+
<string>punctuation.definition.tag.begin.boxlang</string>
1711+
</dict>
1712+
<key>2</key>
1713+
<dict>
1714+
<key>name</key>
1715+
<string>entity.name.tag.boxlang</string>
1716+
</dict>
1717+
<key>3</key>
1718+
<dict>
1719+
<key>name</key>
1720+
<string>entity.name.tag.boxlang</string>
1721+
</dict>
1722+
<key>4</key>
1723+
<dict>
1724+
<key>name</key>
1725+
<string>punctuation.definition.tag.end.boxlang</string>
1726+
</dict>
1727+
</dict>
1728+
</dict>
1729+
</array>
1730+
</dict>
17451731
</dict>
17461732
</dict>
17471733
</plist>

‎Themes/BoxLang Dark.tmTheme‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,77 @@
268268
</dict>
269269
</dict>
270270

271+
<!-- BoxLang Tag Punctuation -->
272+
<dict>
273+
<key>name</key>
274+
<string>BoxLang Tag Punctuation</string>
275+
<key>scope</key>
276+
<string>punctuation.definition.tag.begin.boxlang, punctuation.definition.tag.end.boxlang</string>
277+
<key>settings</key>
278+
<dict>
279+
<key>foreground</key>
280+
<string>#00E699</string>
281+
<key>fontStyle</key>
282+
<string>bold</string>
283+
</dict>
284+
</dict>
285+
286+
<!-- BoxLang Attributes -->
287+
<dict>
288+
<key>name</key>
289+
<string>BoxLang Attributes</string>
290+
<key>scope</key>
291+
<string>entity.other.attribute-name.boxlang</string>
292+
<key>settings</key>
293+
<dict>
294+
<key>foreground</key>
295+
<string>#80CBC4</string>
296+
<key>fontStyle</key>
297+
<string>italic</string>
298+
</dict>
299+
</dict>
300+
301+
<!-- BoxLang Attribute Values -->
302+
<dict>
303+
<key>name</key>
304+
<string>BoxLang Attribute Values</string>
305+
<key>scope</key>
306+
<string>string.quoted.double.boxlang, string.quoted.single.boxlang, string.unquoted.boxlang</string>
307+
<key>settings</key>
308+
<dict>
309+
<key>foreground</key>
310+
<string>#4DDBFF</string>
311+
</dict>
312+
</dict>
313+
314+
<!-- BoxLang Interpolation -->
315+
<dict>
316+
<key>name</key>
317+
<string>BoxLang Interpolation</string>
318+
<key>scope</key>
319+
<string>punctuation.definition.embedded.begin.boxlang, punctuation.definition.embedded.end.boxlang</string>
320+
<key>settings</key>
321+
<dict>
322+
<key>foreground</key>
323+
<string>#00D4E6</string>
324+
<key>fontStyle</key>
325+
<string>bold</string>
326+
</dict>
327+
</dict>
328+
329+
<!-- BoxLang Embedded Code -->
330+
<dict>
331+
<key>name</key>
332+
<string>BoxLang Embedded Code</string>
333+
<key>scope</key>
334+
<string>meta.embedded.line.boxlang, meta.embedded.block.boxlang.script</string>
335+
<key>settings</key>
336+
<dict>
337+
<key>background</key>
338+
<string>#0A2E1F</string>
339+
</dict>
340+
</dict>
341+
271342
<!-- HTML Tags -->
272343
<dict>
273344
<key>name</key>

0 commit comments

Comments
 (0)