prettier 1.10.1 → 1.10.2

package/{bin/prettier.js → bin-prettier.js}

@@ -9,14 +9,14 @@ var path = _interopDefault(require('path'));
 var util = _interopDefault(require('util'));
 var url = _interopDefault(require('url'));
 var assert = _interopDefault(require('assert'));
-var thirdParty = require('../third-party');
+var thirdParty = require('./third-party');
 var thirdParty__default = thirdParty['default'];
 var events = _interopDefault(require('events'));
 var readline = _interopDefault(require('readline'));
 
 var minimist = function (args, opts) {
     if (!opts) opts = {};
-
+    
     var flags = { bools : {}, strings : {}, unknownFn: null };
 
     if (typeof opts['unknown'] === 'function') {
@@ -30,7 +30,7 @@ var minimist = function (args, opts) {
           flags.bools[key] = true;
       });
     }
-
+    
     var aliases = {};
     Object.keys(opts.alias || {}).forEach(function (key) {
         aliases[key] = [].concat(opts.alias[key]);
@@ -49,12 +49,12 @@ var minimist = function (args, opts) {
      });
 
     var defaults = opts['default'] || {};
-
+    
     var argv = { _ : [] };
     Object.keys(flags.bools).forEach(function (key) {
         setArg(key, defaults[key] === undefined ? false : defaults[key]);
     });
-
+    
     var notFlags = [];
 
     if (args.indexOf('--') !== -1) {
@@ -75,7 +75,7 @@ var minimist = function (args, opts) {
         var value = !flags.strings[key] && isNumber(val)
             ? Number(val) : val;
         setKey(argv, key.split('.'), value);
-
+        
         (aliases[key] || []).forEach(function (x) {
             setKey(argv, x.split('.'), value);
         });
@@ -99,7 +99,7 @@ var minimist = function (args, opts) {
             o[key] = [ o[key], value ];
         }
     }
-
+    
     function aliasIsBoolean(key) {
       return aliases[key].some(function (x) {
           return flags.bools[x];
@@ -108,7 +108,7 @@ var minimist = function (args, opts) {
 
     for (var i = 0; i < args.length; i++) {
         var arg = args[i];
-
+        
         if (/^--.+=/.test(arg)) {
             // Using [\s\S] instead of . because js doesn't support the
             // 'dotall' regex modifier. See:
@@ -145,29 +145,29 @@ var minimist = function (args, opts) {
         }
         else if (/^-[^-]+/.test(arg)) {
             var letters = arg.slice(1,-1).split('');
-
+            
             var broken = false;
             for (var j = 0; j < letters.length; j++) {
                 var next = arg.slice(j+2);
-
+                
                 if (next === '-') {
                     setArg(letters[j], next, arg);
                     continue;
                 }
-
+                
                 if (/[A-Za-z]/.test(letters[j]) && /=/.test(next)) {
                     setArg(letters[j], next.split('=')[1], arg);
                     broken = true;
                     break;
                 }
-
+                
                 if (/[A-Za-z]/.test(letters[j])
                 && /-?\d+(\.\d*)?(e-?\d+)?$/.test(next)) {
                     setArg(letters[j], next, arg);
                     broken = true;
                     break;
                 }
-
+                
                 if (letters[j+1] && letters[j+1].match(/\W/)) {
                     setArg(letters[j], arg.slice(j+2), arg);
                     broken = true;
@@ -177,7 +177,7 @@ var minimist = function (args, opts) {
                     setArg(letters[j], flags.strings[letters[j]] ? '' : true, arg);
                 }
             }
-
+            
             var key = arg.slice(-1)[0];
             if (!broken && key !== '-') {
                 if (args[i+1] && !/^(-|--)[^-]/.test(args[i+1])
@@ -207,17 +207,17 @@ var minimist = function (args, opts) {
             }
         }
     }
-
+    
     Object.keys(defaults).forEach(function (key) {
         if (!hasKey(argv, key.split('.'))) {
             setKey(argv, key.split('.'), defaults[key]);
-
+            
             (aliases[key] || []).forEach(function (x) {
                 setKey(argv, x.split('.'), defaults[key]);
             });
         }
     });
-
+    
     if (opts['--']) {
         argv['--'] = new Array();
         notFlags.forEach(function(key) {
@@ -368,7 +368,7 @@ print = print;var _detectNewline;function _load_detectNewline() {return _detectN
                                                                                                                                                                                                                                                                                                     * This source code is licensed under the MIT license found in the
                                                                                                                                                                                                                                                                                                     * LICENSE file in the root directory of this source tree.
                                                                                                                                                                                                                                                                                                     *
-                                                                                                                                                                                                                                                                                                    *
+                                                                                                                                                                                                                                                                                                    * 
                                                                                                                                                                                                                                                                                                     */const commentEndRe = /\*\/$/;const commentStartRe = /^\/\*\*/;const docblockRe = /^\s*(\/\*\*?(.|\r?\n)*?\*\/)/;const lineCommentRe = /(^|\s+)\/\/([^\r\n]*)/g;const ltrimRe = /^\s*/;const rtrimRe = /\s*$/;const ltrimNewlineRe = /^(\r?\n)+/;const multilineRe = /(?:^|\r?\n) *(@[^\r\n]*?) *\r?\n *(?![^@\r\n]*\/\/[^]*)([^@\r\n\s][^@\r\n]+?) *\r?\n/g;const propertyRe = /(?:^|\r?\n) *@(\S+) *([^\r\n]*)/g;const stringStartRe = /(\r?\n|^) *\* ?/g;function extract(contents) {const match = contents.match(docblockRe);return match ? match[0].replace(ltrimRe, '') || '' : '';}function strip(contents) {const match = contents.match(docblockRe);return match && match[0] ? contents.substring(match[0].length) : contents;}function parse(docblock) {return parseWithComments(docblock).pragmas;}function parseWithComments(docblock) {const line = (0, (_detectNewline || _load_detectNewline()).default)(docblock) || (_os || _load_os()).EOL;docblock = docblock.replace(commentStartRe, '').replace(commentEndRe, '').replace(stringStartRe, '$1'); // Normalize multi-line directives
   let prev = '';while (prev !== docblock) {prev = docblock;docblock = docblock.replace(multilineRe, `${line}$1 $2${line}`);}docblock = docblock.replace(ltrimNewlineRe, '').replace(rtrimRe, '');const result = Object.create(null);const comments = docblock.replace(propertyRe, '').replace(ltrimNewlineRe, '').replace(rtrimRe, '');let match;while (match = propertyRe.exec(docblock)) {// strip linecomments from pragmas
     result[match[1]] = match[2].replace(lineCommentRe, '');}return { comments, pragmas: result };}function print(_ref) {var _ref$comments = _ref.comments;let comments = _ref$comments === undefined ? '' : _ref$comments;var _ref$pragmas = _ref.pragmas;let pragmas = _ref$pragmas === undefined ? {} : _ref$pragmas;const line = (0, (_detectNewline || _load_detectNewline()).default)(comments) || (_os || _load_os()).EOL;const head = '/**';
@@ -414,7 +414,7 @@ function printKeyValue(key, value) {
 unwrapExports(build);
 
 var name = "prettier";
-var version$1 = "1.10.1";
+var version$1 = "1.10.2";
 var description = "Prettier is an opinionated code formatter";
 var bin = {"prettier":"./bin/prettier.js"};
 var repository = "prettier/prettier";
@@ -424,7 +424,7 @@ var license = "MIT";
 var main = "./index.js";
 var engines = {"node":">=4"};
 var dependencies = {"@babel/code-frame":"7.0.0-beta.35","@glimmer/syntax":"0.30.3","babylon":"7.0.0-beta.34","camelcase":"4.1.0","chalk":"2.1.0","cjk-regex":"1.0.2","cosmiconfig":"3.1.0","dashify":"0.2.2","dedent":"0.7.0","diff":"3.2.0","editorconfig":"0.14.2","editorconfig-to-prettier":"0.0.6","emoji-regex":"6.5.1","escape-string-regexp":"1.0.5","esutils":"2.0.2","find-project-root":"1.1.1","flow-parser":"0.59.0","get-stream":"3.0.0","globby":"6.1.0","graphql":"0.12.3","ignore":"3.3.7","jest-docblock":"21.3.0-beta.11","jest-validate":"21.1.0","leven":"2.1.0","mem":"1.1.0","minimatch":"3.0.4","minimist":"1.2.0","parse5":"3.0.3","postcss-less":"1.1.3","postcss-media-query-parser":"0.2.3","postcss-scss":"1.0.2","postcss-selector-parser":"2.2.3","postcss-values-parser":"1.3.1","read-pkg-up":"3.0.0","remark-frontmatter":"1.1.0","remark-parse":"4.0.0","resolve":"1.5.0","semver":"5.4.1","string-width":"2.1.1","typescript":"2.7.0-insiders.20171214","typescript-eslint-parser":"11.0.0","unicode-regex":"1.0.1","unified":"6.1.6"};
-var devDependencies = {"babel-cli":"6.24.1","babel-preset-es2015":"6.24.1","codecov":"2.2.0","cross-env":"5.0.5","eslint":"4.1.1","eslint-config-prettier":"2.9.0","eslint-friendly-formatter":"3.0.0","eslint-plugin-import":"2.6.1","eslint-plugin-prettier":"2.4.0","eslint-plugin-react":"7.1.0","jest":"21.1.0","mkdirp":"0.5.1","prettier":"1.9.2","prettylint":"1.0.0","rimraf":"2.6.2","rollup":"0.47.6","rollup-plugin-commonjs":"8.2.6","rollup-plugin-json":"2.1.1","rollup-plugin-node-builtins":"2.0.0","rollup-plugin-node-globals":"1.1.0","rollup-plugin-node-resolve":"2.0.0","rollup-plugin-replace":"1.2.1","shelljs":"0.7.8","snapshot-diff":"0.2.2","strip-ansi":"4.0.0","sw-toolbox":"3.6.0","uglify-es":"3.0.28","webpack":"2.6.1"};
+var devDependencies = {"babel-cli":"6.24.1","babel-preset-es2015":"6.24.1","codecov":"2.2.0","cross-env":"5.0.5","eslint":"4.1.1","eslint-config-prettier":"2.9.0","eslint-friendly-formatter":"3.0.0","eslint-plugin-import":"2.6.1","eslint-plugin-prettier":"2.4.0","eslint-plugin-react":"7.1.0","jest":"21.1.0","mkdirp":"0.5.1","prettier":"1.10.1","prettylint":"1.0.0","rimraf":"2.6.2","rollup":"0.47.6","rollup-plugin-commonjs":"8.2.6","rollup-plugin-json":"2.1.1","rollup-plugin-node-builtins":"2.0.0","rollup-plugin-node-globals":"1.1.0","rollup-plugin-node-resolve":"2.0.0","rollup-plugin-replace":"1.2.1","shelljs":"0.7.8","snapshot-diff":"0.2.2","strip-ansi":"4.0.0","sw-toolbox":"3.6.0","uglify-es":"3.0.28","webpack":"2.6.1"};
 var scripts = {"prepublishOnly":"echo \"Error: must publish from dist/\" && exit 1","prepare-release":"yarn && yarn build && yarn test:dist","test":"jest","test:dist":"cross-env NODE_ENV=production yarn test","test-integration":"jest tests_integration","lint":"cross-env EFF_NO_LINK_RULES=true eslint . --format node_modules/eslint-friendly-formatter","lint-docs":"prettylint {.,docs,website,website/blog}/*.md","build":"node ./scripts/build/build.js","build-docs":"node ./scripts/build/build-docs.js","check-deps":"node ./scripts/check-deps.js"};
 var _package = {
 	name: name,
@@ -18473,22 +18473,18 @@ function genericPrint$5(path$$1, options, print) {
   const n = path$$1.getValue();
   const res = [];
   let index = n.start;
-  let printParent = typeof n.end === "number";
 
   path$$1.each(childPath => {
     const child = childPath.getValue();
     res.push(options.originalText.slice(index, child.start));
     res.push(childPath.call(print));
-    if (typeof child.end === "number") {
-      index = child.end;
-    } else {
-      printParent = false;
-    }
+    index = child.end;
   }, "children");
 
-  if (printParent) {
-    res.push(options.originalText.slice(index, n.end));
-  }
+  // If there are no children, we just print the node from start to end.
+  // Otherwise, index should point to the end of the last child, and we
+  // need to print the closing tag.
+  res.push(options.originalText.slice(index, n.end));
 
   // Only force a trailing newline if there were any contents.
   if (n.tag === "root" && n.children.length) {
@@ -21680,7 +21676,7 @@ printObjectProperties = printObjectProperties;const getSymbols = Object.getOwnPr
                                                                                                                * LICENSE file in the root directory of this source tree. An additional grant
                                                                                                                * of patent rights can be found in the PATENTS file in the same directory.
                                                                                                                *
-                                                                                                               *
+                                                                                                               * 
                                                                                                                */const isSymbol = key => // $FlowFixMe string literal `symbol`. This value is not a valid `typeof` return value
 typeof key === 'symbol' || toString.call(key) === '[object Symbol]'; // Return entries (for example, of a map)
 // with spacing, indentation, and comma
@@ -21737,7 +21733,7 @@ var asymmetric_matcher = createCommonjsModule(function (module, exports) {
                                                * LICENSE file in the root directory of this source tree. An additional grant
                                                * of patent rights can be found in the PATENTS file in the same directory.
                                                *
-                                               *
+                                               * 
                                                */const asymmetricMatcher = Symbol.for('jest.asymmetricMatcher');const SPACE = ' ';const serialize = exports.serialize = (val, config, indentation,
 depth,
 refs,
@@ -21859,7 +21855,7 @@ const toHumanReadableAnsi = text => {
     * LICENSE file in the root directory of this source tree. An additional grant
     * of patent rights can be found in the PATENTS file in the same directory.
     *
-    *
+    * 
     */const test = exports.test = val => typeof val === 'string' && val.match((0, _ansiRegex2.default)());const serialize = exports.serialize = (val, config, indentation,
 depth,
 refs,
@@ -21889,7 +21885,7 @@ escapeHTML; /**
              * LICENSE file in the root directory of this source tree. An additional grant
              * of patent rights can be found in the PATENTS file in the same directory.
              *
-             *
+             * 
              */function escapeHTML(str) {return str.replace(/</g, '&lt;').replace(/>/g, '&gt;');}
 });
 
@@ -21918,7 +21914,7 @@ var _escape_html2 = _interopRequireDefault(escape_html);function _interopRequire
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- *
+ * 
  */const printProps = exports.printProps = (keys, props, config, indentation, depth, refs, printer) => {
   const indentationNext = indentation + config.indent;
   const colors = config.colors;
@@ -22065,7 +22061,7 @@ var dom_element = createCommonjsModule(function (module, exports) {
                                         * LICENSE file in the root directory of this source tree. An additional grant
                                         * of patent rights can be found in the PATENTS file in the same directory.
                                         *
-                                        *
+                                        * 
                                         */
 
 
@@ -22183,7 +22179,7 @@ var immutable = createCommonjsModule(function (module, exports) {
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- *
+ * 
  */const IS_ITERABLE_SENTINEL = '@@__IMMUTABLE_ITERABLE__@@';const IS_LIST_SENTINEL = '@@__IMMUTABLE_LIST__@@';const IS_KEYED_SENTINEL = '@@__IMMUTABLE_KEYED__@@';const IS_MAP_SENTINEL = '@@__IMMUTABLE_MAP__@@';const IS_ORDERED_SENTINEL = '@@__IMMUTABLE_ORDERED__@@';const IS_RECORD_SENTINEL = '@@__IMMUTABLE_RECORD__@@'; // immutable v4
 const IS_SEQ_SENTINEL = '@@__IMMUTABLE_SEQ__@@';const IS_SET_SENTINEL = '@@__IMMUTABLE_SET__@@';const IS_STACK_SENTINEL = '@@__IMMUTABLE_STACK__@@';
 const getImmutableName = name => 'Immutable.' + name;
@@ -22421,7 +22417,7 @@ var react_element = createCommonjsModule(function (module, exports) {
                                         * LICENSE file in the root directory of this source tree. An additional grant
                                         * of patent rights can be found in the PATENTS file in the same directory.
                                         *
-                                        *
+                                        * 
                                         */const elementSymbol = Symbol.for('react.element');
 // Given element.props.children, or subtree during recursive traversal,
 // return flattened array of children.
@@ -22514,7 +22510,7 @@ var react_test_component = createCommonjsModule(function (module, exports) {
                                         * LICENSE file in the root directory of this source tree. An additional grant
                                         * of patent rights can be found in the PATENTS file in the same directory.
                                         *
-                                        *
+                                        * 
                                         */const testSymbol = Symbol.for('react.test.json');
 const serialize = exports.serialize = (
 object,
@@ -22609,7 +22605,7 @@ const toString = Object.prototype.toString; /**
                                              * LICENSE file in the root directory of this source tree. An additional grant
                                              * of patent rights can be found in the PATENTS file in the same directory.
                                              *
-                                             *
+                                             * 
                                              */const toISOString = Date.prototype.toISOString;const errorToString = Error.prototype.toString;const regExpToString = RegExp.prototype.toString;const symbolToString = Symbol.prototype.toString;const SYMBOL_REGEXP = /^Symbol\((.*)\)(.*)$/;const NEWLINE_REGEXP = /\n/gi;
 function isToStringedArrayType(toStringed) {
   return (
@@ -23133,7 +23129,7 @@ const BULLET = (_chalk || _load_chalk()).default.bold('\u25cf'); /**
                                                                   * LICENSE file in the root directory of this source tree. An additional grant
                                                                   * of patent rights can be found in the PATENTS file in the same directory.
                                                                   *
-                                                                  *
+                                                                  * 
                                                                   */const DEPRECATION = exports.DEPRECATION = `${BULLET} Deprecation Warning`;const ERROR = exports.ERROR = `${BULLET} Validation Error`;const WARNING = exports.WARNING = `${BULLET} Validation Warning`;const format = exports.format = value => typeof value === 'function' ? value.toString() : (0, (_prettyFormat || _load_prettyFormat()).default)(value, { min: true });
 
 class ValidationError extends Error {
@@ -23193,7 +23189,7 @@ function _load_utils() {return _utils = utils$4;} /**
                                                               * LICENSE file in the root directory of this source tree. An additional grant
                                                               * of patent rights can be found in the PATENTS file in the same directory.
                                                               *
-                                                              *
+                                                              * 
                                                               */const deprecationMessage = (message, options) => {const comment = options.comment;const name = options.title && options.title.deprecation || (_utils || _load_utils()).DEPRECATION;(0, (_utils || _load_utils()).logValidationWarning)(name, message, comment);};
 const deprecationWarning = exports.deprecationWarning = (
 config,
@@ -23262,7 +23258,7 @@ options) =>
     * LICENSE file in the root directory of this source tree. An additional grant
     * of patent rights can be found in the PATENTS file in the same directory.
     *
-    *
+    * 
     */
 });
 
@@ -23276,7 +23272,7 @@ var build$4 = createCommonjsModule(function (module) {
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- *
+ * 
  */
 
 'use strict';
@@ -23354,7 +23350,7 @@ function _load_utils() {return _utils = utils$4;}function _interopRequireDefault
                                                                                                                                                            * LICENSE file in the root directory of this source tree. An additional grant
                                                                                                                                                            * of patent rights can be found in the PATENTS file in the same directory.
                                                                                                                                                            *
-                                                                                                                                                           *
+                                                                                                                                                           * 
                                                                                                                                                            */const errorMessage = exports.errorMessage = (option, received, defaultValue, options) => {const message = `  Option ${(_chalk || _load_chalk()).default.bold(`"${option}"`)} must be of type:
     ${(_chalk || _load_chalk()).default.bold.green((0, (_jestGetType || _load_jestGetType()).default)(defaultValue))}
   but instead received:
@@ -23408,7 +23404,7 @@ const config = {
                                                * LICENSE file in the root directory of this source tree. An additional grant
                                                * of patent rights can be found in the PATENTS file in the same directory.
                                                *
-                                               *
+                                               * 
                                                */exports.default = config;
 });
 
@@ -23434,7 +23430,7 @@ validationCondition; /**
                       * LICENSE file in the root directory of this source tree. An additional grant
                       * of patent rights can be found in the PATENTS file in the same directory.
                       *
-                      *
+                      * 
                       */const toString = Object.prototype.toString;function validationCondition(option, validOption) {return option === null || option === undefined || toString.call(option) === toString.call(validOption);
 }
 });
@@ -23480,7 +23476,7 @@ function _load_utils() {return _utils = utils$4;}function _interopRequireDefault
                                                                     * LICENSE file in the root directory of this source tree. An additional grant
                                                                     * of patent rights can be found in the PATENTS file in the same directory.
                                                                     *
-                                                                    *
+                                                                    * 
                                                                     */
 });
 
@@ -23506,7 +23502,7 @@ function _load_default_config() {return _default_config = _interopRequireDefault
                                                                                                                                                                                                               * LICENSE file in the root directory of this source tree. An additional grant
                                                                                                                                                                                                               * of patent rights can be found in the PATENTS file in the same directory.
                                                                                                                                                                                                               *
-                                                                                                                                                                                                              *
+                                                                                                                                                                                                              * 
                                                                                                                                                                                                               */const _validate = (config, options) => {let hasDeprecationWarnings = false;for (const key in config) {if (options.deprecatedConfig && key in options.deprecatedConfig &&
     typeof options.deprecate === 'function')
     {
@@ -23582,7 +23578,7 @@ function _load_validate() {return _validate = _interopRequireDefault(validate_1)
                                                                                                                                                                                             * LICENSE file in the root directory of this source tree. An additional grant
                                                                                                                                                                                             * of patent rights can be found in the PATENTS file in the same directory.
                                                                                                                                                                                             *
-                                                                                                                                                                                            *
+                                                                                                                                                                                            * 
                                                                                                                                                                                             */module.exports = { ValidationError: (_utils || _load_utils()).ValidationError, createDidYouMeanMessage: (_utils || _load_utils()).createDidYouMeanMessage, format: (_utils || _load_utils()).format, logValidationWarning: (_utils || _load_utils()).logValidationWarning, validate: (_validate || _load_validate()).default };
 });
 
@@ -27126,7 +27122,7 @@ PromiseArray.prototype._init = function init(_, resolveValueIfEmpty) {
     if (values instanceof Promise) {
         values = values._target();
         var bitField = values._bitField;
-
+        
         this._values = values;
 
         if (((bitField & 50397184) === 0)) {
@@ -27647,14 +27643,14 @@ Promise.prototype._execute = function(executor, resolve, reject) {
 Promise.prototype._onCancel = function () {};
 Promise.prototype._setOnCancel = function (handler) {  };
 Promise.prototype._attachCancellationCallback = function(onCancel) {
-
+    
 };
 Promise.prototype._captureStackTrace = function () {};
 Promise.prototype._attachExtraTrace = function () {};
 Promise.prototype._clearCancellationData = function() {};
 Promise.prototype._propagateFrom = function (parent, flags) {
-
-
+    
+    
 };
 
 function cancellationExecute(executor, resolve, reject) {
@@ -29022,7 +29018,7 @@ Promise.join = function () {
                     if (maybePromise instanceof Promise) {
                         maybePromise = maybePromise._target();
                         var bitField = maybePromise._bitField;
-
+                        
                         if (((bitField & 50397184) === 0)) {
                             maybePromise._then(callbacks[i], reject,
                                                undefined, ret, holder);
@@ -29139,7 +29135,7 @@ MappingPromiseArray.prototype._promiseFulfilled = function (value, index) {
         if (maybePromise instanceof Promise) {
             maybePromise = maybePromise._target();
             var bitField = maybePromise._bitField;
-
+            
             if (((bitField & 50397184) === 0)) {
                 if (limit >= 1) this._inFlight++;
                 values[index] = maybePromise;
@@ -29841,7 +29837,7 @@ PromiseSpawn.prototype._continue = function (result) {
         }
         maybePromise = maybePromise._target();
         var bitField = maybePromise._bitField;
-
+        
         if (((bitField & 50397184) === 0)) {
             this._yieldedPromise = maybePromise;
             maybePromise._proxy(this, null);
@@ -30467,8 +30463,8 @@ function ReductionPromiseArray(promises, fn, initialValue, _each) {
 util$$1.inherits(ReductionPromiseArray, PromiseArray);
 
 ReductionPromiseArray.prototype._gotAccum = function(accum) {
-    if (this._eachValues !== undefined &&
-        this._eachValues !== null &&
+    if (this._eachValues !== undefined && 
+        this._eachValues !== null && 
         accum !== INTERNAL) {
         this._eachValues.push(accum);
     }
@@ -31611,28 +31607,28 @@ some(Promise, PromiseArray, apiRejection);
 filter$1(Promise, INTERNAL);
 each(Promise, INTERNAL);
 any(Promise);
-
-    util$$1.toFastProperties(Promise);
-    util$$1.toFastProperties(Promise.prototype);
-    function fillTypes(value) {
-        var p = new Promise(INTERNAL);
-        p._fulfillmentHandler0 = value;
-        p._rejectionHandler0 = value;
-        p._promise0 = value;
-        p._receiver0 = value;
-    }
-    // Complete slack tracking, opt out of field-type tracking and
-    // stabilize map
-    fillTypes({a: 1});
-    fillTypes({b: 2});
-    fillTypes({c: 3});
-    fillTypes(1);
-    fillTypes(function(){});
-    fillTypes(undefined);
-    fillTypes(false);
-    fillTypes(new Promise(INTERNAL));
-    debug.setBounds(Async.firstLineError, util$$1.lastLineError);
-    return Promise;
+                                                         
+    util$$1.toFastProperties(Promise);                                          
+    util$$1.toFastProperties(Promise.prototype);                                
+    function fillTypes(value) {                                              
+        var p = new Promise(INTERNAL);                                       
+        p._fulfillmentHandler0 = value;                                      
+        p._rejectionHandler0 = value;                                        
+        p._promise0 = value;                                                 
+        p._receiver0 = value;                                                
+    }                                                                        
+    // Complete slack tracking, opt out of field-type tracking and           
+    // stabilize map                                                         
+    fillTypes({a: 1});                                                       
+    fillTypes({b: 2});                                                       
+    fillTypes({c: 3});                                                       
+    fillTypes(1);                                                            
+    fillTypes(function(){});                                                 
+    fillTypes(undefined);                                                    
+    fillTypes(false);                                                        
+    fillTypes(new Promise(INTERNAL));                                        
+    debug.setBounds(Async.firstLineError, util$$1.lastLineError);               
+    return Promise;                                                          
 
 };
 });
@@ -33643,12 +33639,12 @@ function traverseFolder (directory, levels, markers) {
   }
 }
 
-var findProjectRoot = function findRoot(dir, opts) {
+var findProjectRoot = function findRoot(dir, opts) { 
   if (!dir) throw new Error("Directory not defined");
   opts = opts || {};
   var levels  = opts.maxDepth || findRoot.MAX_DEPTH;
   var markers = opts.markers  || findRoot.MARKERS;
-  return traverseFolder(dir, levels, markers);
+  return traverseFolder(dir, levels, markers); 
 };
 
 var MAX_DEPTH = 9;
@@ -39406,7 +39402,6 @@ exports. /*istanbul ignore end*/Diff = _base2['default'];
 
 unwrapExports(lib$5);
 
-const prettier$4 = require("../index");
 const cleanAST = cleanAst.cleanAST;
 
 
@@ -39501,7 +39496,7 @@ function listDifferent(argv, input, options, filename) {
 
   options = Object.assign({}, options, { filepath: filename });
 
-  if (!prettier$4.check(input, options)) {
+  if (!prettier$2.check(input, options)) {
     if (!argv["write"]) {
       logger.log(filename);
     }
@@ -39513,13 +39508,13 @@ function listDifferent(argv, input, options, filename) {
 
 function format$1(argv, input, opt) {
   if (argv["debug-print-doc"]) {
-    const doc = prettier$4.__debug.printToDoc(input, opt);
-    return { formatted: prettier$4.__debug.formatDoc(doc) };
+    const doc = prettier$2.__debug.printToDoc(input, opt);
+    return { formatted: prettier$2.__debug.formatDoc(doc) };
   }
 
   if (argv["debug-check"]) {
-    const pp = prettier$4.format(input, opt);
-    const pppp = prettier$4.format(pp, opt);
+    const pp = prettier$2.format(input, opt);
+    const pppp = prettier$2.format(pp, opt);
     if (pp !== pppp) {
       throw new errors$2.DebugError(
         "prettier(input) !== prettier(prettier(input))\n" + diff(pp, pppp)
@@ -39527,11 +39522,11 @@ function format$1(argv, input, opt) {
     } else {
       const normalizedOpts = normalizeOptions$1(opt);
       const ast = cleanAST(
-        prettier$4.__debug.parse(input, opt).ast,
+        prettier$2.__debug.parse(input, opt).ast,
         normalizedOpts
       );
       const past = cleanAST(
-        prettier$4.__debug.parse(pp, opt).ast,
+        prettier$2.__debug.parse(pp, opt).ast,
         normalizedOpts
       );
 
@@ -39552,7 +39547,7 @@ function format$1(argv, input, opt) {
     return { formatted: opt.filepath || "(stdin)\n" };
   }
 
-  return prettier$4.formatWithCursor(input, opt);
+  return prettier$2.formatWithCursor(input, opt);
 }
 
 function getOptionsOrDie(argv, filePath) {

package/index.js

@@ -176,7 +176,7 @@ function printKeyValue(key, value) {
 unwrapExports(build);
 
 var name = "prettier";
-var version$1 = "1.10.1";
+var version$1 = "1.10.2";
 var description = "Prettier is an opinionated code formatter";
 var bin = {"prettier":"./bin/prettier.js"};
 var repository = "prettier/prettier";
@@ -186,7 +186,7 @@ var license = "MIT";
 var main = "./index.js";
 var engines = {"node":">=4"};
 var dependencies = {"@babel/code-frame":"7.0.0-beta.35","@glimmer/syntax":"0.30.3","babylon":"7.0.0-beta.34","camelcase":"4.1.0","chalk":"2.1.0","cjk-regex":"1.0.2","cosmiconfig":"3.1.0","dashify":"0.2.2","dedent":"0.7.0","diff":"3.2.0","editorconfig":"0.14.2","editorconfig-to-prettier":"0.0.6","emoji-regex":"6.5.1","escape-string-regexp":"1.0.5","esutils":"2.0.2","find-project-root":"1.1.1","flow-parser":"0.59.0","get-stream":"3.0.0","globby":"6.1.0","graphql":"0.12.3","ignore":"3.3.7","jest-docblock":"21.3.0-beta.11","jest-validate":"21.1.0","leven":"2.1.0","mem":"1.1.0","minimatch":"3.0.4","minimist":"1.2.0","parse5":"3.0.3","postcss-less":"1.1.3","postcss-media-query-parser":"0.2.3","postcss-scss":"1.0.2","postcss-selector-parser":"2.2.3","postcss-values-parser":"1.3.1","read-pkg-up":"3.0.0","remark-frontmatter":"1.1.0","remark-parse":"4.0.0","resolve":"1.5.0","semver":"5.4.1","string-width":"2.1.1","typescript":"2.7.0-insiders.20171214","typescript-eslint-parser":"11.0.0","unicode-regex":"1.0.1","unified":"6.1.6"};
-var devDependencies = {"babel-cli":"6.24.1","babel-preset-es2015":"6.24.1","codecov":"2.2.0","cross-env":"5.0.5","eslint":"4.1.1","eslint-config-prettier":"2.9.0","eslint-friendly-formatter":"3.0.0","eslint-plugin-import":"2.6.1","eslint-plugin-prettier":"2.4.0","eslint-plugin-react":"7.1.0","jest":"21.1.0","mkdirp":"0.5.1","prettier":"1.9.2","prettylint":"1.0.0","rimraf":"2.6.2","rollup":"0.47.6","rollup-plugin-commonjs":"8.2.6","rollup-plugin-json":"2.1.1","rollup-plugin-node-builtins":"2.0.0","rollup-plugin-node-globals":"1.1.0","rollup-plugin-node-resolve":"2.0.0","rollup-plugin-replace":"1.2.1","shelljs":"0.7.8","snapshot-diff":"0.2.2","strip-ansi":"4.0.0","sw-toolbox":"3.6.0","uglify-es":"3.0.28","webpack":"2.6.1"};
+var devDependencies = {"babel-cli":"6.24.1","babel-preset-es2015":"6.24.1","codecov":"2.2.0","cross-env":"5.0.5","eslint":"4.1.1","eslint-config-prettier":"2.9.0","eslint-friendly-formatter":"3.0.0","eslint-plugin-import":"2.6.1","eslint-plugin-prettier":"2.4.0","eslint-plugin-react":"7.1.0","jest":"21.1.0","mkdirp":"0.5.1","prettier":"1.10.1","prettylint":"1.0.0","rimraf":"2.6.2","rollup":"0.47.6","rollup-plugin-commonjs":"8.2.6","rollup-plugin-json":"2.1.1","rollup-plugin-node-builtins":"2.0.0","rollup-plugin-node-globals":"1.1.0","rollup-plugin-node-resolve":"2.0.0","rollup-plugin-replace":"1.2.1","shelljs":"0.7.8","snapshot-diff":"0.2.2","strip-ansi":"4.0.0","sw-toolbox":"3.6.0","uglify-es":"3.0.28","webpack":"2.6.1"};
 var scripts = {"prepublishOnly":"echo \"Error: must publish from dist/\" && exit 1","prepare-release":"yarn && yarn build && yarn test:dist","test":"jest","test:dist":"cross-env NODE_ENV=production yarn test","test-integration":"jest tests_integration","lint":"cross-env EFF_NO_LINK_RULES=true eslint . --format node_modules/eslint-friendly-formatter","lint-docs":"prettylint {.,docs,website,website/blog}/*.md","build":"node ./scripts/build/build.js","build-docs":"node ./scripts/build/build-docs.js","check-deps":"node ./scripts/check-deps.js"};
 var _package = {
 	name: name,
@@ -18186,22 +18186,18 @@ function genericPrint$5(path$$1, options, print) {
   const n = path$$1.getValue();
   const res = [];
   let index = n.start;
-  let printParent = typeof n.end === "number";
 
   path$$1.each(childPath => {
     const child = childPath.getValue();
     res.push(options.originalText.slice(index, child.start));
     res.push(childPath.call(print));
-    if (typeof child.end === "number") {
-      index = child.end;
-    } else {
-      printParent = false;
-    }
+    index = child.end;
   }, "children");
 
-  if (printParent) {
-    res.push(options.originalText.slice(index, n.end));
-  }
+  // If there are no children, we just print the node from start to end.
+  // Otherwise, index should point to the end of the last child, and we
+  // need to print the closing tag.
+  res.push(options.originalText.slice(index, n.end));
 
   // Only force a trailing newline if there were any contents.
   if (n.tag === "root" && n.children.length) {

package/package.json

@@ -1,10 +1,8 @@
 {
   "name": "prettier",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "description": "Prettier is an opinionated code formatter",
-  "bin": {
-    "prettier": "./bin/prettier.js"
-  },
+  "bin": "./bin-prettier.js",
   "repository": "prettier/prettier",
   "homepage": "https://prettier.io",
   "author": "James Long",
@@ -26,7 +24,7 @@
     "eslint-plugin-react": "7.1.0",
     "jest": "21.1.0",
     "mkdirp": "0.5.1",
-    "prettier": "1.9.2",
+    "prettier": "1.10.1",
     "prettylint": "1.0.0",
     "rimraf": "2.6.2",
     "rollup": "0.47.6",

package/parser-vue.js

@@ -1 +1 @@
-"use strict";function makeMap(t,e){const n=Object.create(null),a=t.split(",");for(let t=0;t<a.length;t++)n[a[t]]=!0;return e?t=>n[t.toLowerCase()]:t=>n[t]}function decodeAttr(t,e){const n=e?encodedAttrWithNewLines:encodedAttr;return t.replace(n,t=>decodingMap[t])}function parseHTML(t,e){function n(e){d+=e,t=t.substring(e)}function a(t,n,a){let o,s;if(null==n&&(n=d),null==a&&(a=d),t&&(s=t.toLowerCase()),t)for(o=r.length-1;o>=0&&r[o].lowerCasedTag!==s;o--);else o=0;if(o>=0){for(let s=r.length-1;s>=o;s--)"production"!==process.env.NODE_ENV&&(s>o||!t)&&e.warn&&e.warn(`tag <${r[s].tag}> has no matching end tag.`),e.end&&e.end(r[s].tag,n,a);r.length=o,l=o&&r[o-1].tag}else"br"===s?e.start&&e.start(t,[],!0,n,a):"p"===s&&(e.start&&e.start(t,[],!1,n,a),e.end&&e.end(t,n,a))}const r=[],o=e.expectHTML,s=e.isUnaryTag||no,c=e.canBeLeftOpenTag||no;let i,l,d=0;for(;t;){if(i=t,l&&isPlainTextElement(l)){let n=0;const r=l.toLowerCase(),o=reCache[r]||(reCache[r]=new RegExp("([\\s\\S]*?)(</"+r+"[^>]*>)","i")),s=t.replace(o,(t,a,o)=>(n=o.length,isPlainTextElement(r)||"noscript"===r||(a=a.replace(/<!--([\s\S]*?)-->/g,"$1").replace(/<!\[CDATA\[([\s\S]*?)]]>/g,"$1")),shouldIgnoreFirstNewline(r,a)&&(a=a.slice(1)),e.chars&&e.chars(a),""));d+=t.length-s.length,t=s,a(r,d-n,d)}else{let i=t.indexOf("<");if(0===i){if(comment.test(t)){const a=t.indexOf("--\x3e");if(a>=0){e.shouldKeepComment&&e.comment(t.substring(4,a)),n(a+3);continue}}if(conditionalComment.test(t)){const e=t.indexOf("]>");if(e>=0){n(e+2);continue}}const i=t.match(doctype);if(i){n(i[0].length);continue}const g=t.match(endTag);if(g){const t=d;n(g[0].length),a(g[1],t,d);continue}const h=function(){const e=t.match(startTagOpen);if(e){const a={tagName:e[1],attrs:[],start:d};n(e[0].length);let r,o;for(;!(r=t.match(startTagClose))&&(o=t.match(attribute));)n(o[0].length),a.attrs.push(o);if(r)return a.unarySlash=r[1],n(r[0].length),a.end=d,a}}();if(h){!function(t){const n=t.tagName,i=t.unarySlash;o&&("p"===l&&isNonPhrasingTag(n)&&a(l),c(n)&&l===n&&a(n));const d=s(n)||!!i,g=t.attrs.length,h=new Array(g);for(let a=0;a<g;a++){const r=t.attrs[a];IS_REGEX_CAPTURING_BROKEN&&-1===r[0].indexOf('""')&&(""===r[3]&&delete r[3],""===r[4]&&delete r[4],""===r[5]&&delete r[5]);const o=r[3]||r[4]||r[5]||"",s="a"===n&&"href"===r[1]?e.shouldDecodeNewlinesForHref:e.shouldDecodeNewlines;h[a]={name:r[1],value:decodeAttr(o,s)}}d||(r.push({tag:n,lowerCasedTag:n.toLowerCase(),attrs:h}),l=n),e.start&&e.start(n,h,d,t.start,t.end)}(h),shouldIgnoreFirstNewline(l,t)&&n(1);continue}}let g,h,u;if(i>=0){for(h=t.slice(i);!(endTag.test(h)||startTagOpen.test(h)||comment.test(h)||conditionalComment.test(h)||(u=h.indexOf("<",1))<0);)i+=u,h=t.slice(i);g=t.substring(0,i),n(i)}i<0&&(g=t,t=""),e.chars&&g&&e.chars(g)}if(t===i){e.chars&&e.chars(t),"production"!==process.env.NODE_ENV&&!r.length&&e.warn&&e.warn(`Mal-formatted tag at end of template: "${t}"`);break}}a()}function parse(t){const e={tag:"root",attrs:[],unary:!1,start:0,contentStart:0,contentEnd:t.length,end:t.length,children:[],comments:[]},n=[e];let a=e;return parseHTML(t,{start:function(t,e,r,o,s){const c={tag:t,attrs:e,unary:r,start:o,contentStart:s,children:[]};a.children.push(c),n.push(c),a=c},end:function(t,e,r){n.pop(),a.contentEnd=e,a.end=r,a=n[n.length-1]}}),e}const no=()=>!1,isNonPhrasingTag=makeMap("address,article,aside,base,blockquote,body,caption,col,colgroup,dd,details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,title,tr,track"),attribute=/^\s*([^\s"'<>/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,ncname="[a-zA-Z_][\\w\\-\\.]*",qnameCapture=`((?:${ncname}\\:)?${ncname})`,startTagOpen=new RegExp(`^<${qnameCapture}`),startTagClose=/^\s*(\/?)>/,endTag=new RegExp(`^<\\/${qnameCapture}[^>]*>`),doctype=/^<!DOCTYPE [^>]+>/i,comment=/^<!--/,conditionalComment=/^<!\[/;let IS_REGEX_CAPTURING_BROKEN=!1;"x".replace(/x(.)?/g,(t,e)=>{IS_REGEX_CAPTURING_BROKEN=""===e});const isPlainTextElement=makeMap("script,style,textarea",!0),reCache={},decodingMap={"&lt;":"<","&gt;":">","&quot;":'"',"&amp;":"&","&#10;":"\n","&#9;":"\t"},encodedAttr=/&(?:lt|gt|quot|amp);/g,encodedAttrWithNewLines=/&(?:lt|gt|quot|amp|#10|#9);/g,isIgnoreNewlineTag=makeMap("pre,textarea",!0),shouldIgnoreFirstNewline=(t,e)=>t&&isIgnoreNewlineTag(t)&&"\n"===e[0];var parserVue=parse;module.exports=parserVue;
+"use strict";function makeMap(e,t){const n=Object.create(null),a=e.split(",");for(let e=0;e<a.length;e++)n[a[e]]=!0;return t?e=>n[e.toLowerCase()]:e=>n[e]}function decodeAttr(e,t){const n=t?encodedAttrWithNewLines:encodedAttr;return e.replace(n,e=>decodingMap[e])}function parseHTML(e,t){function n(t){d+=t,e=e.substring(t)}function a(e,n,a){let o,s;if(null==n&&(n=d),null==a&&(a=d),e&&(s=e.toLowerCase()),e)for(o=r.length-1;o>=0&&r[o].lowerCasedTag!==s;o--);else o=0;if(o>=0){for(let s=r.length-1;s>=o;s--)"production"!==process.env.NODE_ENV&&(s>o||!e)&&t.warn&&t.warn(`tag <${r[s].tag}> has no matching end tag.`),t.end&&t.end(r[s].tag,n,a);r.length=o,l=o&&r[o-1].tag}else"br"===s?t.start&&t.start(e,[],!0,n,a):"p"===s&&(t.start&&t.start(e,[],!1,n,a),t.end&&t.end(e,n,a))}const r=[],o=t.expectHTML,s=t.isUnaryTag||no,c=t.canBeLeftOpenTag||no;let i,l,d=0;for(;e;){if(i=e,l&&isPlainTextElement(l)){let n=0;const r=l.toLowerCase(),o=reCache[r]||(reCache[r]=new RegExp("([\\s\\S]*?)(</"+r+"[^>]*>)","i")),s=e.replace(o,(e,a,o)=>(n=o.length,isPlainTextElement(r)||"noscript"===r||(a=a.replace(/<!--([\s\S]*?)-->/g,"$1").replace(/<!\[CDATA\[([\s\S]*?)]]>/g,"$1")),shouldIgnoreFirstNewline(r,a)&&(a=a.slice(1)),t.chars&&t.chars(a),""));d+=e.length-s.length,e=s,a(r,d-n,d)}else{let i=e.indexOf("<");if(0===i){if(comment.test(e)){const a=e.indexOf("--\x3e");if(a>=0){t.shouldKeepComment&&t.comment(e.substring(4,a)),n(a+3);continue}}if(conditionalComment.test(e)){const t=e.indexOf("]>");if(t>=0){n(t+2);continue}}const i=e.match(doctype);if(i){n(i[0].length);continue}const g=e.match(endTag);if(g){const e=d;n(g[0].length),a(g[1],e,d);continue}const h=function(){const t=e.match(startTagOpen);if(t){const a={tagName:t[1],attrs:[],start:d};n(t[0].length);let r,o;for(;!(r=e.match(startTagClose))&&(o=e.match(attribute));)n(o[0].length),a.attrs.push(o);if(r)return a.unarySlash=r[1],n(r[0].length),a.end=d,a}}();if(h){!function(e){const n=e.tagName,i=e.unarySlash;o&&("p"===l&&isNonPhrasingTag(n)&&a(l),c(n)&&l===n&&a(n));const d=s(n)||!!i,g=e.attrs.length,h=new Array(g);for(let a=0;a<g;a++){const r=e.attrs[a];IS_REGEX_CAPTURING_BROKEN&&-1===r[0].indexOf('""')&&(""===r[3]&&delete r[3],""===r[4]&&delete r[4],""===r[5]&&delete r[5]);const o=r[3]||r[4]||r[5]||"",s="a"===n&&"href"===r[1]?t.shouldDecodeNewlinesForHref:t.shouldDecodeNewlines;h[a]={name:r[1],value:decodeAttr(o,s)}}d||(r.push({tag:n,lowerCasedTag:n.toLowerCase(),attrs:h}),l=n),t.start&&t.start(n,h,d,e.start,e.end)}(h),shouldIgnoreFirstNewline(l,e)&&n(1);continue}}let g,h,u;if(i>=0){for(h=e.slice(i);!(endTag.test(h)||startTagOpen.test(h)||comment.test(h)||conditionalComment.test(h)||(u=h.indexOf("<",1))<0);)i+=u,h=e.slice(i);g=e.substring(0,i),n(i)}i<0&&(g=e,e=""),t.chars&&g&&t.chars(g)}if(e===i){t.chars&&t.chars(e),"production"!==process.env.NODE_ENV&&!r.length&&t.warn&&t.warn(`Mal-formatted tag at end of template: "${e}"`);break}}a()}function parse(e){const t={tag:"root",attrs:[],unary:!1,start:0,contentStart:0,contentEnd:e.length,end:e.length,children:[],comments:[]},n=[t];let a=t;return parseHTML(e,{start:function(e,t,r,o,s){const c={tag:e,attrs:t,unary:r,start:o,children:[]};a.children.push(c),r?c.end=s:(c.contentStart=s,n.push(c),a=c)},end:function(e,t,r){n.pop(),a.contentEnd=t,a.end=r,a=n[n.length-1]}}),t}const no=()=>!1,isNonPhrasingTag=makeMap("address,article,aside,base,blockquote,body,caption,col,colgroup,dd,details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,title,tr,track"),attribute=/^\s*([^\s"'<>/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,ncname="[a-zA-Z_][\\w\\-\\.]*",qnameCapture=`((?:${ncname}\\:)?${ncname})`,startTagOpen=new RegExp(`^<${qnameCapture}`),startTagClose=/^\s*(\/?)>/,endTag=new RegExp(`^<\\/${qnameCapture}[^>]*>`),doctype=/^<!DOCTYPE [^>]+>/i,comment=/^<!--/,conditionalComment=/^<!\[/;let IS_REGEX_CAPTURING_BROKEN=!1;"x".replace(/x(.)?/g,(e,t)=>{IS_REGEX_CAPTURING_BROKEN=""===t});const isPlainTextElement=makeMap("script,style,textarea",!0),reCache={},decodingMap={"&lt;":"<","&gt;":">","&quot;":'"',"&amp;":"&","&#10;":"\n","&#9;":"\t"},encodedAttr=/&(?:lt|gt|quot|amp);/g,encodedAttrWithNewLines=/&(?:lt|gt|quot|amp|#10|#9);/g,isIgnoreNewlineTag=makeMap("pre,textarea",!0),shouldIgnoreFirstNewline=(e,t)=>e&&isIgnoreNewlineTag(e)&&"\n"===t[0];var parserVue=parse;module.exports=parserVue;