Skip to content

Commit

Permalink
Merge pull request #9 from awssat/analysis-qg4wZE
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI
  • Loading branch information
abdumu authored Apr 19, 2019
2 parents 554fcc3 + 69806d5 commit c2d1d35
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions src/ConfigFileFixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ protected function fixForVersion1_0()
'shadows\:\s*' => 'boxShadow: ',
'svgFill\:\s*' => 'fill: ',
'svgStroke\:\s*' => 'stroke: ',
'lists\:{regex_line}' => "listStylePosition:{regex_line}\nlistStyleType:{regex_line}",
'position\:{regex_line}' => "position:{regex_line}\ninset:{regex_line}",
'whitespace\:{regex_line}' => "whitespace:{regex_line}\nwordBreak:{regex_line}",
'textStyle\:{regex_line}' => "fontStyle:{regex_line}\nfontSmoothing:{regex_line}".
'lists\:{regex_line}' => "listStylePosition:{regex_line}\nlistStyleType:{regex_line}",
'position\:{regex_line}' => "position:{regex_line}\ninset:{regex_line}",
'whitespace\:{regex_line}' => "whitespace:{regex_line}\nwordBreak:{regex_line}",
'textStyle\:{regex_line}' => "fontStyle:{regex_line}\nfontSmoothing:{regex_line}".
"\ntextDecoration:{regex_line}\ntextTransform:{regex_line}",
'flexbox\:{regex_line}' => "flexDirection:{regex_line}\nflexWrap:{regex_line}".
"\nalignItems:{regex_line}\nalignSelf:{regex_line}".
Expand Down Expand Up @@ -158,7 +158,7 @@ protected function fixForVersion1_0()
$this->searchAndReplace->perform('textColor:\s*colors', 'textColor: theme => theme(\'colors\')', SearchAndReplace::NO_ESCAPE);
$this->searchAndReplace->perform('borderColor:\s*g([^\n]+)', "borderColor: theme => {\nreturn global.Object.assign({ default: theme('colors.gray.300', 'currentColor') }, theme('colors'))\n},", SearchAndReplace::NO_ESCAPE);
$this->searchAndReplace->perform('require\(\'tailwindcss\/defaultConfig\'\)\(\)', "require('tailwindcss/defaultConfig')", SearchAndReplace::NO_ESCAPE);
//TODO: use javascript beautifier package ...

//TODO: use javascript beautifier package ...
}
}
2 changes: 1 addition & 1 deletion src/SearchAndReplace.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public function perform($search, $replace, $options = null)

while (true) {
if (
strpos($search, 'regex_string') !== false
strpos($search, 'regex_string') !== false
|| strpos($search, 'regex_number') !== false
|| strpos($search, 'regex_line') !== false
) {
Expand Down

0 comments on commit c2d1d35

Please sign in to comment.