diff options
| -rw-r--r-- | after/syntax/cpp.vim | 169 | ||||
| -rw-r--r-- | ftplugin/latex-box/common.vim | 11 | ||||
| -rw-r--r-- | indent/eruby.vim | 6 | ||||
| -rw-r--r-- | syntax/php.vim | 17 | ||||
| -rw-r--r-- | syntax/ruby.vim | 8 | ||||
| -rw-r--r-- | syntax/rust.vim | 12 |
6 files changed, 196 insertions, 27 deletions
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim index e980e60d..78c36ba8 100644 --- a/after/syntax/cpp.vim +++ b/after/syntax/cpp.vim @@ -2,10 +2,11 @@ " Language: C++ Additions " Maintainer: Jon Haggblad <jon@haeggblad.com> " URL: http://www.haeggblad.com -" Last Change: 17 May 2013 -" Version: 0.1 +" Last Change: 26 Jan 2014 +" Version: 0.2 " Changelog: " 0.1 - initial version. +" 0.2 - C++14 " " Additional Vim syntax highlighting for C++ (including C++11) " @@ -139,6 +140,7 @@ syntax keyword cppSTLfunction atexit syntax keyword cppSTLfunction atof syntax keyword cppSTLfunction atoi syntax keyword cppSTLfunction atol +syntax keyword cppSTLfunction atoll syntax keyword cppSTLfunction back syntax keyword cppSTLfunction back_inserter syntax keyword cppSTLfunction bad @@ -423,8 +425,11 @@ syntax keyword cppSTLfunction strrchr syntax keyword cppSTLfunction strspn syntax keyword cppSTLfunction strstr syntax keyword cppSTLfunction strtod +syntax keyword cppSTLfunction strtof +syntax keyword cppSTLfunction strtold syntax keyword cppSTLfunction strtok syntax keyword cppSTLfunction strtol +syntax keyword cppSTLfunction strtoll syntax keyword cppSTLfunction strtoul syntax keyword cppSTLfunction strxfrm syntax keyword cppSTLfunction substr @@ -440,7 +445,6 @@ syntax keyword cppSTLfunction tellg syntax keyword cppSTLfunction tellp syntax keyword cppSTLfunction test syntax keyword cppSTLfunction time -syntax keyword cppSTLfunction time_t syntax keyword cppSTLfunction tmpfile syntax keyword cppSTLfunction tmpnam syntax keyword cppSTLfunction tolower @@ -615,6 +619,7 @@ syntax keyword cppSTLtype stringbuf syntax keyword cppSTLtype stringstream syntax keyword cppSTLtype temporary_buffer syntax keyword cppSTLtype test_type +syntax keyword cppSTLtype time_t syntax keyword cppSTLtype tm syntax keyword cppSTLtype traits_type syntax keyword cppSTLtype type_info @@ -635,6 +640,84 @@ syntax keyword cppSTLtype wstring syntax keyword cppSTLtype wstringbuf syntax keyword cppSTLtype wstringstream +syntax keyword cppSTLfunction mblen +syntax keyword cppSTLfunction mbtowc +syntax keyword cppSTLfunction wctomb +syntax keyword cppSTLfunction mbstowcs +syntax keyword cppSTLfunction wcstombs +syntax keyword cppSTLfunction mbsinit +syntax keyword cppSTLfunction btowc +syntax keyword cppSTLfunction wctob +syntax keyword cppSTLfunction mbrlen +syntax keyword cppSTLfunction mbrtowc +syntax keyword cppSTLfunction wcrtomb +syntax keyword cppSTLfunction mbsrtowcs +syntax keyword cppSTLfunction wcsrtombs + +syntax keyword cppSTLtype mbstate_t + +syntax keyword cppSTLconstant MB_LEN_MAX +syntax keyword cppSTLconstant MB_CUR_MAX +syntax keyword cppSTLconstant __STDC_UTF_16__ +syntax keyword cppSTLconstant __STDC_UTF_32__ + +syntax keyword cppSTLfunction iswalnum +syntax keyword cppSTLfunction iswalpha +syntax keyword cppSTLfunction iswlower +syntax keyword cppSTLfunction iswupper +syntax keyword cppSTLfunction iswdigit +syntax keyword cppSTLfunction iswxdigit +syntax keyword cppSTLfunction iswcntrl +syntax keyword cppSTLfunction iswgraph +syntax keyword cppSTLfunction iswspace +syntax keyword cppSTLfunction iswprint +syntax keyword cppSTLfunction iswpunct +syntax keyword cppSTLfunction iswctype +syntax keyword cppSTLfunction wctype + +syntax keyword cppSTLfunction towlower +syntax keyword cppSTLfunction towupper +syntax keyword cppSTLfunction towctrans +syntax keyword cppSTLfunction wctrans + +syntax keyword cppSTLfunction wcstol +syntax keyword cppSTLfunction wcstoll +syntax keyword cppSTLfunction wcstoul +syntax keyword cppSTLfunction wcstoull +syntax keyword cppSTLfunction wcstof +syntax keyword cppSTLfunction wcstod +syntax keyword cppSTLfunction wcstold + +syntax keyword cppSTLfunction wcscpy +syntax keyword cppSTLfunction wcsncpy +syntax keyword cppSTLfunction wcscat +syntax keyword cppSTLfunction wcsncat +syntax keyword cppSTLfunction wcsxfrm +syntax keyword cppSTLfunction wcslen +syntax keyword cppSTLfunction wcscmp +syntax keyword cppSTLfunction wcsncmp +syntax keyword cppSTLfunction wcscoll +syntax keyword cppSTLfunction wcschr +syntax keyword cppSTLfunction wcsrchr +syntax keyword cppSTLfunction wcsspn +syntax keyword cppSTLfunction wcscspn +syntax keyword cppSTLfunction wcspbrk +syntax keyword cppSTLfunction wcsstr +syntax keyword cppSTLfunction wcstok +syntax keyword cppSTLfunction wmemcpy +syntax keyword cppSTLfunction wmemmove +syntax keyword cppSTLfunction wmemcmp +syntax keyword cppSTLfunction wmemchr +syntax keyword cppSTLfunction wmemset + +syntax keyword cppSTLtype wctrans_t +syntax keyword cppSTLtype wctype_t +syntax keyword cppSTLtype wint_t + +syntax keyword cppSTLconstant WEOF +syntax keyword cppSTLconstant WCHAR_MIN +syntax keyword cppSTLconstant WCHAR_MAX + if !exists("cpp_no_cpp11") syntax keyword cppSTLtype nullptr_t max_align_t syntax keyword cppSTLtype type_index @@ -968,6 +1051,7 @@ if !exists("cpp_no_cpp11") " locale syntax keyword cppSTLfunction isblank + syntax keyword cppSTLfunction iswblank syntax keyword cppSTLtype wstring_convert syntax keyword cppSTLtype wbuffer_convert syntax keyword cppSTLtype codecvt_utf8 @@ -1016,13 +1100,51 @@ if !exists("cpp_no_cpp11") syntax keyword cppSTLfunction atomic_flag_clear syntax keyword cppSTLfunction atomic_flag_clear_explicit + syntax keyword cppSTLtype atomic_bool + syntax keyword cppSTLtype atomic_char + syntax keyword cppSTLtype atomic_schar + syntax keyword cppSTLtype atomic_uchar + syntax keyword cppSTLtype atomic_short + syntax keyword cppSTLtype atomic_ushort + syntax keyword cppSTLtype atomic_int + syntax keyword cppSTLtype atomic_uint + syntax keyword cppSTLtype atomic_long + syntax keyword cppSTLtype atomic_ulong + syntax keyword cppSTLtype atomic_llong + syntax keyword cppSTLtype atomic_ullong + syntax keyword cppSTLtype atomic_char16_t + syntax keyword cppSTLtype atomic_char32_t + syntax keyword cppSTLtype atomic_wchar_t + syntax keyword cppSTLtype atomic_int_least8_t + syntax keyword cppSTLtype atomic_uint_least8_t + syntax keyword cppSTLtype atomic_int_least16_t + syntax keyword cppSTLtype atomic_uint_least16_t + syntax keyword cppSTLtype atomic_int_least32_t + syntax keyword cppSTLtype atomic_uint_least32_t + syntax keyword cppSTLtype atomic_int_least64_t + syntax keyword cppSTLtype atomic_uint_least64_t + syntax keyword cppSTLtype atomic_int_fast8_t + syntax keyword cppSTLtype atomic_uint_fast8_t + syntax keyword cppSTLtype atomic_int_fast16_t + syntax keyword cppSTLtype atomic_uint_fast16_t + syntax keyword cppSTLtype atomic_int_fast32_t + syntax keyword cppSTLtype atomic_uint_fast32_t + syntax keyword cppSTLtype atomic_int_fast64_t + syntax keyword cppSTLtype atomic_uint_fast64_t + syntax keyword cppSTLtype atomic_intptr_t + syntax keyword cppSTLtype atomic_uintptr_t + syntax keyword cppSTLtype atomic_size_t + syntax keyword cppSTLtype atomic_ptrdiff_t + syntax keyword cppSTLtype atomic_intmax_t + syntax keyword cppSTLtype atomic_uintmax_t + syntax keyword cppSTLtype memory_order syntax keyword cppSTLfunction atomic_init syntax keyword cppSTLfunction ATOMIC_VAR_INIT syntax keyword cppSTLconstant ATOMIC_FLAG_INIT - syntax keyword cppSTLconstant kill_dependency - syntax keyword cppSTLconstant atomic_thread_fence - syntax keyword cppSTLconstant atomic_signal_fence + syntax keyword cppSTLfunction kill_dependency + syntax keyword cppSTLfunction atomic_thread_fence + syntax keyword cppSTLfunction atomic_signal_fence " thread syntax keyword cppSTLtype thread @@ -1061,8 +1183,8 @@ if !exists("cpp_no_cpp11") syntax keyword cppSTLtype future syntax keyword cppSTLtype shared_future - "syntax keyword cppSTLfunction async - "syntax keyword cppSTLenum launch + syntax keyword cppSTLfunction async + syntax keyword cppSTLenum launch syntax keyword cppSTLenum future_status syntax keyword cppSTLenum future_errc @@ -1114,7 +1236,36 @@ if !exists("cpp_no_cpp11") "limits syntax keyword cppSTLfunction lowest -endif + + "cuchar + syntax keyword cppSTLfunction mbrtoc16 + syntax keyword cppSTLfunction c16rtomb + syntax keyword cppSTLfunction mbrtoc32 + syntax keyword cppSTLfunction c32rtomb + + "cinttypes + syntax keyword cppSTLfunction strtoimax + syntax keyword cppSTLfunction strtoumax + syntax keyword cppSTLfunction wcstoimax + syntax keyword cppSTLfunction wcstoumax + +endif " C++11 + +if !exists("cpp_no_cpp14") + + "optional + syntax keyword cppSTLtype optional + "syntax keyword cppSTLfunction value + syntax keyword cppSTLfunction value_or + syntax keyword cppSTLfunction make_optional + + "dynarray + syntax keyword cppSTLtype dynarray + + "thread + syntax keyword cppSTLtype shared_mutex + syntax keyword cppSTLtype shared_lock +endif " C++14 " Default highlighting if version >= 508 || !exists("did_cpp_syntax_inits") diff --git a/ftplugin/latex-box/common.vim b/ftplugin/latex-box/common.vim index 7df90020..e132e22b 100644 --- a/ftplugin/latex-box/common.vim +++ b/ftplugin/latex-box/common.vim @@ -106,13 +106,20 @@ function! LatexBox_GetMainTexFile() return expand('%:p') endif - " 4 borrow the Vim-Latex-Suite method of finding it + " 4. use 'main.tex' if it exists in the same directory (and is readable) + let s:main_dot_tex_file=expand('%:p:h') . '/main.tex' + if filereadable(s:main_dot_tex_file) + let b:main_tex_file=s:main_dot_tex_file + return b:main_tex_file + endif + + " 5. borrow the Vim-Latex-Suite method of finding it if Tex_GetMainFileName() != expand('%:p') let b:main_tex_file = Tex_GetMainFileName() return b:main_tex_file endif - " 5. prompt for file with completion + " 6. prompt for file with completion let b:main_tex_file = s:PromptForMainFile() return b:main_tex_file endfunction diff --git a/indent/eruby.vim b/indent/eruby.vim index 19109ceb..5f323857 100644 --- a/indent/eruby.vim +++ b/indent/eruby.vim @@ -19,6 +19,9 @@ else endif unlet! b:did_indent +" Force HTML indent to not keep state. +let b:html_indent_usestate = 0 + if &l:indentexpr == '' if &l:cindent let &l:indentexpr = 'cindent(v:lnum)' @@ -53,7 +56,8 @@ function! GetErubyIndent(...) else exe "let ind = ".b:eruby_subtype_indentexpr - " Workaround for Andy Wokula's HTML indent + " Workaround for Andy Wokula's HTML indent. This should be removed after + " some time, since the newest version is fixed in a different way. if b:eruby_subtype_indentexpr =~# '^HtmlIndent(' \ && exists('b:indent') \ && type(b:indent) == type({}) diff --git a/syntax/php.vim b/syntax/php.vim index c4ccf869..4f6ae245 100644 --- a/syntax/php.vim +++ b/syntax/php.vim @@ -38,6 +38,10 @@ " x>0 to sync at least x lines backwards " x=0 to sync from start " +" php_var_selector_is_identifier = 1 include the '$' as part of identifiers. +" Variables will be highlighted as a single 'phpIdentifier' group +" instead of as 'phpOperator' for '$' and 'phpIdentifier' the rest. +" " Note: " Setting php_folding=1 will match a closing } by comparing the indent " before the class or function keyword with the indent of a matching }. @@ -297,7 +301,7 @@ syn keyword phpClasses LogicException BadFunctionCallException BadMethodCallExce syn keyword phpClasses SQLite3 SQLite3Stmt SQLite3Result contained " standard -syn keyword phpFunctions constant bin2hex hex2bin sleep usleep time_nanosleep time_sleep_until strptime flush wordwrap htmlspecialchars htmlentities html_entity_decode htmlspecialchars_decode get_html_translation_table sha1 sha1_file md5 md5_file crc32 iptcparse iptcembed getimagesize getimagesizefromstring image_type_to_mime_type image_type_to_extension phpinfo phpversion phpcredits php_sapi_name php_uname php_ini_scanned_files php_ini_loaded_file strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos stripos strrpos strripos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count str_split strpbrk substr_compare strcoll money_format substr substr_replace quotemeta ucfirst lcfirst ucwords strtr addslashes addcslashes rtrim str_replace str_ireplace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode join setlocale localeconv nl_langinfo soundex levenshtein chr ord parse_str str_getcsv str_pad chop strchr sprintf printf vprintf vsprintf fprintf vfprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode http_build_query readlink linkinfo symlink link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close proc_terminate proc_get_status proc_nice rand srand getrandmax mt_rand mt_srand mt_getrandmax getservbyname getservbyport getprotobyname getprotobynumber getmyuid getmygid getmypid getmyinode getlastmod base64_decode base64_encode password_hash password_get_info password_needs_rehash password_verify convert_uuencode convert_uudecode abs ceil floor round sin cos tan asin acos atan atanh atan2 sinh cosh tanh asinh acosh expm1 log1p pi is_finite is_nan is_infinite pow exp log log10 sqrt hypot deg2rad rad2deg bindec hexdec octdec decbin decoct dechex base_convert number_format fmod inet_ntop inet_pton ip2long long2ip getenv putenv getopt sys_getloadavg microtime gettimeofday getrusage uniqid quoted_printable_decode quoted_printable_encode convert_cyr_string get_current_user set_time_limit header_register_callback get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime error_log error_get_last call_user_func call_user_func_array call_user_method call_user_method_array forward_static_call forward_static_call_array serialize unserialize var_dump var_export debug_zval_dump print_r memory_get_usage memory_get_peak_usage register_shutdown_function register_tick_function unregister_tick_function highlight_file show_source highlight_string php_strip_whitespace ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie setrawcookie header header_remove headers_sent headers_list http_response_code connection_aborted connection_status ignore_user_abort parse_ini_file parse_ini_string is_uploaded_file move_uploaded_file gethostbyaddr gethostbyname gethostbynamel gethostname dns_check_record checkdnsrr dns_get_mx getmxrr dns_get_record intval floatval doubleval strval boolval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar is_callable pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_get_params stream_context_set_option stream_context_get_options stream_context_get_default stream_context_set_default stream_filter_prepend stream_filter_append stream_filter_remove stream_socket_client stream_socket_server stream_socket_accept stream_socket_get_name stream_socket_recvfrom stream_socket_sendto stream_socket_enable_crypto stream_socket_shutdown stream_socket_pair stream_copy_to_stream stream_get_contents stream_supports_lock fgetcsv fputcsv flock get_meta_tags stream_set_read_buffer stream_set_write_buffer set_file_buffer stream_set_chunk_size set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_get_line stream_wrapper_register stream_register_wrapper stream_wrapper_unregister stream_wrapper_restore stream_get_wrappers stream_get_transports stream_resolve_include_path stream_is_local get_headers stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir chroot getcwd rewinddir readdir dir scandir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown chgrp lchown lchgrp chmod touch clearstatcache disk_total_space disk_free_space diskfreespace realpath_cache_size realpath_cache_get mail ezmlm_hash openlog syslog closelog lcg_value metaphone ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk array_walk_recursive count end prev next reset current key min max in_array array_search extract compact array_fill array_fill_keys range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_replace array_replace_recursive array_keys array_values array_count_values array_column array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_key array_intersect_ukey array_uintersect array_intersect_assoc array_uintersect_assoc array_intersect_uassoc array_uintersect_uassoc array_diff array_diff_key array_diff_ukey array_udiff array_diff_assoc array_udiff_assoc array_diff_uassoc array_udiff_uassoc array_sum array_product array_filter array_map array_chunk array_combine array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 stream_get_filters stream_filter_register stream_bucket_make_writeable stream_bucket_prepend stream_bucket_append stream_bucket_new output_add_rewrite_var output_reset_rewrite_vars sys_get_temp_dir contained +syn keyword phpFunctions constant bin2hex hex2bin sleep usleep time_nanosleep time_sleep_until strptime flush wordwrap htmlspecialchars htmlentities html_entity_decode htmlspecialchars_decode get_html_translation_table sha1 sha1_file md5 md5_file crc32 iptcparse iptcembed getimagesize getimagesizefromstring image_type_to_mime_type image_type_to_extension phpinfo phpversion phpcredits php_sapi_name php_uname php_ini_scanned_files php_ini_loaded_file strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos stripos strrpos strripos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count str_split strpbrk substr_compare strcoll money_format substr substr_replace quotemeta ucfirst lcfirst ucwords strtr addslashes addcslashes rtrim str_replace str_ireplace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode join setlocale localeconv nl_langinfo soundex levenshtein chr ord parse_str str_getcsv str_pad chop strchr sprintf printf vprintf vsprintf fprintf vfprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode http_build_query readlink linkinfo symlink link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close proc_terminate proc_get_status proc_nice rand srand getrandmax mt_rand mt_srand mt_getrandmax getservbyname getservbyport getprotobyname getprotobynumber getmyuid getmygid getmypid getmyinode getlastmod base64_decode base64_encode password_hash password_get_info password_needs_rehash password_verify convert_uuencode convert_uudecode abs ceil floor round sin cos tan asin acos atan atanh atan2 sinh cosh tanh asinh acosh expm1 log1p pi is_finite is_nan is_infinite pow exp log log10 sqrt hypot deg2rad rad2deg bindec hexdec octdec decbin decoct dechex base_convert number_format fmod inet_ntop inet_pton ip2long long2ip getenv putenv getopt sys_getloadavg microtime gettimeofday getrusage uniqid quoted_printable_decode quoted_printable_encode convert_cyr_string get_current_user set_time_limit header_register_callback get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime error_log error_get_last call_user_func call_user_func_array call_user_method call_user_method_array forward_static_call forward_static_call_array serialize unserialize var_dump var_export debug_zval_dump print_r memory_get_usage memory_get_peak_usage register_shutdown_function register_tick_function unregister_tick_function highlight_file show_source highlight_string php_strip_whitespace ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie setrawcookie header header_remove headers_sent headers_list http_response_code connection_aborted connection_status ignore_user_abort parse_ini_file parse_ini_string is_uploaded_file move_uploaded_file gethostbyaddr gethostbyname gethostbynamel gethostname dns_check_record checkdnsrr dns_get_mx getmxrr dns_get_record intval floatval doubleval strval boolval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar is_callable pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_get_params stream_context_set_option stream_context_get_options stream_context_get_default stream_context_set_default stream_filter_prepend stream_filter_append stream_filter_remove stream_socket_client stream_socket_server stream_socket_accept stream_socket_get_name stream_socket_recvfrom stream_socket_sendto stream_socket_enable_crypto stream_socket_shutdown stream_socket_pair stream_copy_to_stream stream_get_contents stream_supports_lock fgetcsv fputcsv flock get_meta_tags stream_set_read_buffer stream_set_write_buffer set_file_buffer stream_set_chunk_size set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_get_line stream_wrapper_register stream_register_wrapper stream_wrapper_unregister stream_wrapper_restore stream_get_wrappers stream_get_transports stream_resolve_include_path stream_is_local get_headers stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir chroot getcwd rewinddir readdir dir scandir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown chgrp lchown lchgrp chmod touch clearstatcache disk_total_space disk_free_space diskfreespace realpath_cache_size realpath_cache_get mail ezmlm_hash openlog syslog closelog lcg_value metaphone ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk array_walk_recursive count end prev next reset current key min max in_array array_search extract compact array_fill array_fill_keys range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_replace array_replace_recursive array_keys array_values array_count_values array_column array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_key array_intersect_ukey array_uintersect array_intersect_assoc array_uintersect_assoc array_intersect_uassoc array_uintersect_uassoc array_diff array_diff_key array_diff_ukey array_udiff array_diff_assoc array_udiff_assoc array_diff_uassoc array_udiff_uassoc array_sum array_product array_filter array_map array_chunk array_combine array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 stream_get_filters stream_filter_register stream_bucket_make_writeable stream_bucket_prepend stream_bucket_append stream_bucket_new output_add_rewrite_var output_reset_rewrite_vars sys_get_temp_dir dl cli_set_process_title cli_get_process_title contained syn keyword phpClasses __PHP_Incomplete_Class php_user_filter Directory contained " tokenizer @@ -360,6 +364,7 @@ syn match phpMemberSelector "->" contained display syn match phpVarSelector "\$" contained display " highlight object variables inside strings syn match phpMethodsVar "->\h\w*" contained contains=phpMethods,phpMemberSelector display containedin=phpStringDouble +syn match phpSplatOperator "\.\.\." contained display " Identifier syn match phpIdentifier "$\h\w*" contained contains=phpSuperglobals,phpVarSelector display @@ -475,7 +480,7 @@ else endif " Clusters -syn cluster phpClConst contains=phpFunctions,phpClasses,phpIdentifier,phpStatement,phpKeyword,phpOperator,phpStringSingle,phpStringDouble,phpBacktick,phpNumber,phpType,phpBoolean,phpStructure,phpMethodsVar,phpConstants,phpException,phpSuperglobals,phpMagicConstants,phpServerVars +syn cluster phpClConst contains=phpFunctions,phpClasses,phpIdentifier,phpStatement,phpKeyword,phpOperator,phpSplatOperator,phpStringSingle,phpStringDouble,phpBacktick,phpNumber,phpType,phpBoolean,phpStructure,phpMethodsVar,phpConstants,phpException,phpSuperglobals,phpMagicConstants,phpServerVars syn cluster phpClInside contains=@phpClConst,phpComment,phpDocComment,phpParent,phpParentError,phpInclude,phpHereDoc,phpNowDoc syn cluster phpClFunction contains=@phpClInside,phpDefine,phpParentError,phpStorageClass,phpKeyword syn cluster phpClTop contains=@phpClFunction,phpFoldFunction,phpFoldClass,phpFoldInterface,phpFoldTry,phpFoldCatch @@ -562,6 +567,8 @@ if !exists("did_php_syn_inits") hi def link phpOctalError Error hi def link phpTodo Todo + hi def link phpSplatOperator phpOperator + hi def link phpCommentStar phpComment hi def link phpDocComment phpComment hi def link phpCommentTitle phpComment @@ -572,7 +579,11 @@ if !exists("did_php_syn_inits") hi def link phpFCKeyword phpKeyword hi def link phpSCKeyword phpKeyword - hi def link phpVarSelector phpIdentifier + if exists("php_var_selector_is_identifier") + hi def link phpVarSelector phpIdentifier + else + hi def link phpVarSelector phpOperator + endif endif diff --git a/syntax/ruby.vim b/syntax/ruby.vim index d880051a..75da6085 100644 --- a/syntax/ruby.vim +++ b/syntax/ruby.vim @@ -261,7 +261,7 @@ if !exists("ruby_no_special_methods") syn keyword rubyException raise fail catch throw " false positive with 'include?' syn match rubyInclude "\<include\>[?!]\@!" - syn keyword rubyInclude autoload extend load prepend require require_relative + syn keyword rubyInclude autoload extend load prepend refine require require_relative using syn keyword rubyKeyword callcc caller lambda proc endif @@ -279,18 +279,18 @@ endif " Note: this is a hack to prevent 'keywords' being highlighted as such when called as methods with an explicit receiver syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(alias\|and\|begin\|break\|case\|class\|def\|defined\|do\|else\)\>" transparent contains=NONE syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(elsif\|end\|ensure\|false\|for\|if\|in\|module\|next\|nil\)\>" transparent contains=NONE -syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(not\|or\|redo\|rescue\|retry\|return\|self\|super\|then\|true\)\>" transparent contains=NONE +syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(not\|or\|redo\|refine\|rescue\|retry\|return\|self\|super\|then\|true\)\>" transparent contains=NONE syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(undef\|unless\|until\|when\|while\|yield\|BEGIN\|END\|__FILE__\|__LINE__\)\>" transparent contains=NONE syn match rubyKeywordAsMethod "\<\%(alias\|begin\|case\|class\|def\|do\|end\)[?!]" transparent contains=NONE -syn match rubyKeywordAsMethod "\<\%(if\|module\|undef\|unless\|until\|while\)[?!]" transparent contains=NONE +syn match rubyKeywordAsMethod "\<\%(if\|module\|refine\|undef\|unless\|until\|while\)[?!]" transparent contains=NONE syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(abort\|at_exit\|attr\|attr_accessor\|attr_reader\)\>" transparent contains=NONE syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(attr_writer\|autoload\|callcc\|catch\|caller\)\>" transparent contains=NONE syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(eval\|class_eval\|instance_eval\|module_eval\|exit\)\>" transparent contains=NONE syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(extend\|fail\|fork\|include\|lambda\)\>" transparent contains=NONE syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(load\|loop\|prepend\|private\|proc\|protected\)\>" transparent contains=NONE -syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(public\|require\|require_relative\|raise\|throw\|trap\)\>" transparent contains=NONE +syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(public\|require\|require_relative\|raise\|throw\|trap\|using\)\>" transparent contains=NONE " __END__ Directive syn region rubyData matchgroup=rubyDataDirective start="^__END__$" end="\%$" fold diff --git a/syntax/rust.vim b/syntax/rust.vim index 3b300b4c..0d248354 100644 --- a/syntax/rust.vim +++ b/syntax/rust.vim @@ -46,8 +46,6 @@ syn keyword rustType f64 i8 i16 i32 i64 str Self " to make it easy to update. " Core operators {{{3 -syn keyword rustEnum Either -syn keyword rustEnumVariant Left Right syn keyword rustTrait Sized syn keyword rustTrait Freeze Send syn keyword rustTrait Add Sub Mul Div Rem Neg Not @@ -80,7 +78,6 @@ syn keyword rustTrait FromStr syn keyword rustTrait FromIterator Extendable syn keyword rustTrait Iterator DoubleEndedIterator RandomAccessIterator CloneableIterator syn keyword rustTrait OrdIterator MutableDoubleEndedIterator ExactSize -syn keyword rustTrait Times syn keyword rustTrait Algebraic Trigonometric Exponential Hyperbolic syn keyword rustTrait Bitwise Bounded Integer Fractional Real RealExt @@ -94,16 +91,16 @@ syn keyword rustTrait SendStr SendStrOwned SendStrStatic IntoSendStr syn keyword rustTrait Str StrVector StrSlice OwnedStr syn keyword rustTrait IterBytes syn keyword rustTrait ToStr IntoStr -syn keyword rustTrait CopyableTuple ImmutableTuple +syn keyword rustTrait CloneableTuple ImmutableTuple syn keyword rustTrait Tuple1 Tuple2 Tuple3 Tuple4 syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8 syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12 syn keyword rustTrait ImmutableTuple1 ImmutableTuple2 ImmutableTuple3 ImmutableTuple4 syn keyword rustTrait ImmutableTuple5 ImmutableTuple6 ImmutableTuple7 ImmutableTuple8 syn keyword rustTrait ImmutableTuple9 ImmutableTuple10 ImmutableTuple11 ImmutableTuple12 -syn keyword rustTrait ImmutableEqVector ImmutableTotalOrdVector ImmutableCopyableVector -syn keyword rustTrait OwnedVector OwnedCopyableVector OwnedEqVector MutableVector -syn keyword rustTrait Vector VectorVector CopyableVector ImmutableVector +syn keyword rustTrait ImmutableEqVector ImmutableTotalOrdVector ImmutableCloneableVector +syn keyword rustTrait OwnedVector OwnedCloneableVector OwnedEqVector MutableVector +syn keyword rustTrait Vector VectorVector CloneableVector ImmutableVector "syn keyword rustFunction stream syn keyword rustTrait Port Chan GenericChan GenericSmartChan GenericPort Peekable @@ -113,7 +110,6 @@ syn keyword rustSelf self syn keyword rustBoolean true false syn keyword rustConstant Some None " option -syn keyword rustConstant Left Right " either syn keyword rustConstant Ok Err " result syn keyword rustConstant Less Equal Greater " Ordering |