Skip to content

ignore tag <pre> #28

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
bieleski wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ignore tag <pre> #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e880ee8
ignore tag <pre>
bieleski Dec 28, 2017
e46be4e
ignore script, pre and textarea in indent
bieleski Dec 30, 2017
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
24 changes: 16 additions & 8 deletions src/Indenter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ class Indenter {
'indentation_character' => ' '
),
$inline_elements = array('b', 'big', 'i', 'small', 'tt', 'abbr', 'acronym', 'cite', 'code', 'dfn', 'em', 'kbd', 'strong', 'samp', 'var', 'a', 'bdo', 'br', 'img', 'span', 'sub', 'sup'),
$temporary_replacements_script = array(),
$ignore_elements = array('script','pre','textarea'),

$temporary_replacements_ignore = array(),
$temporary_replacements_inline = array();

const ELEMENT_TYPE_BLOCK = 0;
Expand Down Expand Up @@ -60,11 +62,13 @@ public function setElementType ($element_name, $type) {
public function indent ($input) {
$this->log = array();

// Dindent does not indent <script> body. Instead, it temporary removes it from the code, indents the input, and restores the script body.
if (preg_match_all('/<script\b[^>]*>([\s\S]*?)<\/script>/mi', $input, $matches)) {
$this->temporary_replacements_script = $matches[0];
foreach ($matches[0] as $i => $match) {
$input = str_replace($match, '<script>' . ($i + 1) . '</script>', $input);
// Dindent does not indent. Instead, it temporary removes it from the code, indents the input, and restores the script body.
foreach ($this->ignore_elements as $key) {
if (preg_match_all('/<'.$key.'\b[^>]*>([\s\S]*?)<\/'.$key.'>/mi', $input, $matches)) {
$this->temporary_replacements_ignore[$key] = $matches[0];
foreach ($matches[0] as $i => $match) {
$input = str_replace($match, '<'.$key.'>' . ($i + 1) . '</'.$key.'>', $input);
}
}
}

Expand Down Expand Up @@ -159,8 +163,12 @@ public function indent ($input) {

$output = preg_replace('/(<(\w+)[^>]*>)\s*(<\/\2>)/', '\\1\\3', $output);

foreach ($this->temporary_replacements_script as $i => $original) {
$output = str_replace('<script>' . ($i + 1) . '</script>', $original, $output);
foreach ($this->ignore_elements as $key) {
if(isset($this->temporary_replacements_ignore[$key])){
foreach ($this->temporary_replacements_ignore[$key] as $i => $original) {
$output = str_replace('<'.$key.'>' . ($i + 1) . '</'.$key.'>', $original, $output);
}
}
}

foreach ($this->temporary_replacements_inline as $i => $original) {
Expand Down