From 22af67c1c05e47546b57e8d20976b0688724fb9f Mon Sep 17 00:00:00 2001
From: Michael Akinde <michaeloa@met.no>
Date: Thu, 14 Jan 2016 06:59:10 -0800
Subject: [PATCH] Minor fixes to arcanist cpplint

Summary:
This fixes the regex in "getLintCode..." so that it accepts lint
codes such as `build/c++11` which have become valid lint codes
in later versions of cpplint.

It also corrects the install instructions for the linter (Google's
style guide is no longer available on SVN and has been migrated to
Github).

Test Plan:
For the Regex:
- Create an .arclint in a project such as:
```
{
  "linters": {
    "cpplint": {
      "type": "cpplint",
      "severity": {
        "build/c++11": "advice"
      }
    }
  }
}
```
- Run `arc lint` with the existing linter. This should fail. Patch the linter, and this should now be accepted.

For the Instructions
- Verify the download location `wget https://raw.github.com/google/styleguide/gh-pages/cpplint/cpplint.py`

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Maniphest Tasks: T10118

Differential Revision: https://secure.phabricator.com/D15019
---
 src/lint/linter/ArcanistCpplintLinter.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lint/linter/ArcanistCpplintLinter.php b/src/lint/linter/ArcanistCpplintLinter.php
index 0b3416d9..70a387e0 100644
--- a/src/lint/linter/ArcanistCpplintLinter.php
+++ b/src/lint/linter/ArcanistCpplintLinter.php
@@ -19,9 +19,10 @@ final class ArcanistCpplintLinter extends ArcanistExternalLinter {
 
   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 '.