diff --git a/static/js/lib/codemirror-4.4/mode/jade/index.html b/static/js/lib/codemirror-4.5/mode/jade/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/jade/index.html
rename to static/js/lib/codemirror-4.5/mode/jade/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/jade/jade.js b/static/js/lib/codemirror-4.5/mode/jade/jade.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/jade/jade.js
rename to static/js/lib/codemirror-4.5/mode/jade/jade.js
diff --git a/static/js/lib/codemirror-4.4/mode/javascript/index.html b/static/js/lib/codemirror-4.5/mode/javascript/index.html
similarity index 92%
rename from static/js/lib/codemirror-4.4/mode/javascript/index.html
rename to static/js/lib/codemirror-4.5/mode/javascript/index.html
index faf5036..59e3924 100644
--- a/static/js/lib/codemirror-4.4/mode/javascript/index.html
+++ b/static/js/lib/codemirror-4.5/mode/javascript/index.html
@@ -102,6 +102,11 @@ StringStream.prototype = {
statementIndent which (given a number) will
determine the amount of indentation to use for statements
continued on a new line.
+
wordCharacters, a regexp that indicates which
+ characters should be considered part of an identifier.
+ Defaults to /[\w$]/, which does not handle
+ non-ASCII identifiers. Can be set to something more elaborate
+ to improve Unicode support.
diff --git a/static/js/lib/codemirror-4.4/mode/javascript/javascript.js b/static/js/lib/codemirror-4.5/mode/javascript/javascript.js
similarity index 99%
rename from static/js/lib/codemirror-4.4/mode/javascript/javascript.js
rename to static/js/lib/codemirror-4.5/mode/javascript/javascript.js
index fdb066e..46616bc 100644
--- a/static/js/lib/codemirror-4.4/mode/javascript/javascript.js
+++ b/static/js/lib/codemirror-4.5/mode/javascript/javascript.js
@@ -19,6 +19,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
var jsonldMode = parserConfig.jsonld;
var jsonMode = parserConfig.json || jsonldMode;
var isTS = parserConfig.typescript;
+ var wordRE = parserConfig.wordCharacters || /[\w$]/;
// Tokenizer
@@ -132,8 +133,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
} else if (isOperatorChar.test(ch)) {
stream.eatWhile(isOperatorChar);
return ret("operator", "operator", stream.current());
- } else {
- stream.eatWhile(/[\w\$_]/);
+ } else if (wordRE.test(ch)) {
+ stream.eatWhile(wordRE);
var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
return (known && state.lastType != ".") ? ret(known.type, known.style, word) :
ret("variable", "variable", word);
@@ -202,7 +203,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
if (--depth == 0) break;
} else if (bracket >= 3 && bracket < 6) {
++depth;
- } else if (/[$\w]/.test(ch)) {
+ } else if (wordRE.test(ch)) {
sawSomething = true;
} else if (sawSomething && !depth) {
++pos;
@@ -669,7 +670,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
};
});
-CodeMirror.registerHelper("wordChars", "javascript", /[\\w$]/);
+CodeMirror.registerHelper("wordChars", "javascript", /[\w$]/);
CodeMirror.defineMIME("text/javascript", "javascript");
CodeMirror.defineMIME("text/ecmascript", "javascript");
diff --git a/static/js/lib/codemirror-4.4/mode/javascript/json-ld.html b/static/js/lib/codemirror-4.5/mode/javascript/json-ld.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/javascript/json-ld.html
rename to static/js/lib/codemirror-4.5/mode/javascript/json-ld.html
diff --git a/static/js/lib/codemirror-4.4/mode/javascript/test.js b/static/js/lib/codemirror-4.5/mode/javascript/test.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/javascript/test.js
rename to static/js/lib/codemirror-4.5/mode/javascript/test.js
diff --git a/static/js/lib/codemirror-4.4/mode/javascript/typescript.html b/static/js/lib/codemirror-4.5/mode/javascript/typescript.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/javascript/typescript.html
rename to static/js/lib/codemirror-4.5/mode/javascript/typescript.html
diff --git a/static/js/lib/codemirror-4.4/mode/jinja2/index.html b/static/js/lib/codemirror-4.5/mode/jinja2/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/jinja2/index.html
rename to static/js/lib/codemirror-4.5/mode/jinja2/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/jinja2/jinja2.js b/static/js/lib/codemirror-4.5/mode/jinja2/jinja2.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/jinja2/jinja2.js
rename to static/js/lib/codemirror-4.5/mode/jinja2/jinja2.js
diff --git a/static/js/lib/codemirror-4.4/mode/julia/index.html b/static/js/lib/codemirror-4.5/mode/julia/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/julia/index.html
rename to static/js/lib/codemirror-4.5/mode/julia/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/julia/julia.js b/static/js/lib/codemirror-4.5/mode/julia/julia.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/julia/julia.js
rename to static/js/lib/codemirror-4.5/mode/julia/julia.js
diff --git a/static/js/lib/codemirror-4.4/mode/kotlin/index.html b/static/js/lib/codemirror-4.5/mode/kotlin/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/kotlin/index.html
rename to static/js/lib/codemirror-4.5/mode/kotlin/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/kotlin/kotlin.js b/static/js/lib/codemirror-4.5/mode/kotlin/kotlin.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/kotlin/kotlin.js
rename to static/js/lib/codemirror-4.5/mode/kotlin/kotlin.js
diff --git a/static/js/lib/codemirror-4.4/mode/livescript/index.html b/static/js/lib/codemirror-4.5/mode/livescript/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/livescript/index.html
rename to static/js/lib/codemirror-4.5/mode/livescript/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/livescript/livescript.js b/static/js/lib/codemirror-4.5/mode/livescript/livescript.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/livescript/livescript.js
rename to static/js/lib/codemirror-4.5/mode/livescript/livescript.js
diff --git a/static/js/lib/codemirror-4.4/mode/lua/index.html b/static/js/lib/codemirror-4.5/mode/lua/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/lua/index.html
rename to static/js/lib/codemirror-4.5/mode/lua/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/lua/lua.js b/static/js/lib/codemirror-4.5/mode/lua/lua.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/lua/lua.js
rename to static/js/lib/codemirror-4.5/mode/lua/lua.js
diff --git a/static/js/lib/codemirror-4.4/mode/markdown/index.html b/static/js/lib/codemirror-4.5/mode/markdown/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/markdown/index.html
rename to static/js/lib/codemirror-4.5/mode/markdown/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/markdown/markdown.js b/static/js/lib/codemirror-4.5/mode/markdown/markdown.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/markdown/markdown.js
rename to static/js/lib/codemirror-4.5/mode/markdown/markdown.js
diff --git a/static/js/lib/codemirror-4.4/mode/markdown/test.js b/static/js/lib/codemirror-4.5/mode/markdown/test.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/markdown/test.js
rename to static/js/lib/codemirror-4.5/mode/markdown/test.js
diff --git a/static/js/lib/codemirror-4.4/mode/meta.js b/static/js/lib/codemirror-4.5/mode/meta.js
similarity index 99%
rename from static/js/lib/codemirror-4.4/mode/meta.js
rename to static/js/lib/codemirror-4.5/mode/meta.js
index 3627cd7..e3c32b6 100644
--- a/static/js/lib/codemirror-4.4/mode/meta.js
+++ b/static/js/lib/codemirror-4.5/mode/meta.js
@@ -86,6 +86,7 @@ CodeMirror.modeInfo = [
{name: "SCSS", mime: "text/x-scss", mode: "css"},
{name: "Shell", mime: "text/x-sh", mode: "shell"},
{name: "Sieve", mime: "application/sieve", mode: "sieve"},
+ {name: "Slim", mime: "text/x-slim", mode: "slim"},
{name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk"},
{name: "Smarty", mime: "text/x-smarty", mode: "smarty"},
{name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed"},
diff --git a/static/js/lib/codemirror-4.4/mode/mirc/index.html b/static/js/lib/codemirror-4.5/mode/mirc/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/mirc/index.html
rename to static/js/lib/codemirror-4.5/mode/mirc/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/mirc/mirc.js b/static/js/lib/codemirror-4.5/mode/mirc/mirc.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/mirc/mirc.js
rename to static/js/lib/codemirror-4.5/mode/mirc/mirc.js
diff --git a/static/js/lib/codemirror-4.4/mode/mllike/index.html b/static/js/lib/codemirror-4.5/mode/mllike/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/mllike/index.html
rename to static/js/lib/codemirror-4.5/mode/mllike/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/mllike/mllike.js b/static/js/lib/codemirror-4.5/mode/mllike/mllike.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/mllike/mllike.js
rename to static/js/lib/codemirror-4.5/mode/mllike/mllike.js
diff --git a/static/js/lib/codemirror-4.4/mode/nginx/index.html b/static/js/lib/codemirror-4.5/mode/nginx/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/nginx/index.html
rename to static/js/lib/codemirror-4.5/mode/nginx/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/nginx/nginx.js b/static/js/lib/codemirror-4.5/mode/nginx/nginx.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/nginx/nginx.js
rename to static/js/lib/codemirror-4.5/mode/nginx/nginx.js
diff --git a/static/js/lib/codemirror-4.4/mode/ntriples/index.html b/static/js/lib/codemirror-4.5/mode/ntriples/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/ntriples/index.html
rename to static/js/lib/codemirror-4.5/mode/ntriples/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/ntriples/ntriples.js b/static/js/lib/codemirror-4.5/mode/ntriples/ntriples.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/ntriples/ntriples.js
rename to static/js/lib/codemirror-4.5/mode/ntriples/ntriples.js
diff --git a/static/js/lib/codemirror-4.4/mode/octave/index.html b/static/js/lib/codemirror-4.5/mode/octave/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/octave/index.html
rename to static/js/lib/codemirror-4.5/mode/octave/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/octave/octave.js b/static/js/lib/codemirror-4.5/mode/octave/octave.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/octave/octave.js
rename to static/js/lib/codemirror-4.5/mode/octave/octave.js
diff --git a/static/js/lib/codemirror-4.4/mode/pascal/index.html b/static/js/lib/codemirror-4.5/mode/pascal/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/pascal/index.html
rename to static/js/lib/codemirror-4.5/mode/pascal/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/pascal/pascal.js b/static/js/lib/codemirror-4.5/mode/pascal/pascal.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/pascal/pascal.js
rename to static/js/lib/codemirror-4.5/mode/pascal/pascal.js
diff --git a/static/js/lib/codemirror-4.4/mode/pegjs/index.html b/static/js/lib/codemirror-4.5/mode/pegjs/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/pegjs/index.html
rename to static/js/lib/codemirror-4.5/mode/pegjs/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/pegjs/pegjs.js b/static/js/lib/codemirror-4.5/mode/pegjs/pegjs.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/pegjs/pegjs.js
rename to static/js/lib/codemirror-4.5/mode/pegjs/pegjs.js
diff --git a/static/js/lib/codemirror-4.4/mode/perl/index.html b/static/js/lib/codemirror-4.5/mode/perl/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/perl/index.html
rename to static/js/lib/codemirror-4.5/mode/perl/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/perl/perl.js b/static/js/lib/codemirror-4.5/mode/perl/perl.js
similarity index 99%
rename from static/js/lib/codemirror-4.4/mode/perl/perl.js
rename to static/js/lib/codemirror-4.5/mode/perl/perl.js
index ab86e84..c12677d 100644
--- a/static/js/lib/codemirror-4.4/mode/perl/perl.js
+++ b/static/js/lib/codemirror-4.5/mode/perl/perl.js
@@ -791,7 +791,7 @@ CodeMirror.defineMode("perl",function(){
return (state.tokenize||tokenPerl)(stream,state);},
electricChars:"{}"};});
-CodeMirror.registerHelper("wordChars", "perl", /[\\w$]/);
+CodeMirror.registerHelper("wordChars", "perl", /[\w$]/);
CodeMirror.defineMIME("text/x-perl", "perl");
diff --git a/static/js/lib/codemirror-4.4/mode/php/index.html b/static/js/lib/codemirror-4.5/mode/php/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/php/index.html
rename to static/js/lib/codemirror-4.5/mode/php/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/php/php.js b/static/js/lib/codemirror-4.5/mode/php/php.js
similarity index 89%
rename from static/js/lib/codemirror-4.4/mode/php/php.js
rename to static/js/lib/codemirror-4.5/mode/php/php.js
index 72c19d8..f8821ed 100644
--- a/static/js/lib/codemirror-4.4/mode/php/php.js
+++ b/static/js/lib/codemirror-4.5/mode/php/php.js
@@ -95,9 +95,9 @@
"die echo empty exit eval include include_once isset list require require_once return " +
"print unset __halt_compiler self static parent yield insteadof finally";
var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";
- var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval 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 ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl 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 stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir 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 touch clearstatcache mail 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 count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once";
+ var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval 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 ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl 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 stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir 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 touch clearstatcache mail 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 count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuiltin].join(" ").split(" "));
- CodeMirror.registerHelper("wordChars", "php", /[\\w$]/);
+ CodeMirror.registerHelper("wordChars", "php", /[\w$]/);
var phpConfig = {
name: "clike",
diff --git a/static/js/lib/codemirror-4.4/mode/php/test.js b/static/js/lib/codemirror-4.5/mode/php/test.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/php/test.js
rename to static/js/lib/codemirror-4.5/mode/php/test.js
diff --git a/static/js/lib/codemirror-4.4/mode/pig/index.html b/static/js/lib/codemirror-4.5/mode/pig/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/pig/index.html
rename to static/js/lib/codemirror-4.5/mode/pig/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/pig/pig.js b/static/js/lib/codemirror-4.5/mode/pig/pig.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/pig/pig.js
rename to static/js/lib/codemirror-4.5/mode/pig/pig.js
diff --git a/static/js/lib/codemirror-4.4/mode/properties/index.html b/static/js/lib/codemirror-4.5/mode/properties/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/properties/index.html
rename to static/js/lib/codemirror-4.5/mode/properties/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/properties/properties.js b/static/js/lib/codemirror-4.5/mode/properties/properties.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/properties/properties.js
rename to static/js/lib/codemirror-4.5/mode/properties/properties.js
diff --git a/static/js/lib/codemirror-4.4/mode/puppet/index.html b/static/js/lib/codemirror-4.5/mode/puppet/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/puppet/index.html
rename to static/js/lib/codemirror-4.5/mode/puppet/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/puppet/puppet.js b/static/js/lib/codemirror-4.5/mode/puppet/puppet.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/puppet/puppet.js
rename to static/js/lib/codemirror-4.5/mode/puppet/puppet.js
diff --git a/static/js/lib/codemirror-4.4/mode/python/index.html b/static/js/lib/codemirror-4.5/mode/python/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/python/index.html
rename to static/js/lib/codemirror-4.5/mode/python/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/python/python.js b/static/js/lib/codemirror-4.5/mode/python/python.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/python/python.js
rename to static/js/lib/codemirror-4.5/mode/python/python.js
diff --git a/static/js/lib/codemirror-4.4/mode/q/index.html b/static/js/lib/codemirror-4.5/mode/q/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/q/index.html
rename to static/js/lib/codemirror-4.5/mode/q/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/q/q.js b/static/js/lib/codemirror-4.5/mode/q/q.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/q/q.js
rename to static/js/lib/codemirror-4.5/mode/q/q.js
diff --git a/static/js/lib/codemirror-4.4/mode/r/index.html b/static/js/lib/codemirror-4.5/mode/r/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/r/index.html
rename to static/js/lib/codemirror-4.5/mode/r/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/r/r.js b/static/js/lib/codemirror-4.5/mode/r/r.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/r/r.js
rename to static/js/lib/codemirror-4.5/mode/r/r.js
diff --git a/static/js/lib/codemirror-4.4/mode/rpm/changes/index.html b/static/js/lib/codemirror-4.5/mode/rpm/changes/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/rpm/changes/index.html
rename to static/js/lib/codemirror-4.5/mode/rpm/changes/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/rpm/index.html b/static/js/lib/codemirror-4.5/mode/rpm/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/rpm/index.html
rename to static/js/lib/codemirror-4.5/mode/rpm/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/rpm/rpm.js b/static/js/lib/codemirror-4.5/mode/rpm/rpm.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/rpm/rpm.js
rename to static/js/lib/codemirror-4.5/mode/rpm/rpm.js
diff --git a/static/js/lib/codemirror-4.4/mode/rst/index.html b/static/js/lib/codemirror-4.5/mode/rst/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/rst/index.html
rename to static/js/lib/codemirror-4.5/mode/rst/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/rst/rst.js b/static/js/lib/codemirror-4.5/mode/rst/rst.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/rst/rst.js
rename to static/js/lib/codemirror-4.5/mode/rst/rst.js
diff --git a/static/js/lib/codemirror-4.4/mode/ruby/index.html b/static/js/lib/codemirror-4.5/mode/ruby/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/ruby/index.html
rename to static/js/lib/codemirror-4.5/mode/ruby/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/ruby/ruby.js b/static/js/lib/codemirror-4.5/mode/ruby/ruby.js
similarity index 92%
rename from static/js/lib/codemirror-4.4/mode/ruby/ruby.js
rename to static/js/lib/codemirror-4.5/mode/ruby/ruby.js
index e7de7b5..6c9977b 100644
--- a/static/js/lib/codemirror-4.4/mode/ruby/ruby.js
+++ b/static/js/lib/codemirror-4.5/mode/ruby/ruby.js
@@ -141,7 +141,8 @@ CodeMirror.defineMode("ruby", function(config) {
} else if (ch == "-" && stream.eat(">")) {
return "arrow";
} else if (/[=+\-\/*:\.^%<>~|]/.test(ch)) {
- stream.eatWhile(/[=+\-\/*:\.^%<>~|]/);
+ var more = stream.eatWhile(/[=+\-\/*:\.^%<>~|]/);
+ if (ch == "." && !more) curPunc = ".";
return "operator";
} else {
return null;
@@ -232,20 +233,25 @@ CodeMirror.defineMode("ruby", function(config) {
token: function(stream, state) {
if (stream.sol()) state.indented = stream.indentation();
var style = state.tokenize[state.tokenize.length-1](stream, state), kwtype;
+ var thisTok = curPunc;
if (style == "ident") {
var word = stream.current();
- style = keywords.propertyIsEnumerable(stream.current()) ? "keyword"
+ style = state.lastTok == "." ? "property"
+ : keywords.propertyIsEnumerable(stream.current()) ? "keyword"
: /^[A-Z]/.test(word) ? "tag"
: (state.lastTok == "def" || state.lastTok == "class" || state.varList) ? "def"
: "variable";
- if (indentWords.propertyIsEnumerable(word)) kwtype = "indent";
- else if (dedentWords.propertyIsEnumerable(word)) kwtype = "dedent";
- else if ((word == "if" || word == "unless") && stream.column() == stream.indentation())
- kwtype = "indent";
- else if (word == "do" && state.context.indented < state.indented)
- kwtype = "indent";
+ if (style == "keyword") {
+ thisTok = word;
+ if (indentWords.propertyIsEnumerable(word)) kwtype = "indent";
+ else if (dedentWords.propertyIsEnumerable(word)) kwtype = "dedent";
+ else if ((word == "if" || word == "unless") && stream.column() == stream.indentation())
+ kwtype = "indent";
+ else if (word == "do" && state.context.indented < state.indented)
+ kwtype = "indent";
+ }
}
- if (curPunc || (style && style != "comment")) state.lastTok = word || curPunc || style;
+ if (curPunc || (style && style != "comment")) state.lastTok = thisTok;
if (curPunc == "|") state.varList = !state.varList;
if (kwtype == "indent" || /[\(\[\{]/.test(curPunc))
diff --git a/static/js/lib/codemirror-4.4/mode/ruby/test.js b/static/js/lib/codemirror-4.5/mode/ruby/test.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/ruby/test.js
rename to static/js/lib/codemirror-4.5/mode/ruby/test.js
diff --git a/static/js/lib/codemirror-4.4/mode/rust/index.html b/static/js/lib/codemirror-4.5/mode/rust/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/rust/index.html
rename to static/js/lib/codemirror-4.5/mode/rust/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/rust/rust.js b/static/js/lib/codemirror-4.5/mode/rust/rust.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/rust/rust.js
rename to static/js/lib/codemirror-4.5/mode/rust/rust.js
diff --git a/static/js/lib/codemirror-4.4/mode/sass/index.html b/static/js/lib/codemirror-4.5/mode/sass/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/sass/index.html
rename to static/js/lib/codemirror-4.5/mode/sass/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/sass/sass.js b/static/js/lib/codemirror-4.5/mode/sass/sass.js
similarity index 64%
rename from static/js/lib/codemirror-4.4/mode/sass/sass.js
rename to static/js/lib/codemirror-4.5/mode/sass/sass.js
index 2ff5003..68df323 100644
--- a/static/js/lib/codemirror-4.4/mode/sass/sass.js
+++ b/static/js/lib/codemirror-4.5/mode/sass/sass.js
@@ -12,9 +12,9 @@
"use strict";
CodeMirror.defineMode("sass", function(config) {
- var tokenRegexp = function(words){
+ function tokenRegexp(words) {
return new RegExp("^" + words.join("|"));
- };
+ }
var keywords = ["true", "false", "null", "auto"];
var keywordsRegexp = new RegExp("^" + keywords.join("|"));
@@ -24,246 +24,233 @@ CodeMirror.defineMode("sass", function(config) {
var pseudoElementsRegexp = /^::?[\w\-]+/;
- var urlTokens = function(stream, state){
+ function urlTokens(stream, state) {
var ch = stream.peek();
- if (ch === ")"){
+ if (ch === ")") {
stream.next();
state.tokenizer = tokenBase;
return "operator";
- }else if (ch === "("){
+ } else if (ch === "(") {
stream.next();
stream.eatSpace();
return "operator";
- }else if (ch === "'" || ch === '"'){
+ } else if (ch === "'" || ch === '"') {
state.tokenizer = buildStringTokenizer(stream.next());
return "string";
- }else{
+ } else {
state.tokenizer = buildStringTokenizer(")", false);
return "string";
}
- };
- var multilineComment = function(stream, state) {
- if (stream.skipTo("*/")){
- stream.next();
- stream.next();
- state.tokenizer = tokenBase;
- }else {
- stream.next();
- }
+ }
+ function comment(indentation, multiLine) {
+ return function(stream, state) {
+ if (stream.sol() && stream.indentation() <= indentation) {
+ state.tokenizer = tokenBase;
+ return tokenBase(stream, state);
+ }
- return "comment";
- };
+ if (multiLine && stream.skipTo("*/")) {
+ stream.next();
+ stream.next();
+ state.tokenizer = tokenBase;
+ } else {
+ stream.next();
+ }
- var buildStringTokenizer = function(quote, greedy){
- if(greedy == null){ greedy = true; }
+ return "comment";
+ };
+ }
- function stringTokenizer(stream, state){
+ function buildStringTokenizer(quote, greedy) {
+ if(greedy == null) { greedy = true; }
+
+ function stringTokenizer(stream, state) {
var nextChar = stream.next();
var peekChar = stream.peek();
var previousChar = stream.string.charAt(stream.pos-2);
var endingString = ((nextChar !== "\\" && peekChar === quote) || (nextChar === quote && previousChar !== "\\"));
- /*
- console.log("previousChar: " + previousChar);
- console.log("nextChar: " + nextChar);
- console.log("peekChar: " + peekChar);
- console.log("ending: " + endingString);
- */
-
- if (endingString){
+ if (endingString) {
if (nextChar !== quote && greedy) { stream.next(); }
state.tokenizer = tokenBase;
return "string";
- }else if (nextChar === "#" && peekChar === "{"){
+ } else if (nextChar === "#" && peekChar === "{") {
state.tokenizer = buildInterpolationTokenizer(stringTokenizer);
stream.next();
return "operator";
- }else {
+ } else {
return "string";
}
}
return stringTokenizer;
- };
+ }
- var buildInterpolationTokenizer = function(currentTokenizer){
- return function(stream, state){
- if (stream.peek() === "}"){
+ function buildInterpolationTokenizer(currentTokenizer) {
+ return function(stream, state) {
+ if (stream.peek() === "}") {
stream.next();
state.tokenizer = currentTokenizer;
return "operator";
- }else{
+ } else {
return tokenBase(stream, state);
}
};
- };
+ }
- var indent = function(state){
- if (state.indentCount == 0){
+ function indent(state) {
+ if (state.indentCount == 0) {
state.indentCount++;
var lastScopeOffset = state.scopes[0].offset;
var currentOffset = lastScopeOffset + config.indentUnit;
state.scopes.unshift({ offset:currentOffset });
}
- };
+ }
- var dedent = function(state){
- if (state.scopes.length == 1) { return; }
+ function dedent(state) {
+ if (state.scopes.length == 1) return;
state.scopes.shift();
- };
+ }
- var tokenBase = function(stream, state) {
+ function tokenBase(stream, state) {
var ch = stream.peek();
- // Single line Comment
- if (stream.match('//')) {
- stream.skipToEnd();
- return "comment";
+ // Comment
+ if (stream.match("/*")) {
+ state.tokenizer = comment(stream.indentation(), true);
+ return state.tokenizer(stream, state);
}
-
- // Multiline Comment
- if (stream.match('/*')){
- state.tokenizer = multilineComment;
+ if (stream.match("//")) {
+ state.tokenizer = comment(stream.indentation(), false);
return state.tokenizer(stream, state);
}
// Interpolation
- if (stream.match('#{')){
- state.tokenizer = buildInterpolationTokenizer(tokenBase);
+ if (stream.match("#{")) {
+ state.tokenizer = buildInterpolationTokenizer(tokenBase);
return "operator";
}
- if (ch === "."){
+ if (ch === ".") {
stream.next();
// Match class selectors
- if (stream.match(/^[\w-]+/)){
+ if (stream.match(/^[\w-]+/)) {
indent(state);
return "atom";
- }else if (stream.peek() === "#"){
+ } else if (stream.peek() === "#") {
indent(state);
return "atom";
- }else{
+ } else {
return "operator";
}
}
- if (ch === "#"){
+ if (ch === "#") {
stream.next();
// Hex numbers
- if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)){
+ if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/))
return "number";
- }
// ID selectors
- if (stream.match(/^[\w-]+/)){
+ if (stream.match(/^[\w-]+/)) {
indent(state);
return "atom";
}
- if (stream.peek() === "#"){
+ if (stream.peek() === "#") {
indent(state);
return "atom";
}
}
// Numbers
- if (stream.match(/^-?[0-9\.]+/)){
+ if (stream.match(/^-?[0-9\.]+/))
return "number";
- }
// Units
- if (stream.match(/^(px|em|in)\b/)){
+ if (stream.match(/^(px|em|in)\b/))
return "unit";
- }
- if (stream.match(keywordsRegexp)){
+ if (stream.match(keywordsRegexp))
return "keyword";
- }
- if (stream.match(/^url/) && stream.peek() === "("){
+ if (stream.match(/^url/) && stream.peek() === "(") {
state.tokenizer = urlTokens;
return "atom";
}
// Variables
- if (ch === "$"){
+ if (ch === "$") {
stream.next();
stream.eatWhile(/[\w-]/);
- if (stream.peek() === ":"){
+ if (stream.peek() === ":") {
stream.next();
return "variable-2";
- }else{
+ } else {
return "variable-3";
}
}
- if (ch === "!"){
+ if (ch === "!") {
stream.next();
-
- if (stream.match(/^[\w]+/)){
- return "keyword";
- }
-
- return "operator";
+ return stream.match(/^[\w]+/) ? "keyword": "operator";
}
- if (ch === "="){
+ if (ch === "=") {
stream.next();
// Match shortcut mixin definition
- if (stream.match(/^[\w-]+/)){
+ if (stream.match(/^[\w-]+/)) {
indent(state);
return "meta";
- }else {
+ } else {
return "operator";
}
}
- if (ch === "+"){
+ if (ch === "+") {
stream.next();
// Match shortcut mixin definition
- if (stream.match(/^[\w-]+/)){
+ if (stream.match(/^[\w-]+/))
return "variable-3";
- }else {
+ else
return "operator";
- }
}
// Indent Directives
- if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)){
+ if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)) {
indent(state);
return "meta";
}
// Other Directives
- if (ch === "@"){
+ if (ch === "@") {
stream.next();
stream.eatWhile(/[\w-]/);
return "meta";
}
// Strings
- if (ch === '"' || ch === "'"){
+ if (ch === '"' || ch === "'") {
stream.next();
state.tokenizer = buildStringTokenizer(ch);
return "string";
}
// Pseudo element selectors
- if (ch == ':' && stream.match(pseudoElementsRegexp)){
+ if (ch == ":" && stream.match(pseudoElementsRegexp))
return "keyword";
- }
// atoms
- if (stream.eatWhile(/[\w-&]/)){
+ if (stream.eatWhile(/[\w-&]/)) {
// matches a property definition
if (stream.peek() === ":" && !stream.match(pseudoElementsRegexp, false))
return "property";
@@ -271,43 +258,37 @@ CodeMirror.defineMode("sass", function(config) {
return "atom";
}
- if (stream.match(opRegexp)){
+ if (stream.match(opRegexp))
return "operator";
- }
// If we haven't returned by now, we move 1 character
// and return an error
stream.next();
return null;
- };
+ }
- var tokenLexer = function(stream, state) {
- if (stream.sol()){
- state.indentCount = 0;
- }
+ function tokenLexer(stream, state) {
+ if (stream.sol()) state.indentCount = 0;
var style = state.tokenizer(stream, state);
var current = stream.current();
- if (current === "@return"){
+ if (current === "@return")
dedent(state);
- }
- if (style === "atom"){
+ if (style === "atom")
indent(state);
- }
- if (style !== null){
+ if (style !== null) {
var startOfToken = stream.pos - current.length;
var withCurrentIndent = startOfToken + (config.indentUnit * state.indentCount);
var newScopes = [];
- for (var i = 0; i < state.scopes.length; i++){
+ for (var i = 0; i < state.scopes.length; i++) {
var scope = state.scopes[i];
- if (scope.offset <= withCurrentIndent){
+ if (scope.offset <= withCurrentIndent)
newScopes.push(scope);
- }
}
state.scopes = newScopes;
@@ -315,13 +296,13 @@ CodeMirror.defineMode("sass", function(config) {
return style;
- };
+ }
return {
startState: function() {
return {
tokenizer: tokenBase,
- scopes: [{offset: 0, type: 'sass'}],
+ scopes: [{offset: 0, type: "sass"}],
definedVars: [],
definedMixins: []
};
diff --git a/static/js/lib/codemirror-4.4/mode/scheme/index.html b/static/js/lib/codemirror-4.5/mode/scheme/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/scheme/index.html
rename to static/js/lib/codemirror-4.5/mode/scheme/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/scheme/scheme.js b/static/js/lib/codemirror-4.5/mode/scheme/scheme.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/scheme/scheme.js
rename to static/js/lib/codemirror-4.5/mode/scheme/scheme.js
diff --git a/static/js/lib/codemirror-4.4/mode/shell/index.html b/static/js/lib/codemirror-4.5/mode/shell/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/shell/index.html
rename to static/js/lib/codemirror-4.5/mode/shell/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/shell/shell.js b/static/js/lib/codemirror-4.5/mode/shell/shell.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/shell/shell.js
rename to static/js/lib/codemirror-4.5/mode/shell/shell.js
diff --git a/static/js/lib/codemirror-4.4/mode/shell/test.js b/static/js/lib/codemirror-4.5/mode/shell/test.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/shell/test.js
rename to static/js/lib/codemirror-4.5/mode/shell/test.js
diff --git a/static/js/lib/codemirror-4.4/mode/sieve/index.html b/static/js/lib/codemirror-4.5/mode/sieve/index.html
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/sieve/index.html
rename to static/js/lib/codemirror-4.5/mode/sieve/index.html
diff --git a/static/js/lib/codemirror-4.4/mode/sieve/sieve.js b/static/js/lib/codemirror-4.5/mode/sieve/sieve.js
similarity index 100%
rename from static/js/lib/codemirror-4.4/mode/sieve/sieve.js
rename to static/js/lib/codemirror-4.5/mode/sieve/sieve.js
diff --git a/static/js/lib/codemirror-4.5/mode/slim/index.html b/static/js/lib/codemirror-4.5/mode/slim/index.html
new file mode 100644
index 0000000..1a3b6ac
--- /dev/null
+++ b/static/js/lib/codemirror-4.5/mode/slim/index.html
@@ -0,0 +1,96 @@
+
+
+CodeMirror: SLIM mode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+