D13794.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D13794.diff
View Options

	diff --git a/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test b/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test
	--- a/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test
	+++ b/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test
	@@ -2,4 +2,3 @@

	This shouldn't fatal the parser.
	~~~~~~~~~~
	-error:1:10
	diff --git a/src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test b/src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test
	--- a/src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test
	+++ b/src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test
	@@ -4,7 +4,6 @@
	?>
	~~~~~~~~~~
	error:1:1
	-error:4:1
	~~~~~~~~~~
	garbage garbage
	<?php
	diff --git a/src/lint/linter/xhpast/rules/ArcanistPHPCloseTagXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistPHPCloseTagXHPASTLinterRule.php
	--- a/src/lint/linter/xhpast/rules/ArcanistPHPCloseTagXHPASTLinterRule.php
	+++ b/src/lint/linter/xhpast/rules/ArcanistPHPCloseTagXHPASTLinterRule.php
	@@ -10,6 +10,12 @@
	}

	public function process(XHPASTNode $root) {
	+ $inline_html = $root->selectDescendantsOfType('n_INLINE_HTML');
	+
	+ if ($inline_html) {
	+ return;
	+ }
	+
	foreach ($root->selectTokensOfType('T_CLOSE_TAG') as $token) {
	$this->raiseLintAtToken(
	$token,