Merge branch 'master' into releases/3.3

Conflicts: package.json
SAR85 · Dec 22, 2014 · 265008d · 265008d
2 parents b4e49c7 + e50f59e
commit 265008d
Show file tree

Hide file tree

Showing 57 changed files with 2,301 additions and 1,354 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -153,7 +153,7 @@
         "space-in-parens": 0, // TODO: enable?
         "space-infix-ops": 2,
         "space-return-throw-case": 2,
-        "space-unary-word-ops": 2,
+        "space-unary-ops": 2,
         "spaced-line-comment": [2, "always"],
         "wrap-regex": 0,
 

diff --git a/appveyor.yaml b/appveyor.yaml
diff --git a/cli.js b/cli.js
@@ -71,7 +71,10 @@ cli.loadConfig = function() {
         env.opts = args.parse(env.args);
     }
     catch (e) {
-        cli.exit(1, e.message + '\n' + FATAL_ERROR_MESSAGE);
+        console.error(e.message + '\n');
+        cli.printHelp(function() {
+            cli.exit(1);
+        });
     }
 
     confPath = env.opts.configure || path.join(env.dirname, 'conf.json');
@@ -369,11 +372,13 @@ cli.parseFiles = function() {
     packageDocs.files = env.sourceFiles || [];
     docs.push(packageDocs);
 
-    logger.debug('Adding inherited symbols...');
+    logger.debug('Indexing doclets...');
     borrow.indexAll(docs);
-    augment.addInherited(docs);
-    augment.addImplemented(docs);
+    logger.debug('Adding inherited symbols, mixins, and interface implementations...');
+    augment.augmentAll(docs);
+    logger.debug('Adding borrowed doclets...');
     borrow.resolveBorrows(docs);
+    logger.debug('Post-processing complete.');
 
     app.jsdoc.parser.fireProcessingComplete(docs);