typescript 4.7.0-dev.20220421 → 4.7.0-dev.20220422

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.7";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220421";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220422";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -14324,10 +14324,10 @@ var ts;
         return ts.combinePaths(newDirPath, sourceFilePath);
     }
     ts.getSourceFilePathInNewDirWorker = getSourceFilePathInNewDirWorker;
-    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark, sourceFiles) {
-        host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) {
+    function writeFile(host, diagnostics, fileName, text, writeByteOrderMark, sourceFiles, data) {
+        host.writeFile(fileName, text, writeByteOrderMark, function (hostErrorMessage) {
             diagnostics.add(createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
-        }, sourceFiles);
+        }, sourceFiles, data);
     }
     ts.writeFile = writeFile;
     function ensureDirectoriesExist(directoryPath, createDirectory, directoryExists) {
@@ -61316,6 +61316,7 @@ var ts;
                         }
                     }
                     else {
+                        error(attributeDecl.expression, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         typeToIntersect = typeToIntersect ? getIntersectionType([typeToIntersect, exprType]) : exprType;
                     }
                 }
@@ -90213,6 +90214,7 @@ var ts;
             else {
                 printer.writeFile(sourceFile, writer, sourceMapGenerator);
             }
+            var sourceMapUrlPos;
             if (sourceMapGenerator) {
                 if (sourceMapDataList) {
                     sourceMapDataList.push({
@@ -90224,6 +90226,7 @@ var ts;
                 if (sourceMappingURL) {
                     if (!writer.isAtStartOfLine())
                         writer.rawWrite(newLine);
+                    sourceMapUrlPos = writer.getTextPos();
                     writer.writeComment("//# " + "sourceMappingURL" + "=" + sourceMappingURL);
                 }
                 if (sourceMapFilePath) {
@@ -90234,7 +90237,7 @@ var ts;
             else {
                 writer.writeLine();
             }
-            ts.writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), !!compilerOptions.emitBOM, sourceFiles);
+            ts.writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), !!compilerOptions.emitBOM, sourceFiles, { sourceMapUrlPos: sourceMapUrlPos });
             writer.clear();
         }
         function shouldEmitSourceMaps(mapOptions, sourceFileOrBundle) {
@@ -95206,7 +95209,11 @@ var ts;
             return newValue;
         };
         if (originalWriteFile) {
-            host.writeFile = function (fileName, data, writeByteOrderMark, onError, sourceFiles) {
+            host.writeFile = function (fileName, data) {
+                var rest = [];
+                for (var _i = 2; _i < arguments.length; _i++) {
+                    rest[_i - 2] = arguments[_i];
+                }
                 var key = toPath(fileName);
                 fileExistsCache.delete(key);
                 var value = readFileCache.get(key);
@@ -95220,7 +95227,7 @@ var ts;
                         sourceFileCache.delete(key);
                     }
                 }
-                originalWriteFile.call(host, fileName, data, writeByteOrderMark, onError, sourceFiles);
+                originalWriteFile.call.apply(originalWriteFile, __spreadArray([host, fileName, data], rest, false));
             };
         }
         if (originalDirectoryExists && originalCreateDirectory) {
@@ -96042,6 +96049,7 @@ var ts;
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
             getFileIncludeReasons: function () { return fileReasons; },
             structureIsReused: structureIsReused,
+            writeFile: writeFile,
         };
         onProgramCreateComplete();
         fileProcessingDiagnostics === null || fileProcessingDiagnostics === void 0 ? void 0 : fileProcessingDiagnostics.forEach(function (diagnostic) {
@@ -96445,7 +96453,7 @@ var ts;
                 getProjectReferenceRedirect: getProjectReferenceRedirect,
                 isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
                 getSymlinkCache: getSymlinkCache,
-                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
+                writeFile: writeFileCallback || writeFile,
                 isEmitBlocked: isEmitBlocked,
                 readFile: function (f) { return host.readFile(f); },
                 fileExists: function (f) {
@@ -96463,6 +96471,9 @@ var ts;
                 getFileIncludeReasons: program.getFileIncludeReasons,
             };
         }
+        function writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data) {
+            host.writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
+        }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!ts.outFile(options));
             ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("emit", "emitBuildInfo", {}, true);
@@ -98640,6 +98651,7 @@ var ts;
                 }
             }
         }
+        BuilderState.updateExportedModules = updateExportedModules;
         function updateExportedFilesMapFromCache(state, exportedModulesMapCache) {
             var _a;
             if (exportedModulesMapCache) {
@@ -99411,7 +99423,43 @@ var ts;
                     affected = program;
                 }
             }
