typescript 5.0.0-dev.20230202 → 5.0.0-dev.20230203

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.0";
-      version = `${versionMajorMinor}.0-dev.20230202`;
+      version = `${versionMajorMinor}.0-dev.20230203`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -38241,6 +38241,22 @@ ${lanes.join("\n")}
     Debug.assert(extensionIsTS(resolved.extension));
     return { fileName: resolved.path, packageId: resolved.packageId };
   }
+  function createResolvedModuleWithFailedLookupLocationsHandlingSymlink(moduleName, resolved, isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, state, legacyResult) {
+    if (!state.resultFromCache && !state.compilerOptions.preserveSymlinks && resolved && isExternalLibraryImport && !resolved.originalPath && !isExternalModuleNameRelative(moduleName)) {
+      const { resolvedFileName, originalPath } = getOriginalAndResolvedFileName(resolved.path, state.host, state.traceEnabled);
+      if (originalPath)
+        resolved = { ...resolved, path: resolvedFileName, originalPath };
+    }
+    return createResolvedModuleWithFailedLookupLocations(
+      resolved,
+      isExternalLibraryImport,
+      failedLookupLocations,
+      affectingLocations,
+      diagnostics,
+      state.resultFromCache,
+      legacyResult
+    );
+  }
   function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, resultFromCache, legacyResult) {
     if (resultFromCache) {
       resultFromCache.failedLookupLocations = updateResolutionField(resultFromCache.failedLookupLocations, failedLookupLocations);
@@ -38399,6 +38415,15 @@ ${lanes.join("\n")}
     const useCaseSensitiveFileNames = typeof host.useCaseSensitiveFileNames === "function" ? host.useCaseSensitiveFileNames() : host.useCaseSensitiveFileNames;
     return comparePaths(path1, path2, !useCaseSensitiveFileNames) === 0 /* EqualTo */;
   }
+  function getOriginalAndResolvedFileName(fileName, host, traceEnabled) {
+    const resolvedFileName = realPath(fileName, host, traceEnabled);
+    const pathsAreEqual = arePathsEqual(fileName, resolvedFileName, host);
+    return {
+      // If the fileName and realpath are differing only in casing prefer fileName so that we can issue correct errors for casing under forceConsistentCasingInFileNames
+      resolvedFileName: pathsAreEqual ? fileName : resolvedFileName,
+      originalPath: pathsAreEqual ? void 0 : fileName
+    };
+  }
   function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, cache, resolutionMode) {
     Debug.assert(typeof typeReferenceDirectiveName === "string", "Non-string value passed to `ts.resolveTypeReferenceDirective`, likely by a wrapping package working with an outdated `resolveTypeReferenceDirectives` signature. This is probably not a problem in TS itself.");
     const traceEnabled = isTraceEnabled(options, host);
@@ -38470,13 +38495,13 @@ ${lanes.join("\n")}
     let resolvedTypeReferenceDirective;
     if (resolved) {
       const { fileName, packageId } = resolved;
-      const resolvedFileName = options.preserveSymlinks ? fileName : realPath(fileName, host, traceEnabled);
-      const pathsAreEqual = arePathsEqual(fileName, resolvedFileName, host);
+      let resolvedFileName = fileName, originalPath;
+      if (!options.preserveSymlinks)
+        ({ resolvedFileName, originalPath } = getOriginalAndResolvedFileName(fileName, host, traceEnabled));
       resolvedTypeReferenceDirective = {
         primary,
-        // If the fileName and realpath are differing only in casing prefer fileName so that we can issue correct errors for casing under forceConsistentCasingInFileNames
-        resolvedFileName: pathsAreEqual ? fileName : resolvedFileName,
-        originalPath: pathsAreEqual ? void 0 : fileName,
+        resolvedFileName,
+        originalPath,
         packageId,
         isExternalLibraryImport: pathContainsNodeModules(fileName)
       };
@@ -39346,13 +39371,14 @@ ${lanes.join("\n")}
         legacyResult = diagnosticResult.value.resolved.path;
       }
     }
