prettier 1.13.7 → 1.14.0

package/third-party.js

@@ -3435,7 +3435,7 @@ function readBlockMapping(state, nodeIndent, flowIndent) {
         atExplicitKey = false;
         allowCompact = true;
       } else {
-        throwError(state, 'incomplete explicit mapping pair; a key node is missed');
+        throwError(state, 'incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line');
       }
 
       state.position += 1;
@@ -4511,11 +4511,28 @@ function foldLine(line, width) {
 
 function escapeString(string) {
   var result = '';
-  var char;
+  var char, nextChar;
   var escapeSeq;
 
   for (var i = 0; i < string.length; i++) {
-    char = string.charCodeAt(i);
+    char = string.charCodeAt(i); // Check for surrogate pairs (reference Unicode 3.0 section "3.7 Surrogates").
+
+    if (char >= 0xD800 && char <= 0xDBFF
+    /* high surrogate */
+    ) {
+        nextChar = string.charCodeAt(i + 1);
+
+        if (nextChar >= 0xDC00 && nextChar <= 0xDFFF
+        /* low surrogate */
+        ) {
+            // Combine the surrogate pair and store it escaped.
+            result += encodeHex((char - 0xD800) * 0x400 + nextChar - 0xDC00 + 0x10000); // Advance index one extra since we already used that char here.
+
+            i++;
+            continue;
+          }
+      }
+
     escapeSeq = ESCAPE_SEQUENCES[char];
     result += !escapeSeq && isPrintable(char) ? string[i] : escapeSeq || encodeHex(char);
   }
@@ -4579,7 +4596,7 @@ function writeFlowMapping(state, level, object) {
       pairBuffer;
 
   for (index = 0, length = objectKeyList.length; index < length; index += 1) {
-    pairBuffer = '';
+    pairBuffer = state.condenseFlow ? '"' : '';
     if (index !== 0) pairBuffer += ', ';
     objectKey = objectKeyList[index];
     objectValue = object[objectKey];
@@ -4589,7 +4606,7 @@ function writeFlowMapping(state, level, object) {
     }
 
     if (state.dump.length > 1024) pairBuffer += '? ';
-    pairBuffer += state.dump + ':' + (state.condenseFlow ? '' : ' ');
+    pairBuffer += state.dump + (state.condenseFlow ? '"' : '') + ':' + (state.condenseFlow ? '' : ' ');
 
     if (!writeNode(state, level, objectValue, false, false)) {
       continue; // Skip this pair because of invalid value.