Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: Source/devtools/front_end/cm/php.js

Issue 354833004: DevTools: [CodeMirror] roll CodeMirror to version @e20d175 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: address comments Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/devtools/front_end/cm/overlay.js ('k') | Source/devtools/front_end/cm/python.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 (function() { 1 // CodeMirror, copyright (c) by Marijn Haverbeke and others
2 // Distributed under an MIT license: http://codemirror.net/LICENSE
3
4 (function(mod) {
5 if (typeof exports == "object" && typeof module == "object") // CommonJS
6 mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), requ ire("../clike/clike"));
7 else if (typeof define == "function" && define.amd) // AMD
8 define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../clike/clike"], mod);
9 else // Plain browser env
10 mod(CodeMirror);
11 })(function(CodeMirror) {
12 "use strict";
13
2 function keywords(str) { 14 function keywords(str) {
3 var obj = {}, words = str.split(" "); 15 var obj = {}, words = str.split(" ");
4 for (var i = 0; i < words.length; ++i) obj[words[i]] = true; 16 for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
5 return obj; 17 return obj;
6 } 18 }
7 function heredoc(delim) { 19 function heredoc(delim) {
8 return function(stream, state) { 20 return function(stream, state) {
9 if (stream.match(delim)) state.tokenize = null; 21 if (stream.match(delim)) state.tokenize = null;
10 else stream.skipToEnd(); 22 else stream.skipToEnd();
11 return "string"; 23 return "string";
12 }; 24 };
13 } 25 }
26
27 // Helper for stringWithEscapes
28 function matchSequence(list) {
29 if (list.length == 0) return stringWithEscapes;
30 return function (stream, state) {
31 var patterns = list[0];
32 for (var i = 0; i < patterns.length; i++) if (stream.match(patterns[i][0]) ) {
33 state.tokenize = matchSequence(list.slice(1));
34 return patterns[i][1];
35 }
36 state.tokenize = stringWithEscapes;
37 return "string";
38 };
39 }
40 function stringWithEscapes(stream, state) {
41 var escaped = false, next, end = false;
42
43 if (stream.current() == '"') return "string";
44
45 // "Complex" syntax
46 if (stream.match("${", false) || stream.match("{$", false)) {
47 state.tokenize = null;
48 return "string";
49 }
50
51 // Simple syntax
52 if (stream.match(/\$[a-zA-Z_][a-zA-Z0-9_]*/)) {
53 // After the variable name there may appear array or object operator.
54 if (stream.match("[", false)) {
55 // Match array operator
56 state.tokenize = matchSequence([
57 [["[", null]],
58 [[/\d[\w\.]*/, "number"],
59 [/\$[a-zA-Z_][a-zA-Z0-9_]*/, "variable-2"],
60 [/[\w\$]+/, "variable"]],
61 [["]", null]]
62 ]);
63 }
64 if (stream.match(/\-\>\w/, false)) {
65 // Match object operator
66 state.tokenize = matchSequence([
67 [["->", null]],
68 [[/[\w]+/, "variable"]]
69 ]);
70 }
71 return "variable-2";
72 }
73
74 // Normal string
75 while (
76 !stream.eol() &&
77 (!stream.match("{$", false)) &&
78 (!stream.match(/(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/, false) || escaped)
79 ) {
80 next = stream.next();
81 if (!escaped && next == '"') { end = true; break; }
82 escaped = !escaped && next == "\\";
83 }
84 if (end) {
85 state.tokenize = null;
86 state.phpEncapsStack.pop();
87 }
88 return "string";
89 }
90
91 var phpKeywords = "abstract and array as break case catch class clone const co ntinue declare default " +
92 "do else elseif enddeclare endfor endforeach endif endswitch endwhile extend s final " +
93 "for foreach function global goto if implements interface instanceof namespa ce " +
94 "new or private protected public static switch throw trait try use var while xor " +
95 "die echo empty exit eval include include_once isset list require require_on ce return " +
96 "print unset __halt_compiler self static parent yield insteadof finally";
97 var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __L INE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";
98 var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strnc mp strcasecmp strncasecmp each error_reporting define defined trigger_error user _error set_error_handler restore_error_handler get_declared_classes get_loaded_e xtensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmd ate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities htm l_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 dirna me pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_wo rd_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashe s addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim st rip_tags similar_text explode implode setlocale localeconv parse_str str_pad cho p strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urlde code rawurlencode rawurldecode readlink linkinfo link unlink exec system escapes hellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getra ndmax 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 bas e_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gett imeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var mag ic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes _runtime import_request_variables error_log serialize unserialize memory_get_usa ge var_dump var_export debug_zval_dump print_r highlight_file show_source highli ght_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path se t_include_path restore_include_path setcookie header headers_sent connection_abo rted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_up loaded_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_stri ng is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spli ti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fget c fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite f puts mkdir rename copy tempnam tmpfile file file_get_contents stream_select stre am_context_create stream_context_set_params stream_context_set_option stream_con text_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_me ta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_b locking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_ wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpat h fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir ch dir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode fi lemtime fileowner fileperms filesize filetype file_exists is_writable is_writeab le is_readable is_executable is_file is_dir is_link stat lstat chown touch clear statcache 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_implic it_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rso rt 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 a rray_push array_pop array_shift array_unshift array_splice array_slice array_mer ge array_merge_recursive array_keys array_values array_count_values array_revers e array_reduce array_pad array_flip array_change_key_case array_rand array_uniqu e array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum ar ray_filter array_map array_chunk array_key_exists pos sizeof key_exists assert a ssert_options version_compare ftok str_rot13 aggregate session_name session_modu le_name session_save_path session_id session_regenerate_id session_decode sessio n_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter se ssion_cache_expire session_set_cookie_params session_get_cookie_params session_w rite_close preg_match preg_match_all preg_replace preg_replace_callback preg_spl it 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_x digit 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_l ist_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_see k 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_c lient_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info my sql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fiel dlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables m ysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_c onnect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connectio n_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_que ry 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_resu lt_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_no tify 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_expor t pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_cl ient_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_numro ws pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtle n 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_co de get_declared_traits getimagesizefromstring socket_import_stream stream_set_ch unk_size trait_exists header_register_callback class_uses session_status session _register_shutdown echo print global static exit array empty eval isset unset di e include require include_once require_once";
99 CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuilt in].join(" ").split(" "));
100 CodeMirror.registerHelper("wordChars", "php", /[\\w$]/);
101
14 var phpConfig = { 102 var phpConfig = {
15 name: "clike", 103 name: "clike",
16 keywords: keywords("abstract and array as break case catch class clone const continue declare default " + 104 helperType: "php",
17 "do else elseif enddeclare endfor endforeach endif endswi tch endwhile extends final " + 105 keywords: keywords(phpKeywords),
18 "for foreach function global goto if implements interface instanceof namespace " +
19 "new or private protected public static switch throw trai t try use var while xor " +
20 "die echo empty exit eval include include_once isset list require require_once return " +
21 "print unset __halt_compiler self static parent yield ins teadof finally"),
22 blockKeywords: keywords("catch do else elseif for foreach if switch try whil e finally"), 106 blockKeywords: keywords("catch do else elseif for foreach if switch try whil e finally"),
23 atoms: keywords("true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__"), 107 atoms: keywords(phpAtoms),
24 builtin: keywords("func_num_args func_get_arg func_get_args strlen strcmp st rncmp strcasecmp strncasecmp each error_reporting define defined trigger_error u ser_error set_error_handler restore_error_handler get_declared_classes get_loade d_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2h ex 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 phpin fo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn str tok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename di rname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str _word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addsla shes 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 ur ldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system esca peshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand ge trandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil flo or round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime g ettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quo tes_runtime import_request_variables error_log serialize unserialize memory_get_ usage var_dump var_export debug_zval_dump print_r highlight_file show_source hig hlight_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_resou rce is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_s tring is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split s pliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof f getc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrit e fputs mkdir rename copy tempnam tmpfile file file_get_contents stream_select s tream_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_se t_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stre am_wrapper_register stream_set_timeout socket_set_timeout socket_get_status real path 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_writ eable is_readable is_executable is_file is_dir is_link stat lstat chown touch cl earstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_fl ush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_imp licit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current k ey min max in_array array_search extract compact array_fill range array_multisor t 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_rev erse array_reduce array_pad array_flip array_change_key_case array_rand array_un ique 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 asser t assert_options version_compare ftok str_rot13 aggregate session_name session_m odule_name session_save_path session_id session_regenerate_id session_decode ses sion_register session_unregister session_is_registered session_encode session_st art session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params sessio n_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_di git ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctyp e_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_chi ld_terminate apache_setenv apache_response_headers apache_get_version getallhead ers mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mys ql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysq l_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mys ql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields my sql_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 my sql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_fl ags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysq l_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_f ieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dro pdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtable s mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name p g_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connec tion_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_r esult_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_e nd_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_ex port 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_upd ate pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_nu mrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldpr tlen 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 sess ion_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once"), 108 builtin: keywords(phpBuiltin),
25 multiLineStrings: true, 109 multiLineStrings: true,
26 hooks: { 110 hooks: {
27 "$": function(stream) { 111 "$": function(stream) {
28 stream.eatWhile(/[\w\$_]/); 112 stream.eatWhile(/[\w\$_]/);
29 return "variable-2"; 113 return "variable-2";
30 }, 114 },
31 "<": function(stream, state) { 115 "<": function(stream, state) {
32 if (stream.match(/<</)) { 116 if (stream.match(/<</)) {
33 stream.eatWhile(/[\w\.]/); 117 stream.eatWhile(/[\w\.]/);
34 state.tokenize = heredoc(stream.current().slice(3)); 118 state.tokenize = heredoc(stream.current().slice(3));
35 return state.tokenize(stream, state); 119 return state.tokenize(stream, state);
36 } 120 }
37 return false; 121 return false;
38 }, 122 },
39 "#": function(stream) { 123 "#": function(stream) {
40 while (!stream.eol() && !stream.match("?>", false)) stream.next(); 124 while (!stream.eol() && !stream.match("?>", false)) stream.next();
41 return "comment"; 125 return "comment";
42 }, 126 },
43 "/": function(stream) { 127 "/": function(stream) {
44 if (stream.eat("/")) { 128 if (stream.eat("/")) {
45 while (!stream.eol() && !stream.match("?>", false)) stream.next(); 129 while (!stream.eol() && !stream.match("?>", false)) stream.next();
46 return "comment"; 130 return "comment";
47 } 131 }
48 return false; 132 return false;
133 },
134 '"': function(stream, state) {
135 if (!state.phpEncapsStack)
136 state.phpEncapsStack = [];
137 state.phpEncapsStack.push(0);
138 state.tokenize = stringWithEscapes;
139 return state.tokenize(stream, state);
140 },
141 "{": function(_stream, state) {
142 if (state.phpEncapsStack && state.phpEncapsStack.length > 0)
143 state.phpEncapsStack[state.phpEncapsStack.length - 1]++;
144 return false;
145 },
146 "}": function(_stream, state) {
147 if (state.phpEncapsStack && state.phpEncapsStack.length > 0)
148 if (--state.phpEncapsStack[state.phpEncapsStack.length - 1] == 0)
149 state.tokenize = stringWithEscapes;
150 return false;
49 } 151 }
50 } 152 }
51 }; 153 };
52 154
53 CodeMirror.defineMode("php", function(config, parserConfig) { 155 CodeMirror.defineMode("php", function(config, parserConfig) {
54 var htmlMode = CodeMirror.getMode(config, "text/html"); 156 var htmlMode = CodeMirror.getMode(config, "text/html");
55 var phpMode = CodeMirror.getMode(config, phpConfig); 157 var phpMode = CodeMirror.getMode(config, phpConfig);
56 158
57 function dispatch(stream, state) { 159 function dispatch(stream, state) {
58 var isPHP = state.curMode == phpMode; 160 var isPHP = state.curMode == phpMode;
59 if (stream.sol() && state.pending != '"') state.pending = null; 161 if (stream.sol() && state.pending && state.pending != '"' && state.pending != "'") state.pending = null;
60 if (!isPHP) { 162 if (!isPHP) {
61 if (stream.match(/^<\?\w*/)) { 163 if (stream.match(/^<\?\w*/)) {
62 state.curMode = phpMode; 164 state.curMode = phpMode;
63 state.curState = state.php; 165 state.curState = state.php;
64 return "meta"; 166 return "meta";
65 } 167 }
66 if (state.pending == '"') { 168 if (state.pending == '"' || state.pending == "'") {
67 while (!stream.eol() && stream.next() != '"') {} 169 while (!stream.eol() && stream.next() != state.pending) {}
68 var style = "string"; 170 var style = "string";
69 } else if (state.pending && stream.pos < state.pending.end) { 171 } else if (state.pending && stream.pos < state.pending.end) {
70 stream.pos = state.pending.end; 172 stream.pos = state.pending.end;
71 var style = state.pending.style; 173 var style = state.pending.style;
72 } else { 174 } else {
73 var style = htmlMode.token(stream, state.curState); 175 var style = htmlMode.token(stream, state.curState);
74 } 176 }
75 state.pending = null; 177 if (state.pending) state.pending = null;
76 var cur = stream.current(), openPHP = cur.search(/<\?/); 178 var cur = stream.current(), openPHP = cur.search(/<\?/), m;
77 if (openPHP != -1) { 179 if (openPHP != -1) {
78 if (style == "string" && /\"$/.test(cur) && !/\?>/.test(cur)) state.pe nding = '"'; 180 if (style == "string" && (m = cur.match(/[\'\"]$/)) && !/\?>/.test(cur )) state.pending = m[0];
79 else state.pending = {end: stream.pos, style: style}; 181 else state.pending = {end: stream.pos, style: style};
80 stream.backUp(cur.length - openPHP); 182 stream.backUp(cur.length - openPHP);
81 } 183 }
82 return style; 184 return style;
83 } else if (isPHP && state.php.tokenize == null && stream.match("?>")) { 185 } else if (isPHP && state.php.tokenize == null && stream.match("?>")) {
84 state.curMode = htmlMode; 186 state.curMode = htmlMode;
85 state.curState = state.html; 187 state.curState = state.html;
86 return "meta"; 188 return "meta";
87 } else { 189 } else {
88 return phpMode.token(stream, state.curState); 190 return phpMode.token(stream, state.curState);
(...skipping 21 matching lines...) Expand all
110 212
111 token: dispatch, 213 token: dispatch,
112 214
113 indent: function(state, textAfter) { 215 indent: function(state, textAfter) {
114 if ((state.curMode != phpMode && /^\s*<\//.test(textAfter)) || 216 if ((state.curMode != phpMode && /^\s*<\//.test(textAfter)) ||
115 (state.curMode == phpMode && /^\?>/.test(textAfter))) 217 (state.curMode == phpMode && /^\?>/.test(textAfter)))
116 return htmlMode.indent(state.html, textAfter); 218 return htmlMode.indent(state.html, textAfter);
117 return state.curMode.indent(state.curState, textAfter); 219 return state.curMode.indent(state.curState, textAfter);
118 }, 220 },
119 221
120 electricChars: "/{}:",
121 blockCommentStart: "/*", 222 blockCommentStart: "/*",
122 blockCommentEnd: "*/", 223 blockCommentEnd: "*/",
123 lineComment: "//", 224 lineComment: "//",
124 225
125 innerMode: function(state) { return {state: state.curState, mode: state.cu rMode}; } 226 innerMode: function(state) { return {state: state.curState, mode: state.cu rMode}; }
126 }; 227 };
127 }, "htmlmixed", "clike"); 228 }, "htmlmixed", "clike");
128 229
129 CodeMirror.defineMIME("application/x-httpd-php", "php"); 230 CodeMirror.defineMIME("application/x-httpd-php", "php");
130 CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true}); 231 CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true});
131 CodeMirror.defineMIME("text/x-php", phpConfig); 232 CodeMirror.defineMIME("text/x-php", phpConfig);
132 })(); 233 });
OLDNEW
« no previous file with comments | « Source/devtools/front_end/cm/overlay.js ('k') | Source/devtools/front_end/cm/python.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698