revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-26 00:32:41 +01:00
Code Issues Releases Wiki Activity

(stable) Promote 2016 Week 3

Browse source
This commit is contained in:
epriestley 2016-01-15 09:10:00 -08:00
commit 2412c31346
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/lint/linter/ArcanistCpplintLinter.php
View file

@ -14,14 +14,15 @@ final class ArcanistCpplintLinter extends ArcanistExternalLinter {
}
public function getDefaultBinary() {
return 'cpplint';
return 'cpplint.py';
}
public function getInstallInstructions() {
return pht(
'Install cpplint.py using `%s`.',
'wget http://google-styleguide.googlecode.com'.
'/svn/trunk/cpplint/cpplint.py');
'Install cpplint.py using `%s`, and place it in your path with the '.
'appropriate permissions set.',
'wget https://raw.github.com'.
'/google/styleguide/gh-pages/cpplint/cpplint.py');
}
protected function getDefaultMessageSeverity($code) {
@ -60,7 +61,7 @@ final class ArcanistCpplintLinter extends ArcanistExternalLinter {
}
protected function getLintCodeFromLinterConfigurationKey($code) {
if (!preg_match('@^[a-z_]+/[a-z_]+$@', $code)) {
if (!preg_match('@^[a-z_]+/[a-z0-9_+]+$@', $code)) {
throw new Exception(
pht(
'Unrecognized lint message code "%s". Expected a valid cpplint '.

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

@ -108,7 +108,8 @@
* not specified, defaults to the linted file. It is generally not necessary
* to capture this unless the linter can raise messages in files other than
* the one it is linting.
* - `line` (optional) The line number of the message.
* - `line` (optional) The line number of the message. If no text is
* captured, the message is assumed to affect the entire file.
* - `char` (optional) The character offset of the message.
* - `offset` (optional) The byte offset of the message. If captured, this
* supersedes `line` and `char`.
@ -324,7 +325,7 @@ final class ArcanistScriptAndRegexLinter extends ArcanistLinter {
* Get the line and character of the message from the regex match.
*
* @param dict Captured groups from regex.
* @return pair<int,int|null> Line and character of the message.
* @return pair<int|null,int|null> Line and character of the message.
*
* @task parse
*/
@ -337,10 +338,13 @@ final class ArcanistScriptAndRegexLinter extends ArcanistLinter {
}
$line = idx($match, 'line');
if ($line) {
if (strlen($line)) {
$line = (int)$line;
if (!$line) {
$line = 1;
}
} else {
$line = 1;
$line = null;
}
$char = idx($match, 'char');