Magic-Mirror/js-beautify
1
0
Fork 0
mirror of https://github.com/beautifier/js-beautify.git synced 2024-12-12 15:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

"return /regexp/" fix

Browse Source
This commit is contained in:
Einars Lielmanis 2007-11-23 21:20:54 +00:00
parent 6f8235037a
commit 7d6ed92371
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
beautify.php
View File

@ -49,7 +49,7 @@ define('PRINT_NL', ++$n);
function js_beautify($js_source_text, $tab_size = 4) function js_beautify($js_source_text, $tab_size = 4)
{ {
global $output, $token_text, $last_type, $in, $ins, $indent, $tab_string, $is_last_nl; global $output, $token_text, $last_type, $last_text, $in, $ins, $indent, $tab_string, $is_last_nl;
global $input, $input_length; global $input, $input_length;
@ -431,7 +431,7 @@ function make_array($str)
function get_next_token(&$pos) function get_next_token(&$pos)
{ {
global $last_type; global $last_type, $last_text;
global $whitespace, $wordchar, $punct; global $whitespace, $wordchar, $punct;
global $input, $input_length, $is_last_nl; global $input, $input_length, $is_last_nl;
@ -521,7 +521,8 @@ function get_next_token(&$pos)
if ($c == "'" || // string if ($c == "'" || // string
$c == '"' || // string $c == '"' || // string
($c == '/' && ($last_type == TK_START_EXPR || $last_type == TK_END_BLOCK || $last_type == TK_OPERATOR || $last_type == TK_EOF || $last_type == TK_END_COMMAND))) { // regexp ($c == '/' &&
(($last_type == TK_WORD and $last_text == 'return') or ($last_type == TK_START_EXPR || $last_type == TK_END_BLOCK || $last_type == TK_OPERATOR || $last_type == TK_EOF || $last_type == TK_END_COMMAND)))) { // regexp
$sep = $c; $sep = $c;
$c = ''; $c = '';
$esc = false; $esc = false;