Skip to content

Commit dfec4a4

Browse files
asbjornengeasbjornenge
committed
Various cleanups added to asbjornenge/Docker.tmbundle (by the TM maintainer) and support for the LABEL instruction
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
1 parent ac8cbf4 commit dfec4a4

File tree

1 file changed

+64
-14
lines changed

1 file changed

+64
-14
lines changed

‎contrib/syntax/textmate/Docker.tmbundle/Syntaxes/Dockerfile.tmLanguage‎

Lines changed: 64 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,70 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>name</key>
6-
<string>Dockerfile</string>
75
<key>fileTypes</key>
86
<array>
97
<string>Dockerfile</string>
108
</array>
9+
<key>name</key>
10+
<string>Dockerfile</string>
1111
<key>patterns</key>
1212
<array>
1313
<dict>
14-
<key>match</key>
15-
<string>^\s*(ONBUILD\s+)?(FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|VOLUME|USER|LABEL|WORKDIR|COPY)\s</string>
1614
<key>captures</key>
1715
<dict>
18-
<key>0</key>
16+
<key>1</key>
1917
<dict>
2018
<key>name</key>
2119
<string>keyword.control.dockerfile</string>
2220
</dict>
23-
<key>1</key>
21+
<key>2</key>
2422
<dict>
2523
<key>name</key>
2624
<string>keyword.other.special-method.dockerfile</string>
2725
</dict>
2826
</dict>
27+
<key>match</key>
28+
<string>^\s*(?:(ONBUILD)\s+)?(FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|VOLUME|USER|WORKDIR|COPY|LABEL)\s</string>
2929
</dict>
3030
<dict>
31-
<key>match</key>
32-
<string>^\s*(ONBUILD\s+)?(CMD|ENTRYPOINT)\s</string>
3331
<key>captures</key>
3432
<dict>
35-
<key>0</key>
33+
<key>1</key>
3634
<dict>
3735
<key>name</key>
3836
<string>keyword.operator.dockerfile</string>
3937
</dict>
40-
<key>1</key>
38+
<key>2</key>
4139
<dict>
4240
<key>name</key>
4341
<string>keyword.other.special-method.dockerfile</string>
4442
</dict>
4543
</dict>
44+
<key>match</key>
45+
<string>^\s*(?:(ONBUILD)\s+)?(CMD|ENTRYPOINT)\s</string>
4646
</dict>
4747
<dict>
4848
<key>begin</key>
4949
<string>"</string>
50+
<key>beginCaptures</key>
51+
<dict>
52+
<key>1</key>
53+
<dict>
54+
<key>name</key>
55+
<string>punctuation.definition.string.begin.dockerfile</string>
56+
</dict>
57+
</dict>
5058
<key>end</key>
5159
<string>"</string>
60+
<key>endCaptures</key>
61+
<dict>
62+
<key>1</key>
63+
<dict>
64+
<key>name</key>
65+
<string>punctuation.definition.string.end.dockerfile</string>
66+
</dict>
67+
</dict>
5268
<key>name</key>
5369
<string>string.quoted.double.dockerfile</string>
5470
<key>patterns</key>
@@ -64,8 +80,24 @@
6480
<dict>
6581
<key>begin</key>
6682
<string>'</string>
83+
<key>beginCaptures</key>
84+
<dict>
85+
<key>1</key>
86+
<dict>
87+
<key>name</key>
88+
<string>punctuation.definition.string.begin.dockerfile</string>
89+
</dict>
90+
</dict>
6791
<key>end</key>
6892
<string>'</string>
93+
<key>endCaptures</key>
94+
<dict>
95+
<key>1</key>
96+
<dict>
97+
<key>name</key>
98+
<string>punctuation.definition.string.end.dockerfile</string>
99+
</dict>
100+
</dict>
69101
<key>name</key>
70102
<string>string.quoted.single.dockerfile</string>
71103
<key>patterns</key>
@@ -79,10 +111,28 @@
79111
</array>
80112
</dict>
81113
<dict>
114+
<key>captures</key>
115+
<dict>
116+
<key>1</key>
117+
<dict>
118+
<key>name</key>
119+
<string>punctuation.whitespace.comment.leading.dockerfile</string>
120+
</dict>
121+
<key>2</key>
122+
<dict>
123+
<key>name</key>
124+
<string>comment.line.number-sign.dockerfile</string>
125+
</dict>
126+
<key>3</key>
127+
<dict>
128+
<key>name</key>
129+
<string>punctuation.definition.comment.dockerfile</string>
130+
</dict>
131+
</dict>
132+
<key>comment</key>
133+
<string>comment.line</string>
82134
<key>match</key>
83-
<string>^\s*#.*$</string>
84-
<key>name</key>
85-
<string>comment.block.dockerfile</string>
135+
<string>^(\s*)((#).*$\n?)</string>
86136
</dict>
87137
</array>
88138
<key>scopeName</key>

0 commit comments

Comments
 (0)