-    return createResolvedModuleWithFailedLookupLocations(
+    return createResolvedModuleWithFailedLookupLocationsHandlingSymlink(
+      moduleName,
       (_c = result == null ? void 0 : result.value) == null ? void 0 : _c.resolved,
       (_d = result == null ? void 0 : result.value) == null ? void 0 : _d.isExternalLibraryImport,
       failedLookupLocations,
       affectingLocations,
       diagnostics,
-      state.resultFromCache,
+      state,
       legacyResult
     );
     function tryResolve(extensions2, state2) {
@@ -39382,16 +39408,7 @@ ${lanes.join("\n")}
           }
           resolved2 = loadModuleFromNearestNodeModulesDirectory(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
         }
-        if (!resolved2)
-          return void 0;
-        let resolvedValue = resolved2.value;
-        if (!compilerOptions.preserveSymlinks && resolvedValue && !resolvedValue.originalPath) {
-          const path = realPath(resolvedValue.path, host, traceEnabled);
-          const pathsAreEqual = arePathsEqual(path, resolvedValue.path, host);
-          const originalPath = pathsAreEqual ? void 0 : resolvedValue.path;
-          resolvedValue = { ...resolvedValue, path: pathsAreEqual ? resolvedValue.path : path, originalPath };
-        }
-        return { value: resolvedValue && { resolved: resolvedValue, isExternalLibraryImport: true } };
+        return resolved2 && { value: resolved2.value && { resolved: resolved2.value, isExternalLibraryImport: true } };
       } else {
         const { path: candidate, parts } = normalizePathForCJSResolution(containingDirectory, moduleName);
         const resolved2 = nodeLoadModuleByRelativeName(
@@ -40545,13 +40562,14 @@ ${lanes.join("\n")}
       candidateIsFromPackageJsonField: false
     };
     const resolved = tryResolve(1 /* TypeScript */ | 4 /* Declaration */) || tryResolve(2 /* JavaScript */ | (compilerOptions.resolveJsonModule ? 8 /* Json */ : 0));
-    return createResolvedModuleWithFailedLookupLocations(
+    return createResolvedModuleWithFailedLookupLocationsHandlingSymlink(
+      moduleName,
       resolved && resolved.value,
       (resolved == null ? void 0 : resolved.value) && pathContainsNodeModules(resolved.value.path),
       failedLookupLocations,
       affectingLocations,
       diagnostics,
-      state.resultFromCache
+      state
     );
     function tryResolve(extensions) {
       const resolvedUsingSettings = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loadModuleFromFileNoPackageId, state);
@@ -46678,7 +46696,12 @@ ${lanes.join("\n")}
     }
     function resolveExportByName(moduleSymbol, name, sourceNode, dontResolveAlias) {
       const exportValue = moduleSymbol.exports.get("export=" /* ExportEquals */);
-      const exportSymbol = exportValue ? getPropertyOfType(getTypeOfSymbol(exportValue), name) : moduleSymbol.exports.get(name);
+      const exportSymbol = exportValue ? getPropertyOfType(
+        getTypeOfSymbol(exportValue),
+        name,
+        /*skipObjectFunctionPropertyAugment*/
+        true
+      ) : moduleSymbol.exports.get(name);
       const resolved = resolveSymbol(exportSymbol, dontResolveAlias);
       markSymbolOfAliasDeclarationIfTypeOnly(
         sourceNode,
@@ -56093,7 +56116,7 @@ ${lanes.join("\n")}
               for (const tag of node.tags) {
                 if (isJSDocOverloadTag(tag)) {
                   const jsDocSignature = tag.typeExpression;
-                  if (jsDocSignature.type === void 0) {
+                  if (jsDocSignature.type === void 0 && !isConstructorDeclaration(decl)) {
                     reportImplicitAny(jsDocSignature, anyType);
                   }
                   result.push(getSignatureFromDeclaration(jsDocSignature));
@@ -56205,6 +56228,12 @@ ${lanes.join("\n")}
       if (declaration.kind === 173 /* Constructor */) {
         return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol));
       }
+      if (isJSDocSignature(declaration)) {
+        const root = getJSDocRoot(declaration);
+        if (root && isConstructorDeclaration(root.parent)) {
+          return getDeclaredTypeOfClassOrInterface(getMergedSymbol(root.parent.parent.symbol));
+        }
+      }
       if (isJSDocConstructSignature(declaration)) {
         return getTypeFromTypeNode(declaration.parameters[0].type);
       }
@@ -60925,7 +60954,6 @@ ${lanes.join("\n")}
       let overrideNextErrorInfo = 0;
       let lastSkippedInfo;
       let incompatibleStack;
-      let inPropertyCheck = false;
       Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
       const result = isRelatedTo(
         source,
@@ -61884,14 +61912,15 @@ ${lanes.join("\n")}
               );
             }
           }
-          if (result2 && !inPropertyCheck && (target2.flags & 2097152 /* Intersection */ && !isGenericObjectType(target2) && source2.flags & (524288 /* Object */ | 2097152 /* Intersection */) || isNonGenericObjectType(target2) && !isArrayOrTupleType(target2) && source2.flags & 2097152 /* Intersection */ && getApparentType(source2).flags & 3670016 /* StructuredType */ && !some(source2.types, (t) => !!(getObjectFlags(t) & 262144 /* NonInferrableType */)))) {
-            inPropertyCheck = true;
+          if (result2 && !(intersectionState & 2 /* Target */) && target2.flags & 2097152 /* Intersection */ && !isGenericObjectType(target2) && source2.flags & (524288 /* Object */ | 2097152 /* Intersection */)) {
             result2 &= propertiesRelatedTo(
               source2,
               target2,
               reportErrors2,
               /*excludedProperties*/
               void 0,
+              /*optionalsOnly*/
+              false,
               0 /* None */
             );
             if (result2 && isObjectLiteralType2(source2) && getObjectFlags(source2) & 8192 /* FreshLiteral */) {
@@ -61904,7 +61933,17 @@ ${lanes.join("\n")}
                 0 /* None */
               );
             }
-            inPropertyCheck = false;
+          } else if (result2 && isNonGenericObjectType(target2) && !isArrayOrTupleType(target2) && source2.flags & 2097152 /* Intersection */ && getApparentType(source2).flags & 3670016 /* StructuredType */ && !some(source2.types, (t) => !!(getObjectFlags(t) & 262144 /* NonInferrableType */))) {
+            result2 &= propertiesRelatedTo(
+              source2,
+              target2,
+              reportErrors2,
+              /*excludedProperties*/
+              void 0,
+              /*optionalsOnly*/
+              true,
+              intersectionState
+            );
           }
         }
         if (result2) {
@@ -62394,12 +62433,14 @@ ${lanes.join("\n")}
               reportStructuralErrors,
               /*excludedProperties*/
               void 0,
+              /*optionalsOnly*/
+              false,
               intersectionState
             );
             if (result2) {
-              result2 &= signaturesRelatedTo(source2, target2, 0 /* Call */, reportStructuralErrors);
+              result2 &= signaturesRelatedTo(source2, target2, 0 /* Call */, reportStructuralErrors, intersectionState);
               if (result2) {
-                result2 &= signaturesRelatedTo(source2, target2, 1 /* Construct */, reportStructuralErrors);
+                result2 &= signaturesRelatedTo(source2, target2, 1 /* Construct */, reportStructuralErrors, intersectionState);
                 if (result2) {
                   result2 &= indexSignaturesRelatedTo(source2, target2, sourceIsPrimitive, reportStructuralErrors, intersectionState);
                 }
@@ -62528,6 +62569,8 @@ ${lanes.join("\n")}
             /*reportErrors*/
             false,
             excludedProperties,
+            /*optionalsOnly*/
+            false,
             0 /* None */
           );
           if (result2) {
@@ -62536,7 +62579,8 @@ ${lanes.join("\n")}
               type,
               0 /* Call */,
               /*reportStructuralErrors*/
-              false
+              false,
+              0 /* None */
             );
             if (result2) {
               result2 &= signaturesRelatedTo(
@@ -62544,7 +62588,8 @@ ${lanes.join("\n")}
                 type,
                 1 /* Construct */,
                 /*reportStructuralErrors*/
-                false
+                false,
+                0 /* None */
               );
               if (result2 && !(isTupleType(source2) && isTupleType(type))) {
                 result2 &= indexSignaturesRelatedTo(
@@ -62722,7 +62767,7 @@ ${lanes.join("\n")}
           }
         }
       }
-      function propertiesRelatedTo(source2, target2, reportErrors2, excludedProperties, intersectionState) {
+      function propertiesRelatedTo(source2, target2, reportErrors2, excludedProperties, optionalsOnly, intersectionState) {
         if (relation === identityRelation) {
           return propertiesIdenticalTo(source2, target2, excludedProperties);
         }
@@ -62858,7 +62903,7 @@ ${lanes.join("\n")}
         const numericNamesOnly = isTupleType(source2) && isTupleType(target2);
         for (const targetProp of excludeProperties(properties, excludedProperties)) {
           const name = targetProp.escapedName;
-          if (!(targetProp.flags & 4194304 /* Prototype */) && (!numericNamesOnly || isNumericLiteralName(name) || name === "length")) {
+          if (!(targetProp.flags & 4194304 /* Prototype */) && (!numericNamesOnly || isNumericLiteralName(name) || name === "length") && (!optionalsOnly || targetProp.flags & 16777216 /* Optional */)) {
             const sourceProp = getPropertyOfType(source2, name);
             if (sourceProp && sourceProp !== targetProp) {
               const related = propertyRelatedTo(source2, target2, sourceProp, targetProp, getNonMissingTypeOfSymbol, reportErrors2, intersectionState, relation === comparableRelation);
@@ -62894,7 +62939,7 @@ ${lanes.join("\n")}
         }
         return result2;
       }
-      function signaturesRelatedTo(source2, target2, kind, reportErrors2) {
+      function signaturesRelatedTo(source2, target2, kind, reportErrors2, intersectionState) {
         var _a3, _b;
         if (relation === identityRelation) {
           return signaturesIdenticalTo(source2, target2, kind);
@@ -62931,6 +62976,7 @@ ${lanes.join("\n")}
               /*erase*/
               true,
               reportErrors2,
+              intersectionState,
               incompatibleReporter(sourceSignatures[i], targetSignatures[i])
             );
             if (!related) {
@@ -62942,7 +62988,7 @@ ${lanes.join("\n")}
           const eraseGenerics = relation === comparableRelation || !!compilerOptions.noStrictGenericChecks;
           const sourceSignature = first(sourceSignatures);
           const targetSignature = first(targetSignatures);
-          result2 = signatureRelatedTo(sourceSignature, targetSignature, eraseGenerics, reportErrors2, incompatibleReporter(sourceSignature, targetSignature));
+          result2 = signatureRelatedTo(sourceSignature, targetSignature, eraseGenerics, reportErrors2, intersectionState, incompatibleReporter(sourceSignature, targetSignature));
           if (!result2 && reportErrors2 && kind === 1 /* Construct */ && sourceObjectFlags & targetObjectFlags && (((_a3 = targetSignature.declaration) == null ? void 0 : _a3.kind) === 173 /* Constructor */ || ((_b = sourceSignature.declaration) == null ? void 0 : _b.kind) === 173 /* Constructor */)) {
             const constructSignatureToString = (signature) => signatureToString(
               signature,
@@ -62967,6 +63013,7 @@ ${lanes.join("\n")}
                   /*erase*/
                   true,
                   shouldElaborateErrors,
+                  intersectionState,
                   incompatibleReporter(s, t)
                 );
                 if (related) {
@@ -63019,7 +63066,7 @@ ${lanes.join("\n")}
         }
         return (source2, target2) => reportIncompatibleError(Diagnostics.Construct_signature_return_types_0_and_1_are_incompatible, typeToString(source2), typeToString(target2));
       }
-      function signatureRelatedTo(source2, target2, erase, reportErrors2, incompatibleReporter) {
+      function signatureRelatedTo(source2, target2, erase, reportErrors2, intersectionState, incompatibleReporter) {
         return compareSignaturesRelated(
           erase ? getErasedSignature(source2) : source2,
           erase ? getErasedSignature(target2) : target2,
@@ -63027,9 +63074,20 @@ ${lanes.join("\n")}
           reportErrors2,
           reportError,
           incompatibleReporter,
-          isRelatedToWorker,
+          isRelatedToWorker2,
           reportUnreliableMapper
         );
+        function isRelatedToWorker2(source3, target3, reportErrors3) {
+          return isRelatedTo(
+            source3,
+            target3,
+            3 /* Both */,
+            reportErrors3,
+            /*headMessage*/
+            void 0,
+            intersectionState
+          );
+        }
       }
       function signaturesIdenticalTo(source2, target2, kind) {
         const sourceSignatures = getSignaturesOfType(source2, kind);
@@ -63088,7 +63146,7 @@ ${lanes.join("\n")}
         }
         for (const info of getIndexInfosOfType(source2)) {
           if (isApplicableIndexType(info.keyType, keyType)) {
-            const related = indexInfoRelatedTo(info, targetInfo, reportErrors2);
+            const related = indexInfoRelatedTo(info, targetInfo, reportErrors2, intersectionState);
             if (!related) {
               return 0 /* False */;
             }
@@ -63097,8 +63155,16 @@ ${lanes.join("\n")}
         }
         return result2;
       }
-      function indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors2) {
-        const related = isRelatedTo(sourceInfo.type, targetInfo.type, 3 /* Both */, reportErrors2);
+      function indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors2, intersectionState) {
+        const related = isRelatedTo(
+          sourceInfo.type,
+          targetInfo.type,
+          3 /* Both */,
+          reportErrors2,
+          /*headMessage*/
+          void 0,
+          intersectionState
+        );
         if (!related && reportErrors2) {
           if (sourceInfo.keyType === targetInfo.keyType) {
             reportError(Diagnostics._0_index_signatures_are_incompatible, typeToString(sourceInfo.keyType));
@@ -63127,7 +63193,7 @@ ${lanes.join("\n")}
       function typeRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState) {
         const sourceInfo = getApplicableIndexInfo(source2, targetInfo.keyType);
         if (sourceInfo) {
-          return indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors2);
+          return indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors2, intersectionState);
         }
         if (!(intersectionState & 1 /* Source */) && isObjectTypeWithInferableIndex(source2)) {
           return membersRelatedToIndexInfo(source2, targetInfo, reportErrors2, intersectionState);
@@ -63418,12 +63484,15 @@ ${lanes.join("\n")}
     }
     function isDeeplyNestedType(type, stack, depth, maxDepth = 3) {
       if (depth >= maxDepth) {
+        if (type.flags & 2097152 /* Intersection */) {
+          return some(type.types, (t) => isDeeplyNestedType(t, stack, depth, maxDepth));
+        }
         const identity2 = getRecursionIdentity(type);
         let count = 0;
         let lastTypeId = 0;
         for (let i = 0; i < depth; i++) {
           const t = stack[i];
-          if (getRecursionIdentity(t) === identity2) {
+          if (t.flags & 2097152 /* Intersection */ ? some(t.types, (u) => getRecursionIdentity(u) === identity2) : getRecursionIdentity(t) === identity2) {
             if (t.id >= lastTypeId) {
               count++;
               if (count >= maxDepth) {
@@ -72442,7 +72511,7 @@ ${lanes.join("\n")}
       }
     }
     function checkCallExpression(node, checkMode) {
-      var _a2;
+      var _a2, _b, _c;
       checkGrammarTypeArguments(node, node.typeArguments);
       const signature = getResolvedSignature(
         node,
@@ -72459,7 +72528,7 @@ ${lanes.join("\n")}
       }
       if (node.kind === 211 /* NewExpression */) {
         const declaration = signature.declaration;
-        if (declaration && declaration.kind !== 173 /* Constructor */ && declaration.kind !== 177 /* ConstructSignature */ && declaration.kind !== 182 /* ConstructorType */ && !isJSDocConstructSignature(declaration) && !isJSConstructor(declaration)) {
+        if (declaration && declaration.kind !== 173 /* Constructor */ && declaration.kind !== 177 /* ConstructSignature */ && declaration.kind !== 182 /* ConstructorType */ && !(isJSDocSignature(declaration) && ((_b = (_a2 = getJSDocRoot(declaration)) == null ? void 0 : _a2.parent) == null ? void 0 : _b.kind) === 173 /* Constructor */) && !isJSDocConstructSignature(declaration) && !isJSConstructor(declaration)) {
           if (noImplicitAny) {
             error(node, Diagnostics.new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type);
           }
@@ -72487,7 +72556,7 @@ ${lanes.join("\n")}
           /*allowDeclaration*/
           false
         );
-        if ((_a2 = jsSymbol == null ? void 0 : jsSymbol.exports) == null ? void 0 : _a2.size) {
+        if ((_c = jsSymbol == null ? void 0 : jsSymbol.exports) == null ? void 0 : _c.size) {
           const jsAssignmentType = createAnonymousType(jsSymbol, jsSymbol.exports, emptyArray, emptyArray, emptyArray);
           jsAssignmentType.objectFlags |= 4096 /* JSLiteral */;
           return getIntersectionType([returnType, jsAssignmentType]);
@@ -84390,8 +84459,8 @@ ${lanes.join("\n")}
       "use strict";
       init_ts2();
       init_ts2();
-      init_ts_performance();
       init_ts_moduleSpecifiers();
+      init_ts_performance();
       ambientModuleSymbolRegex = /^".+"$/;
       anon = "(anonymous)";
       nextSymbolId = 1;
@@ -133399,9 +133468,9 @@ ${lanes.join("\n")}
     "src/services/services.ts"() {
       "use strict";
       init_ts4();
+      init_ts4();
       init_ts_NavigateTo();
       init_ts_NavigationBar();
-      init_ts4();
       servicesVersion = "0.8";
       NodeObject = class {
         constructor(kind, pos, end) {
@@ -136407,8 +136476,8 @@ ${lanes.join("\n")}
   var init_addEmptyExportDeclaration = __esm({
     "src/services/codefixes/addEmptyExportDeclaration.ts"() {
       "use strict";
-      init_ts_codefix();
       init_ts4();
+      init_ts_codefix();
       registerCodeFix({
         errorCodes: [
           Diagnostics.await_expressions_are_only_allowed_at_the_top_level_of_a_file_when_that_file_is_a_module_but_this_file_has_no_imports_or_exports_Consider_adding_an_empty_export_to_make_this_file_a_module.code,
@@ -138772,8 +138841,8 @@ ${lanes.join("\n")}
   var init_convertToEsModule = __esm({
     "src/services/codefixes/convertToEsModule.ts"() {
       "use strict";
-      init_ts_codefix();
       init_ts4();
+      init_ts_codefix();
       registerCodeFix({
         errorCodes: [Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES_module.code],
         getCodeActions(context) {
@@ -142372,8 +142441,8 @@ ${lanes.join("\n")}
   var init_fixModuleAndTargetOptions = __esm({
     "src/services/codefixes/fixModuleAndTargetOptions.ts"() {
       "use strict";
-      init_ts_codefix();
       init_ts4();
+      init_ts_codefix();
       registerCodeFix({
         errorCodes: [
           Diagnostics.Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_or_nodenext_and_the_target_option_is_set_to_es2017_or_higher.code,
@@ -147705,7 +147774,7 @@ ${lanes.join("\n")}
   }
   function getInsertTextAndReplacementSpanForImportCompletion(name, importStatementCompletion, origin, useSemicolons, sourceFile, options, preferences) {
     const replacementSpan = importStatementCompletion.replacementSpan;
-    const quotedModuleSpecifier = quote(sourceFile, preferences, origin.moduleSpecifier);
+    const quotedModuleSpecifier = quote(sourceFile, preferences, escapeSnippetText(origin.moduleSpecifier));
     const exportKind = origin.isDefaultExport ? 1 /* Default */ : origin.exportName === "export=" /* ExportEquals */ ? 2 /* ExportEquals */ : 0 /* Named */;
     const tabStop = preferences.includeCompletionsWithSnippetText ? "$1" : "";
     const importKind = ts_codefix_exports.getImportKind(
@@ -157705,6 +157774,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     if (isExpression(body)) {
       const returnStatement = factory.createReturnStatement(body);
       const file = body.getSourceFile();
+      setTextRange(returnStatement, body);
       suppressLeadingAndTrailingTrivia(returnStatement);
       copyTrailingAsLeadingComments(
         body,
@@ -164683,8 +164753,8 @@ ${options.prefix}` : "\n" : options.prefix
   var init_rules = __esm({
     "src/services/formatting/rules.ts"() {
       "use strict";
-      init_ts_formatting();
       init_ts4();
+      init_ts_formatting();
     }
   });
 
@@ -167096,8 +167166,8 @@ ${options.prefix}` : "\n" : options.prefix
   var init_scriptInfo = __esm({
     "src/server/scriptInfo.ts"() {
       "use strict";
-      init_ts_server2();
       init_ts6();
+      init_ts_server2();
       TextStorage = class {
         constructor(host, info, initialVersion) {
           this.host = host;
@@ -167787,8 +167857,8 @@ ${options.prefix}` : "\n" : options.prefix
     "src/server/project.ts"() {
       "use strict";
       init_ts6();
-      init_ts_server2();
       init_ts6();
+      init_ts_server2();
       ProjectKind = /* @__PURE__ */ ((ProjectKind2) => {
         ProjectKind2[ProjectKind2["Inferred"] = 0] = "Inferred";
         ProjectKind2[ProjectKind2["Configured"] = 1] = "Configured";
@@ -170128,8 +170198,8 @@ ${options.prefix}` : "\n" : options.prefix
   var init_editorServices = __esm({
     "src/server/editorServices.ts"() {
       "use strict";
-      init_ts_server2();
       init_ts6();
+      init_ts_server2();
       maxProgramSizeForNonTsFiles = 20 * 1024 * 1024;
       maxFileSize = 4 * 1024 * 1024;
       ProjectsUpdatedInBackgroundEvent = "projectsUpdatedInBackground";