Page MenuHomePhabricator
Files F15375015

D9089.diff
No OneTemporary
Actions

D9089.diff
View Options

diff --git a/src/lint/engine/ArcanistConfigurationDrivenLintEngine.php b/src/lint/engine/ArcanistConfigurationDrivenLintEngine.php
--- a/src/lint/engine/ArcanistConfigurationDrivenLintEngine.php
+++ b/src/lint/engine/ArcanistConfigurationDrivenLintEngine.php
@@ -22,15 +22,21 @@
$linters = $this->loadAvailableLinters();
- PhutilTypeSpec::checkMap(
- $config,
- array(
- 'exclude' => 'optional string | list<string>',
- 'linters' => 'map<string, map<string, wild>>',
- ));
+ try {
+ PhutilTypeSpec::checkMap(
+ $config,
+ array(
+ 'exclude' => 'optional regex | list<regex>',
+ 'linters' => 'map<string, map<string, wild>>',
+ ));
+ } catch (PhutilTypeCheckException $ex) {
+ $message = pht(
+ 'Error in parsing ".arclint" file: %s',
+ $ex->getMessage());
+ throw new PhutilProxyException($message, $ex);
+ }
$global_exclude = (array)idx($config, 'exclude', array());
- $this->validateRegexps($global_exclude);
$built_linters = array();
$all_paths = $this->getPaths();
@@ -63,13 +69,21 @@
$more = array();
}
- PhutilTypeSpec::checkMap(
- $spec,
- array(
- 'type' => 'string',
- 'include' => 'optional string | list<string>',
- 'exclude' => 'optional string | list<string>',
- ) + $more);
+ try {
+ PhutilTypeSpec::checkMap(
+ $spec,
+ array(
+ 'type' => 'string',
+ 'include' => 'optional regex | list<regex>',
+ 'exclude' => 'optional regex | list<regex>',
+ ) + $more);
+ } catch (PhutilTypeCheckException $ex) {
+ $message = pht(
+ 'Error in parsing ".arclint" file, for linter "%s": %s',
+ $name,
+ $ex->getMessage());
+ throw new PhutilProxyException($message, $ex);
+ }
foreach ($more as $key => $value) {
if (array_key_exists($key, $spec)) {
@@ -90,9 +104,6 @@
$include = (array)idx($spec, 'include', array());
$exclude = (array)idx($spec, 'exclude', array());
- $this->validateRegexps($include, $name, 'include');
- $this->validateRegexps($exclude, $name, 'exclude');
-
$console = PhutilConsole::getConsole();
$console->writeLog("Examining paths for linter \"%s\".\n", $name);
$paths = $this->matchPaths(
@@ -219,30 +230,4 @@
return $match;
}
- private function validateRegexps(
- array $regexps,
- $linter = null,
- $config = null) {
-
- foreach ($regexps as $regexp) {
- $ok = @preg_match($regexp, '');
- if ($ok === false) {
- if ($linter) {
- throw new Exception(
- pht(
- 'Regular expression "%s" (in "%s" configuration for linter '.
- '"%s") is not a valid regular expression.',
- $regexp,
- $config,
- $linter));
- } else {
- throw new Exception(
- pht(
- 'Regular expression "%s" is not a valid regular expression.',
- $regexp));
- }
- }
- }
- }
-
}

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 13, 9:14 PM (3 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7632907
Default Alt Text
D9089.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility