D9404.id22439.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9404.id22439.diff
View Options

	diff --git a/src/lexer/PhutilPythonFragmentLexer.php b/src/lexer/PhutilPythonFragmentLexer.php
	--- a/src/lexer/PhutilPythonFragmentLexer.php
	+++ b/src/lexer/PhutilPythonFragmentLexer.php
	@@ -195,6 +195,10 @@
	),
	);

	+ $nl = array(
	+ array('\\n', 's'),
	+ );
	+
	$strings = array(
	array(
	'%(\$\\w+\$)?[-#0 +]([0-9]+\|[])?(\\.([0-9]+\|[*]))?'.
	@@ -207,31 +211,28 @@
	// unhandled string formatting sign
	array('%', 's'),
	// newlines are an error (use $nl rules)
	- );
	-
	- $nl = array(
	- array('\\n', 's'),
	+ array('', null, '!pop'),
	);

	$dqs = array_merge(array(
	array('"', 's', '!pop'),
	// included here for raw strings
	- array('(?:\\\\\\\\\|\\\\\'\|\\\\n)', 's', '!pop'),
	+ array('(?:\\\\\\\\\|\\\\\'\|\\\\n)', 's'),
	), $strings);

	$sqs = array_merge(array(
	array('\'', 's', '!pop'),
	// included here for raw strings
	- array('(?:\\\\\\\\\|\\\\\'\|\\\\n)', 's', '!pop'),
	+ array('(?:\\\\\\\\\|\\\\\'\|\\\\n)', 's'),
	), $strings);

	$tdqs = array_merge(array(
	array('"""', 's', '!pop'),
	- ), $strings, $nl);
	+ ), $nl, $strings);

	$tsqs = array_merge(array(
	array('\'\'\'', 's', '!pop'),
	- ), $strings, $nl);
	+ ), $nl, $strings);

	return array(
	'start' => array_merge(array(