Merge pull request #8 from arkadiyt/at-lint-error

Fix LintError parsing of new category

Author: stephenmathieson

lib/filters.js

@@ -9,6 +9,7 @@ var extend = require('./extend.js');
 var defaults = {
   'build': {
     'class': true,
+    'c++11': true,
     'deprecated': true,
     'endif_comment': true,
     'explicit_make_pair': true,
@@ -27,6 +28,7 @@ var defaults = {
     'copyright': true
   },
   'readability': {
+    'alt_tokens': true,
     'braces': true,
     'casting': true,
     'check': true,
@@ -36,6 +38,7 @@ var defaults = {
     'multiline_comment': true,
     'multiline_string': true,
     'nolint': true,
+    'nul': true,
     'streams': true,
     'todo': true,
     'utf8': true
@@ -53,21 +56,20 @@ var defaults = {
     'printf': true,
     'printf_format': true,
     'references': true,
-    'rtti': true,
-    'sizeof': true,
     'string': true,
     'threadsafe_fn': true,
-    'virtual': true
+    'vlog': true
   },
   'whitespace': {
     'blank_line': true,
     'braces': true,
     'comma': true,
     'comments': true,
+    'empty_conditional_body': true,
+    'empty_loop_body': true,
     'end_of_line': true,
     'ending_newline': true,
     'indent': true,
-    'labels': true,
     'line_length': true,
     'newline': true,
     'operators': true,
@@ -113,7 +115,6 @@ function parse(str) {
   return result;
 }
 
-
 module.exports = {
   'defaults': defaults,
   'parse': parse

lib/lint-error.js

@@ -7,7 +7,7 @@ var path = require('path');
 var extend = require('./extend.js');
 
 // [whitespace/blank_line] [3]
-var category = /\[([a-z]+)\/([a-z_]+)\] \[([1-5])\]/i;
+var category = /\[([a-z]+)\/([a-z0-9_+]+)\] \[([1-5])\]/i;
 
 function LintError(line) {
   if (!line) {

test/lint-error.js

@@ -214,8 +214,33 @@ suite.addBatch({
     'should have correct level': function (err, lintError) {
       assert.equal(lintError.level, '5');
     }
-  }
+  },
 
+  'build/c++11 (5)': {
+    topic: function () {
+      var error = new LintError('src/channel.cpp:1:  <future> is an unapproved C++11 header.  [build/c++11] [5]');
+      this.callback(null, error);
+    },
+    'should have correct filename': function (err, lintError) {
+      assert.equal(lintError.file, 'src/channel.cpp');
+    },
+    'should have correct line number': function (err, lintError) {
+      assert.equal(lintError.linenumber, '1');
+    },
+    'should have correct reason': function (err, lintError) {
+      console.log(lintError);
+      assert.equal(lintError.reason, '<future> is an unapproved C++11 header.');
+    },
+    'should have correct category': function (err, lintError) {
+      assert.equal(lintError.category, 'build');
+    },
+    'should have correct sub-category': function (err, lintError) {
+      assert.equal(lintError.sub_category, 'c++11');
+    },
+    'should have correct level': function (err, lintError) {
+      assert.equal(lintError.level, '5');
+    }
+  }
 });
 
 suite.export(module);