-            return toAffectedFileEmitResult(state, ts.Debug.checkDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles || emitKind === 0, customTransformers), affected, emitKind, isPendingEmitFile);
+            return toAffectedFileEmitResult(state, ts.Debug.checkDefined(state.program).emit(affected === state.program ? undefined : affected, affected !== state.program && ts.getEmitDeclarations(state.compilerOptions) && !customTransformers ?
+                getWriteFileUpdatingSignatureCallback(writeFile) :
+                writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles || emitKind === 0, customTransformers), affected, emitKind, isPendingEmitFile);
+        }
+        function getWriteFileUpdatingSignatureCallback(writeFile) {
+            return function (fileName, text, writeByteOrderMark, onError, sourceFiles, data) {
+                var _a;
+                if (ts.isDeclarationFileName(fileName)) {
+                    ts.Debug.assert((sourceFiles === null || sourceFiles === void 0 ? void 0 : sourceFiles.length) === 1);
+                    var file = sourceFiles[0];
+                    var info = state.fileInfos.get(file.resolvedPath);
+                    var signature = ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.get(file.resolvedPath)) || info.signature;
+                    if (signature === file.version) {
+                        var newSignature = (computeHash || ts.generateDjb2Hash)((data === null || data === void 0 ? void 0 : data.sourceMapUrlPos) !== undefined ? text.substring(0, data.sourceMapUrlPos) : text);
+                        if (newSignature !== file.version) {
+                            if (host.storeFilesChangingSignatureDuringEmit)
+                                (state.filesChangingSignature || (state.filesChangingSignature = new ts.Set())).add(file.resolvedPath);
+                            if (state.exportedModulesMap)
+                                ts.BuilderState.updateExportedModules(file, file.exportedModulesFromDeclarationEmit, state.currentAffectedFilesExportedModulesMap || (state.currentAffectedFilesExportedModulesMap = ts.BuilderState.createManyToManyPathMap()));
+                            if (state.affectedFiles && state.affectedFilesIndex < state.affectedFiles.length) {
+                                state.currentAffectedFilesSignatures.set(file.resolvedPath, newSignature);
+                            }
+                            else {
+                                info.signature = newSignature;
+                                if (state.exportedModulesMap)
+                                    ts.BuilderState.updateExportedFilesMapFromCache(state, state.currentAffectedFilesExportedModulesMap);
+                            }
+                        }
+                    }
+                }
+                if (writeFile)
+                    writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
+                else if (host.writeFile)
+                    host.writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
+                else
+                    state.program.writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
+            };
         }
         function emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
             var _a;
@@ -99452,7 +99500,9 @@ var ts;
                     }
                 }
             }
-            return ts.Debug.checkDefined(state.program).emit(targetSourceFile, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
+            return ts.Debug.checkDefined(state.program).emit(targetSourceFile, !ts.outFile(state.compilerOptions) && ts.getEmitDeclarations(state.compilerOptions) && !customTransformers ?
+                getWriteFileUpdatingSignatureCallback(writeFile) :
+                writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
         function getSemanticDiagnosticsOfNextAffectedFile(cancellationToken, ignoreSourceFile) {
             while (true) {
@@ -101375,6 +101425,7 @@ var ts;
             createHash: ts.maybeBind(host, host.createHash),
             readDirectory: ts.maybeBind(host, host.readDirectory),
             disableUseFileVersionAsSignature: host.disableUseFileVersionAsSignature,
+            storeFilesChangingSignatureDuringEmit: host.storeFilesChangingSignatureDuringEmit,
         };
         function writeFile(fileName, text, writeByteOrderMark, onError) {
             try {
@@ -101428,6 +101479,7 @@ var ts;
             createHash: ts.maybeBind(system, system.createHash),
             createProgram: createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram,
             disableUseFileVersionAsSignature: system.disableUseFileVersionAsSignature,
+            storeFilesChangingSignatureDuringEmit: system.storeFilesChangingSignatureDuringEmit,
         };
     }
     ts.createProgramHost = createProgramHost;
@@ -101504,6 +101556,7 @@ var ts;
         var host = ts.createCompilerHostWorker(options, undefined, system);
         host.createHash = ts.maybeBind(system, system.createHash);
         host.disableUseFileVersionAsSignature = system.disableUseFileVersionAsSignature;
+        host.storeFilesChangingSignatureDuringEmit = system.storeFilesChangingSignatureDuringEmit;
         ts.setGetSourceFileAsHashVersioned(host, system);
         ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
         return host;

package/lib/tsserver.js

@@ -100,7 +100,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220421";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220422";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -18293,10 +18293,10 @@ var ts;
         return ts.combinePaths(newDirPath, sourceFilePath);
     }
     ts.getSourceFilePathInNewDirWorker = getSourceFilePathInNewDirWorker;
-    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark, sourceFiles) {
-        host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) {
+    function writeFile(host, diagnostics, fileName, text, writeByteOrderMark, sourceFiles, data) {
+        host.writeFile(fileName, text, writeByteOrderMark, function (hostErrorMessage) {
             diagnostics.add(createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
-        }, sourceFiles);
+        }, sourceFiles, data);
     }
     ts.writeFile = writeFile;
     function ensureDirectoriesExist(directoryPath, createDirectory, directoryExists) {
@@ -73432,6 +73432,7 @@ var ts;
                         }
                     }
                     else {
+                        error(attributeDecl.expression, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         typeToIntersect = typeToIntersect ? getIntersectionType([typeToIntersect, exprType]) : exprType;
                     }
                 }
