Skip to content

Commit b745e5c

Browse files
author
johnmuhl
committed
Add standard prefixes to scopes, i.e. 'constant.language.' 'string.' etc.
1 parent 2925bba commit b745e5c

File tree

4 files changed

+113
-91
lines changed

4 files changed

+113
-91
lines changed

‎README

-42
This file was deleted.

‎README.textile

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
h2. Features
2+
3+
* Language grammar
4+
* folding
5+
* highlighting
6+
* @log@ tab completion for setting up logs in NCSA combined format (the same
7+
as Apache's combined log format)
8+
9+
h2. Scopes
10+
11+
* source.nginx
12+
13+
* -module.events-
14+
* -module.http-
15+
* -directive.module.main-
16+
* -directive.module.events-
17+
* -directive.module.http-
18+
* -directive.module.http.upstream-
19+
* -directive.module.http.access-
20+
* -directive.module.http.auth_basic-
21+
* -directive.module.http.autoindex-
22+
* -directive.module.http.browser-
23+
* -directive.module.http.charset-
24+
* -directive.module.http.empty_gif-
25+
* -directive.module.http.fastcgi-
26+
* -directive.module.http.geo-
27+
* -directive.module.http.gzip-
28+
* -directive.module.http.headers-
29+
* -directive.module.http.referer-
30+
* -directive.module.http.limit_zone-
31+
* -directive.module.http.log-
32+
* -directive.module.http.map-
33+
* -directive.module.http.memcached-
34+
* -directive.module.http.proxy-
35+
* -directive.module.http.rewrite-
36+
* -directive.module.http.ssi-
37+
* -directive.module.http.userid-
38+
* -comment-
39+
* -brace-
40+
* -paren-
41+
* -regex-
42+
* -end-

‎Syntaxes/nginx.tmLanguage

+70-46
Original file line numberDiff line numberDiff line change
@@ -24,182 +24,206 @@
2424
</dict>
2525
<dict>
2626
<key>match</key>
27-
<string>\b(events)\b</string>
27+
<string>[0-9]</string>
2828
<key>name</key>
29-
<string>module.events</string>
29+
<string>constant.numeric</string>
3030
</dict>
3131
<dict>
3232
<key>match</key>
33-
<string>\b(http)\b</string>
33+
<string>\{|\}</string>
3434
<key>name</key>
35-
<string>module.http</string>
35+
<string>constant.character.brace</string>
3636
</dict>
3737
<dict>
3838
<key>match</key>
39-
<string>\{|\}</string>
39+
<string>\;</string>
4040
<key>name</key>
41-
<string>brace</string>
41+
<string>constant.character.end</string>
4242
</dict>
4343
<dict>
4444
<key>match</key>
45-
<string>\;</string>
45+
<string>\(|\)</string>
4646
<key>name</key>
47-
<string>end</string>
47+
<string>constant.character.paren</string>
4848
</dict>
4949
<dict>
5050
<key>match</key>
51-
<string>\b(daemon|env|debug_points|error_log|log_not_found|include|lock_file|master_process|pid|ssl_engine|timer_resolution|user|worker_cpu_affinity|worker_priority|worker_processes|worker_rlimit_core|worker_rlimit_nofile|worker_rlimit_sigpending|working_directory)\b</string>
51+
<string>\"</string>
5252
<key>name</key>
53-
<string>directive.module.main</string>
53+
<string>constant.character.quote</string>
5454
</dict>
5555
<dict>
5656
<key>match</key>
57-
<string>\b(accept_mutex|accept_mutex_delay|debug_connection|devpoll_changes|devpoll_events|epoll_events|kqueue_changes|kqueue_events|multi_accept|rtsig_signo|rtsig_overflow_events|rtsig_overfl|ow_testrtsig_overflow_threshold|use|worker_connections)\b</string>
57+
<string>\\.*\ |\~|\~\*|\!\~|\!\~\*</string>
5858
<key>name</key>
59-
<string>directive.module.events</string>
59+
<string>string.regexp</string>
6060
</dict>
6161
<dict>
6262
<key>match</key>
63-
<string>\b(alias|client_body_in_file_only|client_body_buffer_size|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|default_type|error_page|index|internal|keepalive_timeout|large_client_header_buffers|limit_except|limit_rate|listen|location|msie_padding|msie_refresh|optimize_server_names|port_in_redirect|recursive_error_pages|root|satisfy_any|send_timeout|sendfile|server|server_name|server_names_hash_max_size|server_names_hash_bucket_size|tcp_nodelay|tcp_nopush)\b|[^.]\b(types)\b</string>
63+
<string>\"(.*)\"</string>
6464
<key>name</key>
65-
<string>directive.module.http</string>
65+
<string>string.quoted</string>
6666
</dict>
6767
<dict>
6868
<key>match</key>
69-
<string>\b(ip_hash|upstream|server)\b</string>
69+
<string>\'(.*)\'</string>
70+
<key>name</key>
71+
<string>string.quoted</string>
72+
</dict>
73+
<dict>
74+
<key>match</key>
75+
<string>\b(events)\b</string>
76+
<key>name</key>
77+
<string>constant.language.module.events</string>
78+
</dict>
79+
<dict>
80+
<key>match</key>
81+
<string>\b^(http)\b</string>
82+
<key>name</key>
83+
<string>constant.language.module.http</string>
84+
</dict>
85+
<dict>
86+
<key>match</key>
87+
<string>\b(daemon|env|debug_points|error_log|log_not_found|include|lock_file|master_process|pid|ssl_engine|timer_resolution|user|worker_cpu_affinity|worker_priority|worker_processes|worker_rlimit_core|worker_rlimit_nofile|worker_rlimit_sigpending|working_directory)\b</string>
88+
<key>name</key>
89+
<string>constant.language.directive.module.main</string>
90+
</dict>
91+
<dict>
92+
<key>match</key>
93+
<string>\b(accept_mutex|accept_mutex_delay|debug_connection|devpoll_changes|devpoll_events|epoll_events|kqueue_changes|kqueue_events|multi_accept|rtsig_signo|rtsig_overflow_events|rtsig_overflow_test|rtsig_overflow_threshold|use|worker_connections)\b</string>
7094
<key>name</key>
71-
<string>directive.module.http.upstream</string>
95+
<string>constant.language.directive.module.events</string>
96+
</dict>
97+
<dict>
98+
<key>match</key>
99+
<string>\b(alias|client_body_in_file_only|client_body_buffer_size|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|default_type|error_page|index\ |internal|keepalive_timeout|large_client_header_buffers|limit_except|limit_rate|listen|location|msie_padding|msie_refresh|optimize_server_names|port_in_redirect|recursive_error_pages|root|satisfy_any|send_timeout|sendfile|server|server_name|server_names_hash_max_size|server_names_hash_bucket_size|tcp_nodelay|tcp_nopush|types\ )\b</string>
100+
<key>name</key>
101+
<string>constant.language.directive.module.http</string>
72102
</dict>
73103
<dict>
74104
<key>match</key>
75105
<string>\b(allow|deny)\b</string>
76106
<key>name</key>
77-
<string>directive.module.http.access</string>
107+
<string>constant.language.module.http.access</string>
78108
</dict>
79109
<dict>
80110
<key>match</key>
81111
<string>\b(auth_basic|auth_basic_user_file)\b</string>
82112
<key>name</key>
83-
<string>directive.module.http.auth_basic</string>
113+
<string>constant.language.module.http.auth_basic</string>
84114
</dict>
85115
<dict>
86116
<key>match</key>
87117
<string>\b(autoindex|autoindex_exact_size|autoindex_localtime)\b</string>
88118
<key>name</key>
89-
<string>directive.module.http.autoindex</string>
119+
<string>constant.language.module.http.autoindex</string>
90120
</dict>
91121
<dict>
92122
<key>match</key>
93123
<string>\b(ancient_browser|ancient_browser_value|modern_browser|modern_browser_value)\b</string>
94124
<key>name</key>
95-
<string>directive.module.http.browser</string>
125+
<string>constant.language.module.http.browser</string>
96126
</dict>
97127
<dict>
98128
<key>match</key>
99129
<string>\b(charset|charset_map|override_charset|source_charset)\b</string>
100130
<key>name</key>
101-
<string>directive.module.http.charset</string>
131+
<string>constant.language.module.http.charset</string>
102132
</dict>
103133
<dict>
104134
<key>match</key>
105135
<string>\b(empty_gif)\b</string>
106136
<key>name</key>
107-
<string>directive.module.http.empty_gif</string>
137+
<string>constant.language.module.http.empty_gif</string>
108138
</dict>
109139
<dict>
110140
<key>match</key>
111141
<string>\b(fastcgi_index|fastcgi_hide_header|fastcgi_ignore_client_abort|fastcgi_intercept_errors|fastcgi_param|fastcgi_pass|fastcgi_pass_header|fastcgi_read_timeout|fastcgi_redirect_errors|fa|stcgi_storefastcgi_store_access|fastcgi_buffers|fastcgi_buffers_size|fastcgi_temp_path)\b</string>
112142
<key>name</key>
113-
<string>directive.module.http.fastcgi</string>
143+
<string>constant.language.module.http.fastcgi</string>
114144
</dict>
115145
<dict>
116146
<key>match</key>
117147
<string>\b(geo)\b</string>
118148
<key>name</key>
119-
<string>directive.module.http.geo</string>
149+
<string>constant.language.module.http.geo</string>
120150
</dict>
121151
<dict>
122152
<key>match</key>
123153
<string>\b(gzip|gzip_buffers|gzip_comp_level|gzip_disable|gzip_http.version|gzip_min_length|gzip_proxied|gzip_types|gzip_vary)\b</string>
124154
<key>name</key>
125-
<string>directive.module.http.gzip</string>
155+
<string>constant.language.module.http.gzip</string>
126156
</dict>
127157
<dict>
128158
<key>match</key>
129159
<string>\b(add_header|expires|server_tokens)\b</string>
130160
<key>name</key>
131-
<string>directive.module.http.headers</string>
161+
<string>constant.language.module.http.headers</string>
132162
</dict>
133163
<dict>
134164
<key>match</key>
135165
<string>\b(valid_referers)\b</string>
136166
<key>name</key>
137-
<string>directive.module.http.referer</string>
167+
<string>constant.language.module.http.referer</string>
138168
</dict>
139169
<dict>
140170
<key>match</key>
141171
<string>\b(limit_zone|limit_conn)\b</string>
142172
<key>name</key>
143-
<string>directive.module.http.limit_zone</string>
173+
<string>constant.language.module.http.limit_zone</string>
144174
</dict>
145175
<dict>
146176
<key>match</key>
147177
<string>\b(access_log|log_format)\b</string>
148178
<key>name</key>
149-
<string>directive.module.http.log</string>
179+
<string>constant.language.module.http.log</string>
150180
</dict>
151181
<dict>
152182
<key>match</key>
153183
<string>\b(map|map_hash_max_size|map_hash_bucket_size)\b</string>
154184
<key>name</key>
155-
<string>directive.module.http.map</string>
185+
<string>constant.language.module.http.map</string>
156186
</dict>
157187
<dict>
158188
<key>match</key>
159189
<string>\b(memcached_pass|memcached_connect_timeout|memcached_send_timeout|memcached_read_timeout|memcached_buffer_size|memcached_next_upstream)\b</string>
160190
<key>name</key>
161-
<string>directive.module.http.memcached</string>
191+
<string>constant.language.module.http.memcached</string>
162192
</dict>
163193
<dict>
164194
<key>match</key>
165195
<string>\b(proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_connect_timeout|proxy_headers_hash_bucket_size|proxy_headers_hash_max_size|proxy_hide_header|proxy_ign|ore_client_abortproxy_intercept_errors|proxy_max_temp_file_size|proxy_method|proxy_next_upstream|proxy_pass|proxy_pass_header|proxy_pass_request_body|proxy_pass_request_headers|proxy_|redirectproxy_read_timeout|proxy_redirect|proxy_redirect_errors|proxy_send_lowat|proxy_send_timeout|proxy_set_body|proxy_set_header|proxy_store|proxy_store_access|proxy_temp_file_write_size|proxy_t|emp_pathproxy_upstream_fail_timeout|proxy_upstream_max_fails)\b</string>
166196
<key>name</key>
167-
<string>directive.module.http.proxy</string>
197+
<string>constant.language.module.http.proxy</string>
168198
</dict>
169199
<dict>
170200
<key>match</key>
171-
<string>\b(break|if|return|rewrite|set|uninitialized_variable_warn)\b</string>
201+
<string>\b(break|if|return|reqrite|set|uninitialized_variable_warn)\b</string>
172202
<key>name</key>
173-
<string>directive.module.http.rewrite</string>
203+
<string>constant.language.module.http.rewrite</string>
174204
</dict>
175205
<dict>
176206
<key>match</key>
177207
<string>\b(ssi|ssi_silent_errors|ssi_types|ssi_value_length)\b</string>
178208
<key>name</key>
179-
<string>directive.module.http.ssi</string>
209+
<string>constant.language.module.http.ssi</string>
180210
</dict>
181211
<dict>
182212
<key>match</key>
183-
<string>\b(userid|userid_domain|userid_expires|userid_name|userid_p3p|userid_path|userid_service)\b</string>
184-
<key>name</key>
185-
<string>directive.module.http.userid</string>
186-
</dict>
187-
<dict>
188-
<key>match</key>
189-
<string>\(.*\)</string>
213+
<string>\b(ip_hash|upstream|server)\b</string>
190214
<key>name</key>
191-
<string>paren</string>
215+
<string>constant.language.module.http.upstream</string>
192216
</dict>
193217
<dict>
194218
<key>match</key>
195-
<string>\\.*\ |\~|\~\*|\!\~|\!\~\*</string>
219+
<string>\b(userid|userid_domain|userid_expires|userid_name|userid_p3p|userid_path|userid_service)\b</string>
196220
<key>name</key>
197-
<string>regex</string>
221+
<string>constant.language.module.http.userid</string>
198222
</dict>
199223
</array>
200224
<key>scopeName</key>
201225
<string>source.nginx</string>
202226
<key>uuid</key>
203-
<string>41998851-319E-4F6A-A398-31D7F98F84A3</string>
227+
<string>0C04066A-12D2-43CA-8238-00A12CE4C12D</string>
204228
</dict>
205229
</plist>

‎info.plist

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
<key>name</key>
66
<string>nginx</string>
77
<key>ordering</key>
8-
<array>
9-
<string>41998851-319E-4F6A-A398-31D7F98F84A3</string>
10-
</array>
8+
<array/>
119
<key>uuid</key>
1210
<string>D9EBF868-395B-4AB7-8970-0EAECDA961C4</string>
1311
</dict>

0 commit comments

Comments
 (0)