Skip to content

refactor: cleanup code improvment #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ddevsr wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor: cleanup code improvment #438

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b255711
refactor: remove twice implode $propertiesAndMethod
ddevsr Mar 21, 2025
6ec24e7
refactor: replace strlen static string using number instead
ddevsr Mar 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/JS.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,8 @@ protected function extractRegex()
);
$delimiters = array_fill(0, count($propertiesAndMethods), '/');
$propertiesAndMethods = array_map('preg_quote', $propertiesAndMethods, $delimiters);
$after = '(?=\s*([\.,;:\)\}&\|+]|\/\/|$|\.(' . implode('|', $propertiesAndMethods) . ')))';
$implodePropertiesAndMethod = implode('|', $propertiesAndMethods);
$after = '(?=\s*([\.,;:\)\}&\|+]|\/\/|$|\.(' . $implodePropertiesAndMethod . ')))';
$this->registerPattern('/' . $before . '\K' . $pattern . $after . '/', $callback);

// regular expressions following a `)` are rather annoying to detect...
Expand All @@ -278,7 +279,7 @@ protected function extractRegex()
// if a regex following `)` is not followed by `.<property or method>`,
// it's quite likely not a regex
$before = '\)\s*';
$after = '(?=\s*\.(' . implode('|', $propertiesAndMethods) . '))';
$after = '(?=\s*\.(' . $implodePropertiesAndMethod . '))';
$this->registerPattern('/' . $before . '\K' . $pattern . $after . '/', $callback);

// 1 more edge case: a regex can be followed by a lot more operators or
Expand Down Expand Up @@ -607,7 +608,8 @@ protected function shortenBools($content)
if ($open === $close) {
// only restore `while` if amount of `{` and `}` are the same;
// otherwise, that `for` isn't associated with this `do`
$content = substr_replace($content, 'while(!0)', $offsetWhile, strlen('for(;;)'));
// A length of 7 is assigned to the for(;;) loop.
$content = substr_replace($content, 'while(!0)', $offsetWhile, 7);
break;
}
}
Expand Down