Merge pull request #7801 from Snuffleupagus/preprocessor2-remove-comment-except-copyright

Enable removing of all comments (except for Copyright notices) when preprocessing code, and reduce the indentation level

external/builder/preprocessor2.js

@@ -203,8 +203,15 @@ function fixComments(ctx, node) {
     while (i < node.leadingComments.length) {
       var type = node.leadingComments[i].type;
       var value = node.leadingComments[i].value;
-      if (type === 'Block' &&
-          /^\s*(globals|jshint|falls through|umdutils)\b/.test(value)) {
+
+      if (ctx.saveComments === 'copyright') {
+        // Remove all comments, except Copyright notices and License headers.
+        if (!(type === 'Block' && /\bcopyright\b/i.test(value))) {
+          node.leadingComments.splice(i, 1);
+          continue;
+        }
+      } else if (type === 'Block' &&
+                 /^\s*(globals|jshint|falls through|umdutils)\b/.test(value)) {
         node.leadingComments.splice(i, 1);
         continue;
       }
@@ -245,7 +252,7 @@ function preprocessPDFJSCode(ctx, code) {
   var saveComments = !!ctx.saveComments;
   var format = ctx.format || {
     indent: {
-      style: '  ',
+      style: ' ',
       adjustMultilineComment: saveComments,
     }
   };

gulpfile.js

@@ -133,7 +133,7 @@ function bundle(filename, outfilename, pathPrefix, initFiles, amdName, defines,
   var p2 = require('./external/builder/preprocessor2.js');
   var ctx = {
     rootPath: __dirname,
-    saveComments: true,
+    saveComments: 'copyright',
     defines: builder.merge(defines, {
       BUNDLE_VERSION: versionInfo.version,
       BUNDLE_BUILD: versionInfo.commit,