@@ -109966,6 +109967,7 @@ var ts;
             else {
                 printer.writeFile(sourceFile, writer, sourceMapGenerator);
             }
+            var sourceMapUrlPos;
             if (sourceMapGenerator) {
                 if (sourceMapDataList) {
                     sourceMapDataList.push({
@@ -109977,6 +109979,7 @@ var ts;
                 if (sourceMappingURL) {
                     if (!writer.isAtStartOfLine())
                         writer.rawWrite(newLine);
+                    sourceMapUrlPos = writer.getTextPos();
                     writer.writeComment("//# " + "sourceMappingURL" + "=" + sourceMappingURL); // Tools can sometimes see this line as a source mapping url comment
                 }
                 // Write the source map
@@ -109989,7 +109992,7 @@ var ts;
                 writer.writeLine();
             }
             // Write the output file
-            ts.writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), !!compilerOptions.emitBOM, sourceFiles);
+            ts.writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), !!compilerOptions.emitBOM, sourceFiles, { sourceMapUrlPos: sourceMapUrlPos });
             // Reset state
             writer.clear();
         }
@@ -115456,7 +115459,11 @@ var ts;
             return newValue;
         };
         if (originalWriteFile) {
-            host.writeFile = function (fileName, data, writeByteOrderMark, onError, sourceFiles) {
+            host.writeFile = function (fileName, data) {
+                var rest = [];
+                for (var _i = 2; _i < arguments.length; _i++) {
+                    rest[_i - 2] = arguments[_i];
+                }
                 var key = toPath(fileName);
                 fileExistsCache.delete(key);
                 var value = readFileCache.get(key);
@@ -115470,7 +115477,7 @@ var ts;
                         sourceFileCache.delete(key);
                     }
                 }
-                originalWriteFile.call(host, fileName, data, writeByteOrderMark, onError, sourceFiles);
+                originalWriteFile.call.apply(originalWriteFile, __spreadArray([host, fileName, data], rest, false));
             };
         }
         // directoryExists
@@ -116403,6 +116410,7 @@ var ts;
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
             getFileIncludeReasons: function () { return fileReasons; },
             structureIsReused: structureIsReused,
+            writeFile: writeFile,
         };
         onProgramCreateComplete();
         // Add file processingDiagnostics
@@ -116900,7 +116908,7 @@ var ts;
                 getProjectReferenceRedirect: getProjectReferenceRedirect,
                 isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
                 getSymlinkCache: getSymlinkCache,
-                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
+                writeFile: writeFileCallback || writeFile,
                 isEmitBlocked: isEmitBlocked,
                 readFile: function (f) { return host.readFile(f); },
                 fileExists: function (f) {
@@ -116920,6 +116928,9 @@ var ts;
                 getFileIncludeReasons: program.getFileIncludeReasons,
             };
         }
+        function writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data) {
+            host.writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
+        }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!ts.outFile(options));
             ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("emit" /* Emit */, "emitBuildInfo", {}, /*separateBeginAndEnd*/ true);
@@ -119362,6 +119373,7 @@ var ts;
                 }
             }
         }
