1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-23 14:00:56 +01:00

Fix PhabricatorJavelinLinter regex issue caused by D2023

Summary: D2023 adds a new '*' token to javelinsymbols (indicating that a behavior is 'installed'). This fixes a sanity-check regex in PhabricatorJavelinLinter that validates the output of javelinsymbols so that it is aware of this new token type.

Test Plan:
Patched javelinsymbols.cpp from D2023 to externals/javelin/support/javelinsymbols, build the new javelinsymbols binary, then ran

  arc lint --lintall webroot/rsrc/js/application/core/behavior-drag-and-drop-textarea.js

(before this diff, that throws an error -- after it works with no lint)

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D2025
This commit is contained in:
JeffMo 2012-03-26 16:09:55 -07:00
parent 3bacba7e9f
commit 108f51d9b4

View file

@ -216,7 +216,7 @@ final class PhabricatorJavelinLinter extends ArcanistLinter {
$symbols = explode("\n", trim($symbols)); $symbols = explode("\n", trim($symbols));
foreach ($symbols as $line) { foreach ($symbols as $line) {
$matches = null; $matches = null;
if (!preg_match('/^([?+])([^:]*):(\d+)$/', $line, $matches)) { if (!preg_match('/^([?+\*])([^:]*):(\d+)$/', $line, $matches)) {
throw new Exception( throw new Exception(
"Received malformed output from `javelinsymbols`."); "Received malformed output from `javelinsymbols`.");
} }