From 986e701ca310a54e837e6533abfab7ea1b39b796 Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 14 Sep 2015 10:08:48 -0700 Subject: [PATCH 1/2] [speculatively] improved grammar for nginx + changed handling of string, numeric and other literals + introduced variables references + changed classes/names to somewhat align other grammars --- grammars/nginx.cson | 151 +++++++++++++++++++++++++++++--------------- 1 file changed, 100 insertions(+), 51 deletions(-) diff --git a/grammars/nginx.cson b/grammars/nginx.cson index dbaa553..8b8b423 100644 --- a/grammars/nginx.cson +++ b/grammars/nginx.cson @@ -1,157 +1,206 @@ 'fileTypes': [ - 'conf' + 'conf', + 'nginx' ] 'foldingStartMarker': '\\{\\s*$' 'foldingStopMarker': '^\\s*\\}' 'name': 'nginx' +'scopeName': 'source' 'patterns': [ { - 'match': '\\#.*' - 'name': 'comment' + 'match': '\\#.*$' + 'name': 'comment.line' } { - 'match': '[0-9]' + # this also inludes ip address-like dot separated instant + # also optional letter supported, like '7d' + 'match': '\\b[0-9]+(\\.[0-9]+)*[a-z]?\\b' 'name': 'constant.numeric' } { - 'match': '\\{|\\}' - 'name': 'constant.character.brace' + 'match': '\\{' + 'name': 'punctuation.section.scope.begin' + } + { + 'match': '\\{' + 'name': 'punctuation.section.scope.end' } { 'match': '\\;' - 'name': 'constant.character.end' + 'name': 'punctuation.terminator.end' } { - 'match': '\\(|\\)' - 'name': 'constant.character.paren' + 'match': '\\=' + 'name': 'punctuation.operator.assign' } { - 'match': '\\"' - 'name': 'constant.character.quote' + 'begin': '"' + 'end': '"' + 'name': 'constant.string.quoted' + 'patterns': [ + { + 'match': '\\\\.' + 'name': 'constant.character.escaped' + } + { + 'match': '\\$[a-z0-9_]+' + 'name': 'variable.other.placeholder' + } + ] } { - 'match': '\\\\.*\\ |\\~|\\~\\*|\\!\\~|\\!\\~\\*' - 'name': 'string.regexp' + 'begin': '\'' + 'end': '\'' + 'name': 'constant.string.quoted.single' + 'patterns': [ + { + 'match': '\\\\.' + 'name': 'constant.character.escaped' + } + { + 'match': '\\$[a-z0-9_]+' + 'name': 'variable.other.placeholder' + } + ] } { - 'match': '\\"(.*)\\"' - 'name': 'string.quoted' + 'match': '\\~\\S+' # regexp syntax shold be expanded/refined further + 'name': 'constant.string.regexp' } { - 'match': '\\\'(.*)\\\'' - 'name': 'string.quoted' + 'match': '\\^' + 'name': 'punctuation.operator.negate' } { - 'match': '\\b(events)\\b' - 'name': 'constant.language.module.events' + 'match': '\\$[a-z0-9_]+' + 'name': 'variable.other' } { - 'match': '\\b^(http)\\b' - 'name': 'constant.language.module.http' + 'match': '\\$\\{[^\\}]+\\}' + 'name': 'variable.other' } { - 'match': '\\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' - 'name': 'constant.language.directive.module.main' + 'match': '^\\s*(include)\\b' + 'name': 'keyword.other.include.module.main' + } + { + 'match': '^\\s*(events)\\b' + 'name': 'keyword.other.special-method.module.events' + } + { + 'match': '^\\s*(http)\\b' + 'name': 'keyword.other.special-method.module.http' + } + { + 'match': '^\\s*(server)\\b' + 'name': 'keyword.other.special-method.module.http' + } + { + 'match': '\\b(on|off|yes|no|true|false|auto|default|error|debug|warning)\\b' + 'name': 'constant.literal' + } + { + 'match': '\\b(daemon|env|debug_points|error_log|log_not_found|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' + 'name': 'support.function.directive.module.main' } { 'match': '\\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' - 'name': 'constant.language.directive.module.events' + 'name': 'support.function.directive.module.events' } { - 'match': '\\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|ssl_protocols|ssl_ciphers|ssl_certificate|ssl_certificate_key|ssl_prefer_server_ciphers|ssl_session_cache|ssl_session_timeout|ssl_dhparam|ssl|ssl_buffer_size|ssl_client_certificate|ssl_crl|ssl_ecdh_curve|ssl_password_file|ssl_session_ticket_key|ssl_session_tickets|ssl_stapling|ssl_stapling_file|ssl_stapling_responder|ssl_stapling_verify|ssl_trusted_certificate|ssl_verify_client|ssl_verify_depth|stub_status\\ )\\b' - 'name': 'constant.language.directive.module.http' + 'match': '\\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_name|server_names_hash_max_size|server_names_hash_bucket_size|tcp_nodelay|tcp_nopush|types|ssl_protocols|ssl_ciphers|ssl_certificate|ssl_certificate_key|ssl_prefer_server_ciphers|ssl_session_cache|ssl_session_timeout|ssl_dhparam|ssl|ssl_buffer_size|ssl_client_certificate|ssl_crl|ssl_ecdh_curve|ssl_password_file|ssl_session_ticket_key|ssl_session_tickets|ssl_stapling|ssl_stapling_file|ssl_stapling_responder|ssl_stapling_verify|ssl_trusted_certificate|ssl_verify_client|ssl_verify_depth|stub_status\\ )\\b' + 'name': 'support.function.directive.module.http' } { - 'match': '\\b(aio|alias|chunked_transfer_encoding|client_body_buffer_size|client_body_in_file_only|client_body_in_single_buffer|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|connection_pool_size|default_type|directio|directio_alignment|disable_symlinks|error_page|etag|http|if_modified_since|ignore_invalid_headers|internal|keepalive_disable|keepalive_requests|keepalive_timeout|large_client_header_buffers|limit_except|limit_rate|limit_rate_after|lingering_close|lingering_time|lingering_timeout|listen|location|log_not_found|log_subrequest|max_ranges|merge_slashes|msie_padding|msie_refresh|open_file_cache|open_file_cache_errors|open_file_cache_min_uses|open_file_cache_valid|optimize_server_names|output_buffers|port_in_redirect|postpone_output|read_ahead|recursive_error_pages|request_pool_size|reset_timedout_connection|resolver|resolver_timeout|root|satisfy|satisfy_any|send_lowat|send_timeout|sendfile|sendfile_max_chunk|server|server_name|server_name_in_redirect|server_names_hash_bucket_size|server_names_hash_max_size|server_tokens|tcp_nodelay|tcp_nopush|try_files|types|types_hash_bucket_size|types_hash_max_size|underscores_in_headers|variables_hash_bucket_size|variables_hash_max_size)\\b' - 'name': 'constant.language.module.http.core' + 'match': '\\b(aio|chunked_transfer_encoding|client_body_buffer_size|client_body_in_file_only|client_body_in_single_buffer|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|connection_pool_size|default_type|directio|directio_alignment|disable_symlinks|error_page|etag|if_modified_since|ignore_invalid_headers|internal|keepalive_disable|keepalive_requests|keepalive_timeout|large_client_header_buffers|limit_except|limit_rate|limit_rate_after|lingering_close|lingering_time|lingering_timeout|listen|location|log_not_found|log_subrequest|max_ranges|merge_slashes|msie_padding|msie_refresh|open_file_cache|open_file_cache_errors|open_file_cache_min_uses|open_file_cache_valid|optimize_server_names|output_buffers|port_in_redirect|postpone_output|read_ahead|recursive_error_pages|request_pool_size|reset_timedout_connection|resolver|resolver_timeout|root|satisfy|satisfy_any|send_lowat|send_timeout|sendfile|sendfile_max_chunk|server|server_name|server_name_in_redirect|server_names_hash_bucket_size|server_names_hash_max_size|server_tokens|tcp_nodelay|tcp_nopush|try_files|types|types_hash_bucket_size|types_hash_max_size|underscores_in_headers|variables_hash_bucket_size|variables_hash_max_size)\\b' + 'name': 'support.function.directive.module.http.core' } { 'match': '\\b(allow|deny)\\b' - 'name': 'constant.language.module.http.access' + 'name': 'support.function.directive.module.http.access' } { 'match': '\\b(auth_basic|auth_basic_user_file)\\b' - 'name': 'constant.language.module.http.auth_basic' + 'name': 'support.function.directive.module.http.auth_basic' } { 'match': '\\b(autoindex|autoindex_exact_size|autoindex_localtime|autoindex_format)\\b' - 'name': 'constant.language.module.http.autoindex' + 'name': 'support.function.directive.module.http.autoindex' } { 'match': '\\b(ancient_browser|ancient_browser_value|modern_browser|modern_browser_value)\\b' - 'name': 'constant.language.module.http.browser' + 'name': 'support.function.directive.module.http.browser' } { 'match': '\\b(charset|charset_map|override_charset|source_charset)\\b' - 'name': 'constant.language.module.http.charset' + 'name': 'support.function.directive.module.http.charset' } { 'match': '\\b(empty_gif)\\b' - 'name': 'constant.language.module.http.empty_gif' + 'name': 'support.function.directive.module.http.empty_gif' } { 'match': '\\b(fastcgi_split_path_info|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' - 'name': 'constant.language.module.http.fastcgi' + 'name': 'support.function.directive.module.http.fastcgi' } { 'match': '\\b(geo)\\b' - 'name': 'constant.language.module.http.geo' + 'name': 'support.function.directive.module.http.geo' } { 'match': '\\b(gzip|gzip_buffers|gzip_comp_level|gzip_disable|gzip_http.version|gzip_min_length|gzip_proxied|gzip_types|gzip_vary)\\b' - 'name': 'constant.language.module.http.gzip' + 'name': 'support.function.directive.module.http.gzip' } { 'match': '\\b(gzip_static)\\b' - 'name': 'constant.language.module.http.gzip_static' + 'name': 'support.function.directive.module.http.gzip_static' } { 'match': '\\b(add_header|expires|server_tokens)\\b' - 'name': 'constant.language.module.http.headers' + 'name': 'support.function.directive.module.http.headers' } { 'match': '\\b(valid_referers)\\b' - 'name': 'constant.language.module.http.referer' + 'name': 'support.function.directive.module.http.referer' } { 'match': '\\b(limit_zone|limit_conn)\\b' - 'name': 'constant.language.module.http.limit_zone' + 'name': 'support.function.directive.module.http.limit_zone' } { 'match': '\\b(access_log|log_format)\\b' - 'name': 'constant.language.module.http.log' + 'name': 'support.function.directive.module.http.log' } { 'match': '\\b(map|map_hash_max_size|map_hash_bucket_size)\\b' - 'name': 'constant.language.module.http.map' + 'name': 'support.function.directive.module.http.map' } { 'match': '\\b(memcached_pass|memcached_connect_timeout|memcached_send_timeout|memcached_read_timeout|memcached_buffer_size|memcached_next_upstream)\\b' - 'name': 'constant.language.module.http.memcached' + 'name': 'support.function.directive.module.http.memcached' } { 'match': '\\b(proxy_bind|proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_cache|proxy_cache_bypass|proxy_cache_key|proxy_cache_lock|proxy_cache_lock_age|proxy_cache_lock_timeout|proxy_cache_methods|proxy_cache_min_uses|proxy_cache_path|proxy_cache_purge|proxy_cache_revalidate|proxy_cache_use_stale|proxy_cache_valid|proxy_connect_timeout|proxy_cookie_domain|proxy_cookie_path|proxy_force_ranges|proxy_headers_hash_bucket_size|proxy_headers_hash_max_size|proxy_hide_header|proxy_http_version|proxy_ignore_client_abort|proxy_ignore_headers|proxy_intercept_errors|proxy_limit_rate|proxy_max_temp_file_size|proxy_method|proxy_next_upstream|proxy_next_upstream_timeout|proxy_next_upstream_tries|proxy_no_cache|proxy_pass|proxy_pass_header|proxy_read_timeout|proxy_pass_request_body|proxy_pass_request_headers|proxy_redirect|proxy_request_buffering|proxy_send_lowat|proxy_send_timeout|proxy_set_body|proxy_set_header|proxy_ssl_certificate|proxy_ssl_certificate_key|proxy_ssl_ciphers|proxy_ssl_crl|proxy_ssl_name|proxy_ssl_password_file|proxy_ssl_server_name|proxy_ssl_session_reuse|proxy_ssl_protocols|proxy_ssl_trusted_certificate|proxy_ssl_verify|proxy_ssl_verify_depth|proxy_store|proxy_store_access|proxy_temp_file_write_size|proxy_temp_path)\\b' - 'name': 'constant.language.module.http.proxy' + 'name': 'support.function.directive.module.http.proxy' } { 'match': '\\b(break|if|return|rewrite|set|uninitialized_variable_warn)\\b' - 'name': 'constant.language.module.http.rewrite' + 'name': 'keyword.control.directive.module.http.rewrite' } { 'match': '\\b(ssi|ssi_silent_errors|ssi_types|ssi_value_length)\\b' - 'name': 'constant.language.module.http.ssi' + 'name': 'support.function.directive.module.http.ssi' } { 'match': '\\b(ip_hash|upstream|server)\\b' - 'name': 'constant.language.module.http.upstream' + 'name': 'support.function.directive.module.http.upstream' } { 'match': '\\b(set_real_ip_from|real_ip_header|real_ip_recursive)\\b' - 'name': 'constant.language.module.http.realip' + 'name': 'support.function.directive.module.http.realip' } { 'match': '\\b(userid|userid_domain|userid_expires|userid_name|userid_p3p|userid_path|userid_service)\\b' - 'name': 'constant.language.module.http.userid' + 'name': 'support.function.directive.module.http.userid' } ] -'scopeName': 'source.nginx' From 42be27ac14ce86ca5e76f6a5349e5582accd539a Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 14 Sep 2015 10:21:46 -0700 Subject: [PATCH 2/2] fixed lost change scopeName: 'source.nginx' --- grammars/nginx.cson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grammars/nginx.cson b/grammars/nginx.cson index 8b8b423..ad61d69 100644 --- a/grammars/nginx.cson +++ b/grammars/nginx.cson @@ -5,7 +5,7 @@ 'foldingStartMarker': '\\{\\s*$' 'foldingStopMarker': '^\\s*\\}' 'name': 'nginx' -'scopeName': 'source' +'scopeName': 'source.nginx' 'patterns': [ { 'match': '\\#.*$'