+        BuilderState.updateExportedModules = updateExportedModules;
         /**
          * Updates the exported modules from cache into state's exported modules map
          * This should be called whenever it is safe to commit the state of the builder
@@ -120326,7 +120338,43 @@ var ts;
             return toAffectedFileEmitResult(state, 
             // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
             // Otherwise just affected file
-            ts.Debug.checkDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles || emitKind === 0 /* DtsOnly */, customTransformers), affected, emitKind, isPendingEmitFile);
+            ts.Debug.checkDefined(state.program).emit(affected === state.program ? undefined : affected, affected !== state.program && ts.getEmitDeclarations(state.compilerOptions) && !customTransformers ?
+                getWriteFileUpdatingSignatureCallback(writeFile) :
+                writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles || emitKind === 0 /* DtsOnly */, customTransformers), affected, emitKind, isPendingEmitFile);
+        }
+        function getWriteFileUpdatingSignatureCallback(writeFile) {
+            return function (fileName, text, writeByteOrderMark, onError, sourceFiles, data) {
+                var _a;
+                if (ts.isDeclarationFileName(fileName)) {
+                    ts.Debug.assert((sourceFiles === null || sourceFiles === void 0 ? void 0 : sourceFiles.length) === 1);
+                    var file = sourceFiles[0];
+                    var info = state.fileInfos.get(file.resolvedPath);
+                    var signature = ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.get(file.resolvedPath)) || info.signature;
+                    if (signature === file.version) {
+                        var newSignature = (computeHash || ts.generateDjb2Hash)((data === null || data === void 0 ? void 0 : data.sourceMapUrlPos) !== undefined ? text.substring(0, data.sourceMapUrlPos) : text);
+                        if (newSignature !== file.version) { // Update it
+                            if (host.storeFilesChangingSignatureDuringEmit)
+                                (state.filesChangingSignature || (state.filesChangingSignature = new ts.Set())).add(file.resolvedPath);
+                            if (state.exportedModulesMap)
+                                ts.BuilderState.updateExportedModules(file, file.exportedModulesFromDeclarationEmit, state.currentAffectedFilesExportedModulesMap || (state.currentAffectedFilesExportedModulesMap = ts.BuilderState.createManyToManyPathMap()));
+                            if (state.affectedFiles && state.affectedFilesIndex < state.affectedFiles.length) {
+                                state.currentAffectedFilesSignatures.set(file.resolvedPath, newSignature);
+                            }
+                            else {
+                                info.signature = newSignature;
+                                if (state.exportedModulesMap)
+                                    ts.BuilderState.updateExportedFilesMapFromCache(state, state.currentAffectedFilesExportedModulesMap);
+                            }
+                        }
+                    }
+                }
+                if (writeFile)
+                    writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
+                else if (host.writeFile)
+                    host.writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
+                else
+                    state.program.writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
+            };
         }
         /**
          * Emits the JavaScript and declaration files.
@@ -120383,7 +120431,9 @@ var ts;
                     }
                 }
             }
-            return ts.Debug.checkDefined(state.program).emit(targetSourceFile, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
+            return ts.Debug.checkDefined(state.program).emit(targetSourceFile, !ts.outFile(state.compilerOptions) && ts.getEmitDeclarations(state.compilerOptions) && !customTransformers ?
+                getWriteFileUpdatingSignatureCallback(writeFile) :
+                writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
         /**
          * Return the semantic diagnostics for the next affected file or undefined if iteration is complete
@@ -122575,6 +122625,7 @@ var ts;
             createHash: ts.maybeBind(host, host.createHash),
             readDirectory: ts.maybeBind(host, host.readDirectory),
             disableUseFileVersionAsSignature: host.disableUseFileVersionAsSignature,
+            storeFilesChangingSignatureDuringEmit: host.storeFilesChangingSignatureDuringEmit,
         };
         function writeFile(fileName, text, writeByteOrderMark, onError) {
             try {
@@ -122634,6 +122685,7 @@ var ts;
             createHash: ts.maybeBind(system, system.createHash),
             createProgram: createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram,
             disableUseFileVersionAsSignature: system.disableUseFileVersionAsSignature,
+            storeFilesChangingSignatureDuringEmit: system.storeFilesChangingSignatureDuringEmit,
         };
     }
     ts.createProgramHost = createProgramHost;
@@ -122722,6 +122774,7 @@ var ts;
         var host = ts.createCompilerHostWorker(options, /*setParentNodes*/ undefined, system);
         host.createHash = ts.maybeBind(system, system.createHash);
         host.disableUseFileVersionAsSignature = system.disableUseFileVersionAsSignature;
+        host.storeFilesChangingSignatureDuringEmit = system.storeFilesChangingSignatureDuringEmit;
         ts.setGetSourceFileAsHashVersioned(host, system);
         ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
         return host;
