revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2025-04-04 08:28:20 +02:00
Code Issues Releases Wiki Activity

Allow Script-and-Regex linter to have optional/empty capturing patterns for char/line

Browse source 
Summary:
See discussion in D13737. If you're using this linter to match messages which //sometimes// have a character, you can get `""` (empty string) matches when the expression doesn't match. We'll complain about these later.

Instead, cast the matches the expected types.

Test Plan: @csilvers confirmed fix, see D13737.

Reviewers: chad, csilvers

Reviewed By: csilvers

Subscribers: spicyj, csilvers

Differential Revision: https://secure.phabricator.com/D14307
This commit is contained in:
epriestley 2015-10-19 14:35:14 -07:00
parent 6c7def560d
commit e51e1c3d44
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/lint/linter/ArcanistScriptAndRegexLinter.php
View file

@ -324,7 +324,7 @@ final class ArcanistScriptAndRegexLinter extends ArcanistLinter {
* Get the line and character of the message from the regex match. * Get the line and character of the message from the regex match.
* *
* @param dict Captured groups from regex. * @param dict Captured groups from regex.
* @return pair<int,int> Line and character of the message. * @return pair<int,int|null> Line and character of the message.
* *
* @task parse * @task parse
*/ */
@ -336,8 +336,19 @@ final class ArcanistScriptAndRegexLinter extends ArcanistLinter {
return array($line + 1, $char + 1); return array($line + 1, $char + 1);
} }
$line = idx($match, 'line', 1); $line = idx($match, 'line');
if ($line) {
$line = (int)$line;
} else {
$line = 1;
}
$char = idx($match, 'char'); $char = idx($match, 'char');
if ($char) {
$char = (int)$char;
} else {
$char = null;
}
return array($line, $char); return array($line, $char);
} }