From 4404e66735c470cddd7f1cdb8aef05d9f322ad66 Mon Sep 17 00:00:00 2001 From: Joshua Spence Date: Wed, 19 Aug 2015 15:34:43 +1000 Subject: [PATCH] Improve the "inline HTML" linter rule Summary: Improve `ArcanistInlineHTMLXHPASTLinterRule` such that it doesn't raise duplicate warnings. Also be a bit more lax with whitespace. Test Plan: Unit tests now pass. Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D13896 --- src/lint/linter/ArcanistInlineHTMLXHPASTLinterRule.php | 5 +++++ src/lint/linter/__tests__/xhpast/embedded-tags.lint-test | 1 + src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test | 1 + 3 files changed, 7 insertions(+) diff --git a/src/lint/linter/ArcanistInlineHTMLXHPASTLinterRule.php b/src/lint/linter/ArcanistInlineHTMLXHPASTLinterRule.php index 3cb758ad..701b7261 100644 --- a/src/lint/linter/ArcanistInlineHTMLXHPASTLinterRule.php +++ b/src/lint/linter/ArcanistInlineHTMLXHPASTLinterRule.php @@ -22,9 +22,14 @@ final class ArcanistInlineHTMLXHPASTLinterRule continue; } + if (preg_match('/^\s*$/', $html->getValue())) { + continue; + } + $this->raiseLintAtToken( $html, pht('PHP files must only contain PHP code.')); + break; } } diff --git a/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test b/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test index d15cefb5..67018229 100644 --- a/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test +++ b/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test @@ -2,3 +2,4 @@ This shouldn't fatal the parser. ~~~~~~~~~~ +disabled:2:1 diff --git a/src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test b/src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test index 7fb52e73..dbe6aa14 100644 --- a/src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test +++ b/src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test @@ -3,6 +3,7 @@ garbage garbage ?> ~~~~~~~~~~ +disabled:1:1 error:1:1 ~~~~~~~~~~ garbage garbage