@@ -131790,22 +131843,44 @@ var ts;
             }
         }
         function createSnippetPrinter(printerOptions) {
+            var escapes;
             var baseWriter = ts.textChanges.createWriter(ts.getNewLineCharacter(printerOptions));
             var printer = ts.createPrinter(printerOptions, baseWriter);
-            var writer = __assign(__assign({}, baseWriter), { write: function (s) { return baseWriter.write(ts.escapeSnippetText(s)); }, nonEscapingWrite: baseWriter.write, writeLiteral: function (s) { return baseWriter.writeLiteral(ts.escapeSnippetText(s)); }, writeStringLiteral: function (s) { return baseWriter.writeStringLiteral(ts.escapeSnippetText(s)); }, writeSymbol: function (s, symbol) { return baseWriter.writeSymbol(ts.escapeSnippetText(s), symbol); }, writeParameter: function (s) { return baseWriter.writeParameter(ts.escapeSnippetText(s)); }, writeComment: function (s) { return baseWriter.writeComment(ts.escapeSnippetText(s)); }, writeProperty: function (s) { return baseWriter.writeProperty(ts.escapeSnippetText(s)); } });
+            var writer = __assign(__assign({}, baseWriter), { write: function (s) { return escapingWrite(s, function () { return baseWriter.write(s); }); }, nonEscapingWrite: baseWriter.write, writeLiteral: function (s) { return escapingWrite(s, function () { return baseWriter.writeLiteral(s); }); }, writeStringLiteral: function (s) { return escapingWrite(s, function () { return baseWriter.writeStringLiteral(s); }); }, writeSymbol: function (s, symbol) { return escapingWrite(s, function () { return baseWriter.writeSymbol(s, symbol); }); }, writeParameter: function (s) { return escapingWrite(s, function () { return baseWriter.writeParameter(s); }); }, writeComment: function (s) { return escapingWrite(s, function () { return baseWriter.writeComment(s); }); }, writeProperty: function (s) { return escapingWrite(s, function () { return baseWriter.writeProperty(s); }); } });
             return {
                 printSnippetList: printSnippetList,
                 printAndFormatSnippetList: printAndFormatSnippetList,
             };
+            // The formatter/scanner will have issues with snippet-escaped text,
+            // so instead of writing the escaped text directly to the writer,
+            // generate a set of changes that can be applied to the unescaped text
+            // to escape it post-formatting.
+            function escapingWrite(s, write) {
+                var escaped = ts.escapeSnippetText(s);
+                if (escaped !== s) {
+                    var start = baseWriter.getTextPos();
+                    write();
+                    var end = baseWriter.getTextPos();
+                    escapes = ts.append(escapes || (escapes = []), { newText: escaped, span: { start: start, length: end - start } });
+                }
+                else {
+                    write();
+                }
+            }
             /* Snippet-escaping version of `printer.printList`. */
             function printSnippetList(format, list, sourceFile) {
+                var unescaped = printUnescapedSnippetList(format, list, sourceFile);
+                return escapes ? ts.textChanges.applyChanges(unescaped, escapes) : unescaped;
+            }
+            function printUnescapedSnippetList(format, list, sourceFile) {
+                escapes = undefined;
                 writer.clear();
                 printer.writeList(format, list, sourceFile, writer);
                 return writer.getText();
             }
             function printAndFormatSnippetList(format, list, sourceFile, formatContext) {
                 var syntheticFile = {
-                    text: printSnippetList(format, list, sourceFile),
+                    text: printUnescapedSnippetList(format, list, sourceFile),
                     getLineAndCharacterOfPosition: function (pos) {
                         return ts.getLineAndCharacterOfPosition(this, pos);
                     },
@@ -131817,7 +131892,10 @@ var ts;
                     /* indentation */ 0, 
                     /* delta */ 0, __assign(__assign({}, formatContext), { options: formatOptions }));
                 });
-                return ts.textChanges.applyChanges(syntheticFile.text, changes);
+                var allChanges = escapes
+                    ? ts.stableSort(ts.concatenate(changes, escapes), function (a, b) { return ts.compareTextSpans(a.span, b.span); })
+                    : changes;
+                return ts.textChanges.applyChanges(syntheticFile.text, allChanges);
             }
         }
         function originToCompletionEntryData(origin) {

package/lib/tsserverlibrary.d.ts

@@ -2172,7 +2172,9 @@ declare namespace ts {
     export type ResolvedConfigFileName = string & {
         _isResolvedConfigFileName: never;
     };
-    export type WriteFileCallback = (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void, sourceFiles?: readonly SourceFile[]) => void;
+    export interface WriteFileCallbackData {
+    }
+    export type WriteFileCallback = (fileName: string, text: string, writeByteOrderMark: boolean, onError?: (message: string) => void, sourceFiles?: readonly SourceFile[], data?: WriteFileCallbackData) => void;
     export class OperationCanceledException {
     }
     export interface CancellationToken {