typescript 5.1.0-dev.20230330 → 5.1.0-dev.20230331

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230330`;
+var version = `${versionMajorMinor}.0-dev.20230331`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -4076,7 +4076,7 @@ function createDynamicPriorityPollingWatchFile(host) {
     queue.pollScheduled = false;
     return queue;
   }
-  function pollPollingIntervalQueue(queue) {
+  function pollPollingIntervalQueue(_timeoutType, queue) {
     queue.pollIndex = pollQueue(queue, queue.pollingInterval, queue.pollIndex, pollingChunkSize[queue.pollingInterval]);
     if (queue.length) {
       scheduleNextPoll(queue.pollingInterval);
@@ -4085,7 +4085,7 @@ function createDynamicPriorityPollingWatchFile(host) {
       queue.pollScheduled = false;
     }
   }
-  function pollLowPollingIntervalQueue(queue) {
+  function pollLowPollingIntervalQueue(_timeoutType, queue) {
     pollQueue(
       changedFilesInLastPoll,
       250 /* Low */,
@@ -4093,7 +4093,7 @@ function createDynamicPriorityPollingWatchFile(host) {
       0,
       changedFilesInLastPoll.length
     );
-    pollPollingIntervalQueue(queue);
+    pollPollingIntervalQueue(_timeoutType, queue);
     if (!queue.pollScheduled && changedFilesInLastPoll.length) {
       scheduleNextPoll(250 /* Low */);
     }
@@ -4150,7 +4150,7 @@ function createDynamicPriorityPollingWatchFile(host) {
     }
   }
   function scheduleNextPoll(pollingInterval) {
-    pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingIntervalQueue(pollingInterval));
+    pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === 250 /* Low */ ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
   }
 }
 function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames) {
@@ -4229,7 +4229,7 @@ function createFixedChunkSizePollingWatchFile(host) {
   function scheduleNextPoll() {
     if (!watchedFiles.length || pollScheduled)
       return;
-    pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */);
+    pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */, "pollQueue");
   }
 }
 function createSingleWatcherPerName(cache, useCaseSensitiveFileNames, name, callback, createWatcher) {
@@ -4397,7 +4397,7 @@ function createDirectoryWatcherSupportingRecursive({
       clearTimeout2(timerToUpdateChildWatches);
       timerToUpdateChildWatches = void 0;
     }
-    timerToUpdateChildWatches = setTimeout2(onTimerToUpdateChildWatches, 1e3);
+    timerToUpdateChildWatches = setTimeout2(onTimerToUpdateChildWatches, 1e3, "timerToUpdateChildWatches");
   }
   function onTimerToUpdateChildWatches() {
     timerToUpdateChildWatches = void 0;
@@ -6216,7 +6216,6 @@ var Diagnostics = {
   Constructors_for_derived_classes_must_contain_a_super_call: diag(2377, 1 /* Error */, "Constructors_for_derived_classes_must_contain_a_super_call_2377", "Constructors for derived classes must contain a 'super' call."),
   A_get_accessor_must_return_a_value: diag(2378, 1 /* Error */, "A_get_accessor_must_return_a_value_2378", "A 'get' accessor must return a value."),
   Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_with_exactOptionalPropertyTypes_Colon_true_Consider_adding_undefined_to_the_types_of_the_target_s_properties: diag(2379, 1 /* Error */, "Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_with_exactOptionalPropertyTypes_Colon_tr_2379", "Argument of type '{0}' is not assignable to parameter of type '{1}' with 'exactOptionalPropertyTypes: true'. Consider adding 'undefined' to the types of the target's properties."),
-  The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type: diag(2380, 1 /* Error */, "The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type_2380", "The return type of a 'get' accessor must be assignable to its 'set' accessor type"),
   Overload_signatures_must_all_be_exported_or_non_exported: diag(2383, 1 /* Error */, "Overload_signatures_must_all_be_exported_or_non_exported_2383", "Overload signatures must all be exported or non-exported."),
   Overload_signatures_must_all_be_ambient_or_non_ambient: diag(2384, 1 /* Error */, "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", "Overload signatures must all be ambient or non-ambient."),
   Overload_signatures_must_all_be_public_private_or_protected: diag(2385, 1 /* Error */, "Overload_signatures_must_all_be_public_private_or_protected_2385", "Overload signatures must all be public, private or protected."),
@@ -74642,11 +74641,6 @@ function createTypeChecker(host) {
             error(getter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
             error(setter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
           }
-          const getterType = getAnnotatedAccessorType(getter);
-          const setterType = getAnnotatedAccessorType(setter);
-          if (getterType && setterType) {
-            checkTypeAssignableTo(getterType, setterType, getter, Diagnostics.The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type);
-          }
         }
       }
       const returnType = getTypeOfAccessors(getSymbolOfDeclaration(node));
@@ -119924,7 +119918,7 @@ function createWatchProgram(host) {
     }
     const pending = clearInvalidateResolutionsOfFailedLookupLocations();
     writeLog(`Scheduling invalidateFailedLookup${pending ? ", Cancelled earlier one" : ""}`);
-    timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250);
+    timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250, "timerToInvalidateFailedLookupResolutions");
   }
   function invalidateResolutionsOfFailedLookup() {
     timerToInvalidateFailedLookupResolutions = void 0;
@@ -119940,7 +119934,7 @@ function createWatchProgram(host) {
       host.clearTimeout(timerToUpdateProgram);
     }
     writeLog("Scheduling update");
-    timerToUpdateProgram = host.setTimeout(updateProgramWithWatchStatus, 250);
+    timerToUpdateProgram = host.setTimeout(updateProgramWithWatchStatus, 250, "timerToUpdateProgram");
   }
   function scheduleProgramReload() {
     Debug.assert(!!configFileName);
@@ -121818,9 +121812,9 @@ function scheduleBuildInvalidatedProject(state, time, changeDetected) {
   if (state.timerToBuildInvalidatedProject) {
     hostWithWatch.clearTimeout(state.timerToBuildInvalidatedProject);
   }
-  state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, state, changeDetected);
+  state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, "timerToBuildInvalidatedProject", state, changeDetected);
 }
-function buildNextInvalidatedProject(state, changeDetected) {
+function buildNextInvalidatedProject(_timeoutType, state, changeDetected) {
   mark("SolutionBuilder::beforeBuild");
   const buildOrder = buildNextInvalidatedProjectWorker(state, changeDetected);
   mark("SolutionBuilder::afterBuild");

package/lib/tsserver.js

@@ -2286,7 +2286,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230330`;
+var version = `${versionMajorMinor}.0-dev.20230331`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -7548,7 +7548,7 @@ function createDynamicPriorityPollingWatchFile(host) {
     queue.pollScheduled = false;
     return queue;
   }
-  function pollPollingIntervalQueue(queue) {
+  function pollPollingIntervalQueue(_timeoutType, queue) {
     queue.pollIndex = pollQueue(queue, queue.pollingInterval, queue.pollIndex, pollingChunkSize[queue.pollingInterval]);
     if (queue.length) {
       scheduleNextPoll(queue.pollingInterval);
@@ -7557,7 +7557,7 @@ function createDynamicPriorityPollingWatchFile(host) {
       queue.pollScheduled = false;
     }
   }
-  function pollLowPollingIntervalQueue(queue) {
+  function pollLowPollingIntervalQueue(_timeoutType, queue) {
     pollQueue(
       changedFilesInLastPoll,
       250 /* Low */,
@@ -7565,7 +7565,7 @@ function createDynamicPriorityPollingWatchFile(host) {
       0,
       changedFilesInLastPoll.length
     );
-    pollPollingIntervalQueue(queue);
+    pollPollingIntervalQueue(_timeoutType, queue);
     if (!queue.pollScheduled && changedFilesInLastPoll.length) {
       scheduleNextPoll(250 /* Low */);
     }
@@ -7622,7 +7622,7 @@ function createDynamicPriorityPollingWatchFile(host) {
     }
   }
   function scheduleNextPoll(pollingInterval) {
-    pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingIntervalQueue(pollingInterval));
+    pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === 250 /* Low */ ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
   }
 }
 function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames) {
@@ -7701,7 +7701,7 @@ function createFixedChunkSizePollingWatchFile(host) {
   function scheduleNextPoll() {
     if (!watchedFiles.length || pollScheduled)
       return;
-    pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */);
+    pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */, "pollQueue");
   }
 }
 function createSingleWatcherPerName(cache, useCaseSensitiveFileNames, name, callback, createWatcher) {
@@ -7869,7 +7869,7 @@ function createDirectoryWatcherSupportingRecursive({
       clearTimeout2(timerToUpdateChildWatches);
       timerToUpdateChildWatches = void 0;
     }
-    timerToUpdateChildWatches = setTimeout2(onTimerToUpdateChildWatches, 1e3);
+    timerToUpdateChildWatches = setTimeout2(onTimerToUpdateChildWatches, 1e3, "timerToUpdateChildWatches");
   }
   function onTimerToUpdateChildWatches() {
     timerToUpdateChildWatches = void 0;
@@ -9709,7 +9709,6 @@ var Diagnostics = {
   Constructors_for_derived_classes_must_contain_a_super_call: diag(2377, 1 /* Error */, "Constructors_for_derived_classes_must_contain_a_super_call_2377", "Constructors for derived classes must contain a 'super' call."),
   A_get_accessor_must_return_a_value: diag(2378, 1 /* Error */, "A_get_accessor_must_return_a_value_2378", "A 'get' accessor must return a value."),
   Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_with_exactOptionalPropertyTypes_Colon_true_Consider_adding_undefined_to_the_types_of_the_target_s_properties: diag(2379, 1 /* Error */, "Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_with_exactOptionalPropertyTypes_Colon_tr_2379", "Argument of type '{0}' is not assignable to parameter of type '{1}' with 'exactOptionalPropertyTypes: true'. Consider adding 'undefined' to the types of the target's properties."),
-  The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type: diag(2380, 1 /* Error */, "The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type_2380", "The return type of a 'get' accessor must be assignable to its 'set' accessor type"),
   Overload_signatures_must_all_be_exported_or_non_exported: diag(2383, 1 /* Error */, "Overload_signatures_must_all_be_exported_or_non_exported_2383", "Overload signatures must all be exported or non-exported."),
   Overload_signatures_must_all_be_ambient_or_non_ambient: diag(2384, 1 /* Error */, "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", "Overload signatures must all be ambient or non-ambient."),
   Overload_signatures_must_all_be_public_private_or_protected: diag(2385, 1 /* Error */, "Overload_signatures_must_all_be_public_private_or_protected_2385", "Overload signatures must all be public, private or protected."),
@@ -79284,11 +79283,6 @@ function createTypeChecker(host) {
             error(getter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
             error(setter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
           }
-          const getterType = getAnnotatedAccessorType(getter);
-          const setterType = getAnnotatedAccessorType(setter);
-          if (getterType && setterType) {
-            checkTypeAssignableTo(getterType, setterType, getter, Diagnostics.The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type);
-          }
         }
       }
       const returnType = getTypeOfAccessors(getSymbolOfDeclaration(node));
@@ -124859,7 +124853,7 @@ function createWatchProgram(host) {
     }
     const pending = clearInvalidateResolutionsOfFailedLookupLocations();
     writeLog(`Scheduling invalidateFailedLookup${pending ? ", Cancelled earlier one" : ""}`);
-    timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250);
+    timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250, "timerToInvalidateFailedLookupResolutions");
   }
   function invalidateResolutionsOfFailedLookup() {
     timerToInvalidateFailedLookupResolutions = void 0;
@@ -124875,7 +124869,7 @@ function createWatchProgram(host) {
       host.clearTimeout(timerToUpdateProgram);
     }
     writeLog("Scheduling update");
-    timerToUpdateProgram = host.setTimeout(updateProgramWithWatchStatus, 250);
+    timerToUpdateProgram = host.setTimeout(updateProgramWithWatchStatus, 250, "timerToUpdateProgram");
   }
   function scheduleProgramReload() {
     Debug.assert(!!configFileName);
@@ -126780,9 +126774,9 @@ function scheduleBuildInvalidatedProject(state, time, changeDetected) {
   if (state.timerToBuildInvalidatedProject) {
     hostWithWatch.clearTimeout(state.timerToBuildInvalidatedProject);
   }
-  state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, state, changeDetected);
+  state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, "timerToBuildInvalidatedProject", state, changeDetected);
 }
-function buildNextInvalidatedProject(state, changeDetected) {
+function buildNextInvalidatedProject(_timeoutType, state, changeDetected) {
   mark("SolutionBuilder::beforeBuild");
   const buildOrder = buildNextInvalidatedProjectWorker(state, changeDetected);
   mark("SolutionBuilder::afterBuild");
@@ -142176,7 +142170,6 @@ function createImportAdderWorker(sourceFile, program, useAutoImportProvider, pre
         importClauseOrBindingPattern,
         defaultImport,
         arrayFrom(namedImports.entries(), ([name, addAsTypeOnly]) => ({ addAsTypeOnly, name })),
-        compilerOptions,
         preferences
       );
     });
@@ -142374,7 +142367,19 @@ function getAddAsTypeOnly(isValidTypeOnlyUseSite, isForNewImportDeclaration, sym
   return 1 /* Allowed */;
 }
 function tryAddToExistingImport(existingImports, isValidTypeOnlyUseSite, checker, compilerOptions) {
-  return firstDefined(existingImports, ({ declaration, importKind, symbol, targetFlags }) => {
+  let best;
+  for (const existingImport of existingImports) {
+    const fix = getAddToExistingImportFix(existingImport);
+    if (!fix)
+      continue;
+    const isTypeOnly = isTypeOnlyImportDeclaration(fix.importClauseOrBindingPattern);
+    if (fix.addAsTypeOnly !== 4 /* NotAllowed */ && isTypeOnly || fix.addAsTypeOnly === 4 /* NotAllowed */ && !isTypeOnly) {
+      return fix;
+    }
+    best != null ? best : best = fix;
+  }
+  return best;
+  function getAddToExistingImportFix({ declaration, importKind, symbol, targetFlags }) {
     if (importKind === 3 /* CommonJS */ || importKind === 2 /* Namespace */ || declaration.kind === 269 /* ImportEqualsDeclaration */) {
       return void 0;
     }
@@ -142382,11 +142387,13 @@ function tryAddToExistingImport(existingImports, isValidTypeOnlyUseSite, checker
       return (importKind === 0 /* Named */ || importKind === 1 /* Default */) && declaration.name.kind === 204 /* ObjectBindingPattern */ ? { kind: 2 /* AddToExisting */, importClauseOrBindingPattern: declaration.name, importKind, moduleSpecifier: declaration.initializer.arguments[0].text, addAsTypeOnly: 4 /* NotAllowed */ } : void 0;
     }
     const { importClause } = declaration;
-    if (!importClause || !isStringLiteralLike(declaration.moduleSpecifier))
+    if (!importClause || !isStringLiteralLike(declaration.moduleSpecifier)) {
       return void 0;
+    }
     const { name, namedBindings } = importClause;
-    if (importClause.isTypeOnly && !(importKind === 0 /* Named */ && namedBindings))
+    if (importClause.isTypeOnly && !(importKind === 0 /* Named */ && namedBindings)) {
       return void 0;
+    }
     const addAsTypeOnly = getAddAsTypeOnly(
       isValidTypeOnlyUseSite,
       /*isForNewImportDeclaration*/
@@ -142397,10 +142404,12 @@ function tryAddToExistingImport(existingImports, isValidTypeOnlyUseSite, checker
       compilerOptions
     );
     if (importKind === 1 /* Default */ && (name || // Cannot add a default import to a declaration that already has one
-    addAsTypeOnly === 2 /* Required */ && namedBindings))
+    addAsTypeOnly === 2 /* Required */ && namedBindings)) {
       return void 0;
-    if (importKind === 0 /* Named */ && (namedBindings == null ? void 0 : namedBindings.kind) === 272 /* NamespaceImport */)
+    }
+    if (importKind === 0 /* Named */ && (namedBindings == null ? void 0 : namedBindings.kind) === 272 /* NamespaceImport */) {
       return void 0;
+    }
     return {
       kind: 2 /* AddToExisting */,
       importClauseOrBindingPattern: importClause,
@@ -142408,7 +142417,7 @@ function tryAddToExistingImport(existingImports, isValidTypeOnlyUseSite, checker
       moduleSpecifier: declaration.moduleSpecifier.text,
       addAsTypeOnly
     };
-  });
+  }
 }
 function createExistingImportMap(checker, importingFile, compilerOptions) {
   let importMap;
@@ -142837,7 +142846,6 @@ function codeActionForFixWorker(changes, sourceFile, symbolName2, fix, includeSy
         importClauseOrBindingPattern,
         importKind === 1 /* Default */ ? { name: symbolName2, addAsTypeOnly } : void 0,
         importKind === 0 /* Named */ ? [{ name: symbolName2, addAsTypeOnly }] : emptyArray,
-        compilerOptions,
         preferences
       );
       const moduleSpecifierWithoutQuotes = stripQuotes(moduleSpecifier);
@@ -142939,7 +142947,7 @@ function promoteFromTypeOnly(changes, aliasDeclaration, compilerOptions, sourceF
     }
   }
 }
-function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImports, compilerOptions, preferences) {
+function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImports, preferences) {
   var _a2;
   if (clause.kind === 204 /* ObjectBindingPattern */) {
     if (defaultImport) {
@@ -142957,7 +142965,6 @@ function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImpor
   }
   const promoteFromTypeOnly2 = clause.isTypeOnly && some([defaultImport, ...namedImports], (i) => (i == null ? void 0 : i.addAsTypeOnly) === 4 /* NotAllowed */);
   const existingSpecifiers = clause.namedBindings && ((_a2 = tryCast(clause.namedBindings, isNamedImports)) == null ? void 0 : _a2.elements);
-  const convertExistingToTypeOnly = promoteFromTypeOnly2 && importNameElisionDisabled(compilerOptions);
   if (defaultImport) {
     Debug.assert(!clause.name, "Cannot add a default import to an import clause that already has one");
     changes.insertNodeAt(sourceFile, clause.getStart(sourceFile), factory.createIdentifier(defaultImport.name), { suffix: ", " });
@@ -142988,7 +142995,7 @@ function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImpor
     const specifierSort = (existingSpecifiers == null ? void 0 : existingSpecifiers.length) && ts_OrganizeImports_exports.detectImportSpecifierSorting(existingSpecifiers, preferences);
     if (specifierSort && !(ignoreCaseForSorting && specifierSort === 1 /* CaseSensitive */)) {
       for (const spec of newSpecifiers) {
-        const insertionIndex = convertExistingToTypeOnly && !spec.isTypeOnly ? 0 : ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(existingSpecifiers, spec, comparer);
+        const insertionIndex = promoteFromTypeOnly2 && !spec.isTypeOnly ? 0 : ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(existingSpecifiers, spec, comparer);
         changes.insertImportSpecifierAtIndex(sourceFile, spec, clause.namedBindings, insertionIndex);
       }
     } else if (existingSpecifiers == null ? void 0 : existingSpecifiers.length) {
@@ -143008,7 +143015,7 @@ function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImpor
   }
   if (promoteFromTypeOnly2) {
     changes.delete(sourceFile, getTypeKeywordOfTypeOnlyImport(clause, sourceFile));
-    if (convertExistingToTypeOnly && existingSpecifiers) {
+    if (existingSpecifiers) {
       for (const specifier of existingSpecifiers) {
         changes.insertModifierBefore(sourceFile, 155 /* TypeKeyword */, specifier);
       }
@@ -170889,7 +170896,7 @@ var ThrottledOperations = class {
     if (pendingTimeout) {
       this.host.clearTimeout(pendingTimeout);
     }
-    this.pendingTimeouts.set(operationId, this.host.setTimeout(ThrottledOperations.run, delay, this, operationId, cb));
+    this.pendingTimeouts.set(operationId, this.host.setTimeout(ThrottledOperations.run, delay, operationId, this, cb));
     if (this.logger) {
       this.logger.info(`Scheduled: ${operationId}${pendingTimeout ? ", Cancelled earlier one" : ""}`);
     }
@@ -170901,7 +170908,7 @@ var ThrottledOperations = class {
     this.host.clearTimeout(pendingTimeout);
     return this.pendingTimeouts.delete(operationId);
   }
-  static run(self, operationId, cb) {
+  static run(operationId, self, cb) {
     var _a2, _b;
     (_a2 = perfLogger) == null ? void 0 : _a2.logStartScheduledOperation(operationId);
     self.pendingTimeouts.delete(operationId);
@@ -177543,21 +177550,21 @@ var MultistepOperation = class {
     this.setTimerHandle(void 0);
     this.setImmediateId(void 0);
   }
-  immediate(action) {
+  immediate(actionType, action) {
     const requestId = this.requestId;
     Debug.assert(requestId === this.operationHost.getCurrentRequestId(), "immediate: incorrect request id");
     this.setImmediateId(this.operationHost.getServerHost().setImmediate(() => {
       this.immediateId = void 0;
       this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action));
-    }));
+    }, actionType));
   }
-  delay(ms, action) {
+  delay(actionType, ms, action) {
     const requestId = this.requestId;
     Debug.assert(requestId === this.operationHost.getCurrentRequestId(), "delay: incorrect request id");
     this.setTimerHandle(this.operationHost.getServerHost().setTimeout(() => {
       this.timerHandle = void 0;
       this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action));
-    }, ms));
+    }, ms, actionType));
   }
   executeAction(action) {
     var _a2, _b, _c, _d, _e, _f;
@@ -178871,7 +178878,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
     const goNext = () => {
       index++;
       if (checkList.length > index) {
-        next.delay(followMs, checkOne);
+        next.delay("checkOne", followMs, checkOne);
       }
     };
     const checkOne = () => {
@@ -178899,7 +178906,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
         goNext();
         return;
       }
-      next.immediate(() => {
+      next.immediate("semanticCheck", () => {
         this.semanticCheck(fileName, project);
         if (this.changeSeq !== seq) {
           return;
@@ -178908,14 +178915,14 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
           goNext();
           return;
         }
-        next.immediate(() => {
+        next.immediate("suggestionCheck", () => {
           this.suggestionCheck(fileName, project);
           goNext();
         });
       });
     };
     if (checkList.length > index && this.changeSeq === seq) {
-      next.delay(ms, checkOne);
+      next.delay("checkOne", ms, checkOne);
     }
   }
   cleanProjects(caption, projects) {

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230330`;
+      version = `${versionMajorMinor}.0-dev.20230331`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -5336,7 +5336,7 @@ ${lanes.join("\n")}
       queue.pollScheduled = false;
       return queue;
     }
-    function pollPollingIntervalQueue(queue) {
+    function pollPollingIntervalQueue(_timeoutType, queue) {
       queue.pollIndex = pollQueue(queue, queue.pollingInterval, queue.pollIndex, pollingChunkSize[queue.pollingInterval]);
       if (queue.length) {
         scheduleNextPoll(queue.pollingInterval);
@@ -5345,7 +5345,7 @@ ${lanes.join("\n")}
         queue.pollScheduled = false;
       }
     }
-    function pollLowPollingIntervalQueue(queue) {
+    function pollLowPollingIntervalQueue(_timeoutType, queue) {
       pollQueue(
         changedFilesInLastPoll,
         250 /* Low */,
@@ -5353,7 +5353,7 @@ ${lanes.join("\n")}
         0,
         changedFilesInLastPoll.length
       );
-      pollPollingIntervalQueue(queue);
+      pollPollingIntervalQueue(_timeoutType, queue);
       if (!queue.pollScheduled && changedFilesInLastPoll.length) {
         scheduleNextPoll(250 /* Low */);
       }
@@ -5410,7 +5410,7 @@ ${lanes.join("\n")}
       }
     }
     function scheduleNextPoll(pollingInterval) {
-      pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingIntervalQueue(pollingInterval));
+      pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === 250 /* Low */ ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
     }
   }
   function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames) {
@@ -5489,7 +5489,7 @@ ${lanes.join("\n")}
     function scheduleNextPoll() {
       if (!watchedFiles.length || pollScheduled)
         return;
-      pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */);
+      pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */, "pollQueue");
     }
   }
   function createSingleWatcherPerName(cache, useCaseSensitiveFileNames, name, callback, createWatcher) {
@@ -5655,7 +5655,7 @@ ${lanes.join("\n")}
         clearTimeout2(timerToUpdateChildWatches);
         timerToUpdateChildWatches = void 0;
       }
-      timerToUpdateChildWatches = setTimeout2(onTimerToUpdateChildWatches, 1e3);
+      timerToUpdateChildWatches = setTimeout2(onTimerToUpdateChildWatches, 1e3, "timerToUpdateChildWatches");
     }
     function onTimerToUpdateChildWatches() {
       timerToUpdateChildWatches = void 0;
@@ -7532,7 +7532,6 @@ ${lanes.join("\n")}
         Constructors_for_derived_classes_must_contain_a_super_call: diag(2377, 1 /* Error */, "Constructors_for_derived_classes_must_contain_a_super_call_2377", "Constructors for derived classes must contain a 'super' call."),
         A_get_accessor_must_return_a_value: diag(2378, 1 /* Error */, "A_get_accessor_must_return_a_value_2378", "A 'get' accessor must return a value."),
         Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_with_exactOptionalPropertyTypes_Colon_true_Consider_adding_undefined_to_the_types_of_the_target_s_properties: diag(2379, 1 /* Error */, "Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_with_exactOptionalPropertyTypes_Colon_tr_2379", "Argument of type '{0}' is not assignable to parameter of type '{1}' with 'exactOptionalPropertyTypes: true'. Consider adding 'undefined' to the types of the target's properties."),
-        The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type: diag(2380, 1 /* Error */, "The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type_2380", "The return type of a 'get' accessor must be assignable to its 'set' accessor type"),
         Overload_signatures_must_all_be_exported_or_non_exported: diag(2383, 1 /* Error */, "Overload_signatures_must_all_be_exported_or_non_exported_2383", "Overload signatures must all be exported or non-exported."),
         Overload_signatures_must_all_be_ambient_or_non_ambient: diag(2384, 1 /* Error */, "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", "Overload signatures must all be ambient or non-ambient."),
         Overload_signatures_must_all_be_public_private_or_protected: diag(2385, 1 /* Error */, "Overload_signatures_must_all_be_public_private_or_protected_2385", "Overload signatures must all be public, private or protected."),
@@ -77092,11 +77091,6 @@ ${lanes.join("\n")}
               error(getter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
               error(setter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
             }
-            const getterType = getAnnotatedAccessorType(getter);
-            const setterType = getAnnotatedAccessorType(setter);
-            if (getterType && setterType) {
-              checkTypeAssignableTo(getterType, setterType, getter, Diagnostics.The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type);
-            }
           }
         }
         const returnType = getTypeOfAccessors(getSymbolOfDeclaration(node));
@@ -123043,7 +123037,7 @@ ${lanes.join("\n")}
       }
       const pending = clearInvalidateResolutionsOfFailedLookupLocations();
       writeLog(`Scheduling invalidateFailedLookup${pending ? ", Cancelled earlier one" : ""}`);
-      timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250);
+      timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250, "timerToInvalidateFailedLookupResolutions");
     }
     function invalidateResolutionsOfFailedLookup() {
       timerToInvalidateFailedLookupResolutions = void 0;
@@ -123059,7 +123053,7 @@ ${lanes.join("\n")}
         host.clearTimeout(timerToUpdateProgram);
       }
       writeLog("Scheduling update");
-      timerToUpdateProgram = host.setTimeout(updateProgramWithWatchStatus, 250);
+      timerToUpdateProgram = host.setTimeout(updateProgramWithWatchStatus, 250, "timerToUpdateProgram");
     }
     function scheduleProgramReload() {
       Debug.assert(!!configFileName);
@@ -124969,9 +124963,9 @@ ${lanes.join("\n")}
     if (state.timerToBuildInvalidatedProject) {
       hostWithWatch.clearTimeout(state.timerToBuildInvalidatedProject);
     }
-    state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, state, changeDetected);
+    state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, "timerToBuildInvalidatedProject", state, changeDetected);
   }
-  function buildNextInvalidatedProject(state, changeDetected) {
+  function buildNextInvalidatedProject(_timeoutType, state, changeDetected) {
     mark("SolutionBuilder::beforeBuild");
     const buildOrder = buildNextInvalidatedProjectWorker(state, changeDetected);
     mark("SolutionBuilder::afterBuild");
@@ -140727,7 +140721,6 @@ ${lanes.join("\n")}
           importClauseOrBindingPattern,
           defaultImport,
           arrayFrom(namedImports.entries(), ([name, addAsTypeOnly]) => ({ addAsTypeOnly, name })),
-          compilerOptions,
           preferences
         );
       });
@@ -140925,7 +140918,19 @@ ${lanes.join("\n")}
     return 1 /* Allowed */;
   }
   function tryAddToExistingImport(existingImports, isValidTypeOnlyUseSite, checker, compilerOptions) {
-    return firstDefined(existingImports, ({ declaration, importKind, symbol, targetFlags }) => {
+    let best;
+    for (const existingImport of existingImports) {
+      const fix = getAddToExistingImportFix(existingImport);
+      if (!fix)
+        continue;
+      const isTypeOnly = isTypeOnlyImportDeclaration(fix.importClauseOrBindingPattern);
+      if (fix.addAsTypeOnly !== 4 /* NotAllowed */ && isTypeOnly || fix.addAsTypeOnly === 4 /* NotAllowed */ && !isTypeOnly) {
+        return fix;
+      }
+      best != null ? best : best = fix;
+    }
+    return best;
+    function getAddToExistingImportFix({ declaration, importKind, symbol, targetFlags }) {
       if (importKind === 3 /* CommonJS */ || importKind === 2 /* Namespace */ || declaration.kind === 269 /* ImportEqualsDeclaration */) {
         return void 0;
       }
@@ -140933,11 +140938,13 @@ ${lanes.join("\n")}
         return (importKind === 0 /* Named */ || importKind === 1 /* Default */) && declaration.name.kind === 204 /* ObjectBindingPattern */ ? { kind: 2 /* AddToExisting */, importClauseOrBindingPattern: declaration.name, importKind, moduleSpecifier: declaration.initializer.arguments[0].text, addAsTypeOnly: 4 /* NotAllowed */ } : void 0;
       }
       const { importClause } = declaration;
-      if (!importClause || !isStringLiteralLike(declaration.moduleSpecifier))
+      if (!importClause || !isStringLiteralLike(declaration.moduleSpecifier)) {
         return void 0;
+      }
       const { name, namedBindings } = importClause;
-      if (importClause.isTypeOnly && !(importKind === 0 /* Named */ && namedBindings))
+      if (importClause.isTypeOnly && !(importKind === 0 /* Named */ && namedBindings)) {
         return void 0;
+      }
       const addAsTypeOnly = getAddAsTypeOnly(
         isValidTypeOnlyUseSite,
         /*isForNewImportDeclaration*/
@@ -140948,10 +140955,12 @@ ${lanes.join("\n")}
         compilerOptions
       );
       if (importKind === 1 /* Default */ && (name || // Cannot add a default import to a declaration that already has one
-      addAsTypeOnly === 2 /* Required */ && namedBindings))
+      addAsTypeOnly === 2 /* Required */ && namedBindings)) {
         return void 0;
-      if (importKind === 0 /* Named */ && (namedBindings == null ? void 0 : namedBindings.kind) === 272 /* NamespaceImport */)
+      }
+      if (importKind === 0 /* Named */ && (namedBindings == null ? void 0 : namedBindings.kind) === 272 /* NamespaceImport */) {
         return void 0;
+      }
       return {
         kind: 2 /* AddToExisting */,
         importClauseOrBindingPattern: importClause,
@@ -140959,7 +140968,7 @@ ${lanes.join("\n")}
         moduleSpecifier: declaration.moduleSpecifier.text,
         addAsTypeOnly
       };
-    });
+    }
   }
   function createExistingImportMap(checker, importingFile, compilerOptions) {
     let importMap;
@@ -141388,7 +141397,6 @@ ${lanes.join("\n")}
           importClauseOrBindingPattern,
           importKind === 1 /* Default */ ? { name: symbolName2, addAsTypeOnly } : void 0,
           importKind === 0 /* Named */ ? [{ name: symbolName2, addAsTypeOnly }] : emptyArray,
-          compilerOptions,
           preferences
         );
         const moduleSpecifierWithoutQuotes = stripQuotes(moduleSpecifier);
@@ -141490,7 +141498,7 @@ ${lanes.join("\n")}
       }
     }
   }
-  function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImports, compilerOptions, preferences) {
+  function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImports, preferences) {
     var _a2;
     if (clause.kind === 204 /* ObjectBindingPattern */) {
       if (defaultImport) {
@@ -141508,7 +141516,6 @@ ${lanes.join("\n")}
     }
     const promoteFromTypeOnly2 = clause.isTypeOnly && some([defaultImport, ...namedImports], (i) => (i == null ? void 0 : i.addAsTypeOnly) === 4 /* NotAllowed */);
     const existingSpecifiers = clause.namedBindings && ((_a2 = tryCast(clause.namedBindings, isNamedImports)) == null ? void 0 : _a2.elements);
-    const convertExistingToTypeOnly = promoteFromTypeOnly2 && importNameElisionDisabled(compilerOptions);
     if (defaultImport) {
       Debug.assert(!clause.name, "Cannot add a default import to an import clause that already has one");
       changes.insertNodeAt(sourceFile, clause.getStart(sourceFile), factory.createIdentifier(defaultImport.name), { suffix: ", " });
@@ -141539,7 +141546,7 @@ ${lanes.join("\n")}
       const specifierSort = (existingSpecifiers == null ? void 0 : existingSpecifiers.length) && ts_OrganizeImports_exports.detectImportSpecifierSorting(existingSpecifiers, preferences);
       if (specifierSort && !(ignoreCaseForSorting && specifierSort === 1 /* CaseSensitive */)) {
         for (const spec of newSpecifiers) {
-          const insertionIndex = convertExistingToTypeOnly && !spec.isTypeOnly ? 0 : ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(existingSpecifiers, spec, comparer);
+          const insertionIndex = promoteFromTypeOnly2 && !spec.isTypeOnly ? 0 : ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(existingSpecifiers, spec, comparer);
           changes.insertImportSpecifierAtIndex(sourceFile, spec, clause.namedBindings, insertionIndex);
         }
       } else if (existingSpecifiers == null ? void 0 : existingSpecifiers.length) {
@@ -141559,7 +141566,7 @@ ${lanes.join("\n")}
     }
     if (promoteFromTypeOnly2) {
       changes.delete(sourceFile, getTypeKeywordOfTypeOnlyImport(clause, sourceFile));
-      if (convertExistingToTypeOnly && existingSpecifiers) {
+      if (existingSpecifiers) {
         for (const specifier of existingSpecifiers) {
           changes.insertModifierBefore(sourceFile, 155 /* TypeKeyword */, specifier);
         }
@@ -168202,7 +168209,7 @@ ${options.prefix}` : "\n" : options.prefix
           if (pendingTimeout) {
             this.host.clearTimeout(pendingTimeout);
           }
-          this.pendingTimeouts.set(operationId, this.host.setTimeout(ThrottledOperations.run, delay, this, operationId, cb));
+          this.pendingTimeouts.set(operationId, this.host.setTimeout(ThrottledOperations.run, delay, operationId, this, cb));
           if (this.logger) {
             this.logger.info(`Scheduled: ${operationId}${pendingTimeout ? ", Cancelled earlier one" : ""}`);
           }
@@ -168214,7 +168221,7 @@ ${options.prefix}` : "\n" : options.prefix
           this.host.clearTimeout(pendingTimeout);
           return this.pendingTimeouts.delete(operationId);
         }
-        static run(self, operationId, cb) {
+        static run(operationId, self, cb) {
           var _a2, _b;
           (_a2 = perfLogger) == null ? void 0 : _a2.logStartScheduledOperation(operationId);
           self.pendingTimeouts.delete(operationId);
@@ -175238,21 +175245,21 @@ ${json}${newLine}`;
           this.setTimerHandle(void 0);
           this.setImmediateId(void 0);
         }
-        immediate(action) {
+        immediate(actionType, action) {
           const requestId = this.requestId;
           Debug.assert(requestId === this.operationHost.getCurrentRequestId(), "immediate: incorrect request id");
           this.setImmediateId(this.operationHost.getServerHost().setImmediate(() => {
             this.immediateId = void 0;
             this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action));
-          }));
+          }, actionType));
         }
-        delay(ms, action) {
+        delay(actionType, ms, action) {
           const requestId = this.requestId;
           Debug.assert(requestId === this.operationHost.getCurrentRequestId(), "delay: incorrect request id");
           this.setTimerHandle(this.operationHost.getServerHost().setTimeout(() => {
             this.timerHandle = void 0;
             this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action));
-          }, ms));
+          }, ms, actionType));
         }
         executeAction(action) {
           var _a2, _b, _c, _d, _e, _f;
@@ -176289,7 +176296,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
           const goNext = () => {
             index++;
             if (checkList.length > index) {
-              next.delay(followMs, checkOne);
+              next.delay("checkOne", followMs, checkOne);
             }
           };
           const checkOne = () => {
@@ -176317,7 +176324,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
               goNext();
               return;
             }
-            next.immediate(() => {
+            next.immediate("semanticCheck", () => {
               this.semanticCheck(fileName, project);
               if (this.changeSeq !== seq) {
                 return;
@@ -176326,14 +176333,14 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
                 goNext();
                 return;
               }
-              next.immediate(() => {
+              next.immediate("suggestionCheck", () => {
                 this.suggestionCheck(fileName, project);
                 goNext();
               });
             });
           };
           if (checkList.length > index && this.changeSeq === seq) {
-            next.delay(ms, checkOne);
+            next.delay("checkOne", ms, checkOne);
           }
         }
         cleanProjects(caption, projects) {

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230330`;
+      version = `${versionMajorMinor}.0-dev.20230331`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -5336,7 +5336,7 @@ ${lanes.join("\n")}
       queue.pollScheduled = false;
       return queue;
     }
-    function pollPollingIntervalQueue(queue) {
+    function pollPollingIntervalQueue(_timeoutType, queue) {
       queue.pollIndex = pollQueue(queue, queue.pollingInterval, queue.pollIndex, pollingChunkSize[queue.pollingInterval]);
       if (queue.length) {
         scheduleNextPoll(queue.pollingInterval);
@@ -5345,7 +5345,7 @@ ${lanes.join("\n")}
         queue.pollScheduled = false;
       }
     }
-    function pollLowPollingIntervalQueue(queue) {
+    function pollLowPollingIntervalQueue(_timeoutType, queue) {
       pollQueue(
         changedFilesInLastPoll,
         250 /* Low */,
@@ -5353,7 +5353,7 @@ ${lanes.join("\n")}
         0,
         changedFilesInLastPoll.length
       );
-      pollPollingIntervalQueue(queue);
+      pollPollingIntervalQueue(_timeoutType, queue);
       if (!queue.pollScheduled && changedFilesInLastPoll.length) {
         scheduleNextPoll(250 /* Low */);
       }
@@ -5410,7 +5410,7 @@ ${lanes.join("\n")}
       }
     }
     function scheduleNextPoll(pollingInterval) {
-      pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingIntervalQueue(pollingInterval));
+      pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === 250 /* Low */ ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
     }
   }
   function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames) {
@@ -5489,7 +5489,7 @@ ${lanes.join("\n")}
     function scheduleNextPoll() {
       if (!watchedFiles.length || pollScheduled)
         return;
-      pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */);
+      pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */, "pollQueue");
     }
   }
   function createSingleWatcherPerName(cache, useCaseSensitiveFileNames, name, callback, createWatcher) {
@@ -5655,7 +5655,7 @@ ${lanes.join("\n")}
         clearTimeout2(timerToUpdateChildWatches);
         timerToUpdateChildWatches = void 0;
       }
-      timerToUpdateChildWatches = setTimeout2(onTimerToUpdateChildWatches, 1e3);
+      timerToUpdateChildWatches = setTimeout2(onTimerToUpdateChildWatches, 1e3, "timerToUpdateChildWatches");
     }
     function onTimerToUpdateChildWatches() {
       timerToUpdateChildWatches = void 0;
@@ -7532,7 +7532,6 @@ ${lanes.join("\n")}
         Constructors_for_derived_classes_must_contain_a_super_call: diag(2377, 1 /* Error */, "Constructors_for_derived_classes_must_contain_a_super_call_2377", "Constructors for derived classes must contain a 'super' call."),
         A_get_accessor_must_return_a_value: diag(2378, 1 /* Error */, "A_get_accessor_must_return_a_value_2378", "A 'get' accessor must return a value."),
         Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_with_exactOptionalPropertyTypes_Colon_true_Consider_adding_undefined_to_the_types_of_the_target_s_properties: diag(2379, 1 /* Error */, "Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_with_exactOptionalPropertyTypes_Colon_tr_2379", "Argument of type '{0}' is not assignable to parameter of type '{1}' with 'exactOptionalPropertyTypes: true'. Consider adding 'undefined' to the types of the target's properties."),
-        The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type: diag(2380, 1 /* Error */, "The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type_2380", "The return type of a 'get' accessor must be assignable to its 'set' accessor type"),
         Overload_signatures_must_all_be_exported_or_non_exported: diag(2383, 1 /* Error */, "Overload_signatures_must_all_be_exported_or_non_exported_2383", "Overload signatures must all be exported or non-exported."),
         Overload_signatures_must_all_be_ambient_or_non_ambient: diag(2384, 1 /* Error */, "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", "Overload signatures must all be ambient or non-ambient."),
         Overload_signatures_must_all_be_public_private_or_protected: diag(2385, 1 /* Error */, "Overload_signatures_must_all_be_public_private_or_protected_2385", "Overload signatures must all be public, private or protected."),
@@ -77092,11 +77091,6 @@ ${lanes.join("\n")}
               error(getter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
               error(setter.name, Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
             }
-            const getterType = getAnnotatedAccessorType(getter);
-            const setterType = getAnnotatedAccessorType(setter);
-            if (getterType && setterType) {
-              checkTypeAssignableTo(getterType, setterType, getter, Diagnostics.The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type);
-            }
           }
         }
         const returnType = getTypeOfAccessors(getSymbolOfDeclaration(node));
@@ -123043,7 +123037,7 @@ ${lanes.join("\n")}
       }
       const pending = clearInvalidateResolutionsOfFailedLookupLocations();
       writeLog(`Scheduling invalidateFailedLookup${pending ? ", Cancelled earlier one" : ""}`);
-      timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250);
+      timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250, "timerToInvalidateFailedLookupResolutions");
     }
     function invalidateResolutionsOfFailedLookup() {
       timerToInvalidateFailedLookupResolutions = void 0;
@@ -123059,7 +123053,7 @@ ${lanes.join("\n")}
         host.clearTimeout(timerToUpdateProgram);
       }
       writeLog("Scheduling update");
-      timerToUpdateProgram = host.setTimeout(updateProgramWithWatchStatus, 250);
+      timerToUpdateProgram = host.setTimeout(updateProgramWithWatchStatus, 250, "timerToUpdateProgram");
     }
     function scheduleProgramReload() {
       Debug.assert(!!configFileName);
@@ -124969,9 +124963,9 @@ ${lanes.join("\n")}
     if (state.timerToBuildInvalidatedProject) {
       hostWithWatch.clearTimeout(state.timerToBuildInvalidatedProject);
     }
-    state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, state, changeDetected);
+    state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, "timerToBuildInvalidatedProject", state, changeDetected);
   }
-  function buildNextInvalidatedProject(state, changeDetected) {
+  function buildNextInvalidatedProject(_timeoutType, state, changeDetected) {
     mark("SolutionBuilder::beforeBuild");
     const buildOrder = buildNextInvalidatedProjectWorker(state, changeDetected);
     mark("SolutionBuilder::afterBuild");
@@ -140741,7 +140735,6 @@ ${lanes.join("\n")}
           importClauseOrBindingPattern,
           defaultImport,
           arrayFrom(namedImports.entries(), ([name, addAsTypeOnly]) => ({ addAsTypeOnly, name })),
-          compilerOptions,
           preferences
         );
       });
@@ -140939,7 +140932,19 @@ ${lanes.join("\n")}
     return 1 /* Allowed */;
   }
   function tryAddToExistingImport(existingImports, isValidTypeOnlyUseSite, checker, compilerOptions) {
-    return firstDefined(existingImports, ({ declaration, importKind, symbol, targetFlags }) => {
+    let best;
+    for (const existingImport of existingImports) {
+      const fix = getAddToExistingImportFix(existingImport);
+      if (!fix)
+        continue;
+      const isTypeOnly = isTypeOnlyImportDeclaration(fix.importClauseOrBindingPattern);
+      if (fix.addAsTypeOnly !== 4 /* NotAllowed */ && isTypeOnly || fix.addAsTypeOnly === 4 /* NotAllowed */ && !isTypeOnly) {
+        return fix;
+      }
+      best != null ? best : best = fix;
+    }
+    return best;
+    function getAddToExistingImportFix({ declaration, importKind, symbol, targetFlags }) {
       if (importKind === 3 /* CommonJS */ || importKind === 2 /* Namespace */ || declaration.kind === 269 /* ImportEqualsDeclaration */) {
         return void 0;
       }
@@ -140947,11 +140952,13 @@ ${lanes.join("\n")}
         return (importKind === 0 /* Named */ || importKind === 1 /* Default */) && declaration.name.kind === 204 /* ObjectBindingPattern */ ? { kind: 2 /* AddToExisting */, importClauseOrBindingPattern: declaration.name, importKind, moduleSpecifier: declaration.initializer.arguments[0].text, addAsTypeOnly: 4 /* NotAllowed */ } : void 0;
       }
       const { importClause } = declaration;
-      if (!importClause || !isStringLiteralLike(declaration.moduleSpecifier))
+      if (!importClause || !isStringLiteralLike(declaration.moduleSpecifier)) {
         return void 0;
+      }
       const { name, namedBindings } = importClause;
-      if (importClause.isTypeOnly && !(importKind === 0 /* Named */ && namedBindings))
+      if (importClause.isTypeOnly && !(importKind === 0 /* Named */ && namedBindings)) {
         return void 0;
+      }
       const addAsTypeOnly = getAddAsTypeOnly(
         isValidTypeOnlyUseSite,
         /*isForNewImportDeclaration*/
@@ -140962,10 +140969,12 @@ ${lanes.join("\n")}
         compilerOptions
       );
       if (importKind === 1 /* Default */ && (name || // Cannot add a default import to a declaration that already has one
-      addAsTypeOnly === 2 /* Required */ && namedBindings))
+      addAsTypeOnly === 2 /* Required */ && namedBindings)) {
         return void 0;
-      if (importKind === 0 /* Named */ && (namedBindings == null ? void 0 : namedBindings.kind) === 272 /* NamespaceImport */)
+      }
+      if (importKind === 0 /* Named */ && (namedBindings == null ? void 0 : namedBindings.kind) === 272 /* NamespaceImport */) {
         return void 0;
+      }
       return {
         kind: 2 /* AddToExisting */,
         importClauseOrBindingPattern: importClause,
@@ -140973,7 +140982,7 @@ ${lanes.join("\n")}
         moduleSpecifier: declaration.moduleSpecifier.text,
         addAsTypeOnly
       };
-    });
+    }
   }
   function createExistingImportMap(checker, importingFile, compilerOptions) {
     let importMap;
@@ -141402,7 +141411,6 @@ ${lanes.join("\n")}
           importClauseOrBindingPattern,
           importKind === 1 /* Default */ ? { name: symbolName2, addAsTypeOnly } : void 0,
           importKind === 0 /* Named */ ? [{ name: symbolName2, addAsTypeOnly }] : emptyArray,
-          compilerOptions,
           preferences
         );
         const moduleSpecifierWithoutQuotes = stripQuotes(moduleSpecifier);
@@ -141504,7 +141512,7 @@ ${lanes.join("\n")}
       }
     }
   }
-  function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImports, compilerOptions, preferences) {
+  function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImports, preferences) {
     var _a2;
     if (clause.kind === 204 /* ObjectBindingPattern */) {
       if (defaultImport) {
@@ -141522,7 +141530,6 @@ ${lanes.join("\n")}
     }
     const promoteFromTypeOnly2 = clause.isTypeOnly && some([defaultImport, ...namedImports], (i) => (i == null ? void 0 : i.addAsTypeOnly) === 4 /* NotAllowed */);
     const existingSpecifiers = clause.namedBindings && ((_a2 = tryCast(clause.namedBindings, isNamedImports)) == null ? void 0 : _a2.elements);
-    const convertExistingToTypeOnly = promoteFromTypeOnly2 && importNameElisionDisabled(compilerOptions);
     if (defaultImport) {
       Debug.assert(!clause.name, "Cannot add a default import to an import clause that already has one");
       changes.insertNodeAt(sourceFile, clause.getStart(sourceFile), factory.createIdentifier(defaultImport.name), { suffix: ", " });
@@ -141553,7 +141560,7 @@ ${lanes.join("\n")}
       const specifierSort = (existingSpecifiers == null ? void 0 : existingSpecifiers.length) && ts_OrganizeImports_exports.detectImportSpecifierSorting(existingSpecifiers, preferences);
       if (specifierSort && !(ignoreCaseForSorting && specifierSort === 1 /* CaseSensitive */)) {
         for (const spec of newSpecifiers) {
-          const insertionIndex = convertExistingToTypeOnly && !spec.isTypeOnly ? 0 : ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(existingSpecifiers, spec, comparer);
+          const insertionIndex = promoteFromTypeOnly2 && !spec.isTypeOnly ? 0 : ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(existingSpecifiers, spec, comparer);
           changes.insertImportSpecifierAtIndex(sourceFile, spec, clause.namedBindings, insertionIndex);
         }
       } else if (existingSpecifiers == null ? void 0 : existingSpecifiers.length) {
@@ -141573,7 +141580,7 @@ ${lanes.join("\n")}
     }
     if (promoteFromTypeOnly2) {
       changes.delete(sourceFile, getTypeKeywordOfTypeOnlyImport(clause, sourceFile));
-      if (convertExistingToTypeOnly && existingSpecifiers) {
+      if (existingSpecifiers) {
         for (const specifier of existingSpecifiers) {
           changes.insertModifierBefore(sourceFile, 155 /* TypeKeyword */, specifier);
         }

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230330`;
+var version = `${versionMajorMinor}.0-dev.20230331`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3488,7 +3488,7 @@ function createDynamicPriorityPollingWatchFile(host) {
     queue.pollScheduled = false;
     return queue;
   }
-  function pollPollingIntervalQueue(queue) {
+  function pollPollingIntervalQueue(_timeoutType, queue) {
     queue.pollIndex = pollQueue(queue, queue.pollingInterval, queue.pollIndex, pollingChunkSize[queue.pollingInterval]);
     if (queue.length) {
       scheduleNextPoll(queue.pollingInterval);
@@ -3497,7 +3497,7 @@ function createDynamicPriorityPollingWatchFile(host) {
       queue.pollScheduled = false;
     }
   }
-  function pollLowPollingIntervalQueue(queue) {
+  function pollLowPollingIntervalQueue(_timeoutType, queue) {
     pollQueue(
       changedFilesInLastPoll,
       250 /* Low */,
@@ -3505,7 +3505,7 @@ function createDynamicPriorityPollingWatchFile(host) {
       0,
       changedFilesInLastPoll.length
     );
-    pollPollingIntervalQueue(queue);
+    pollPollingIntervalQueue(_timeoutType, queue);
     if (!queue.pollScheduled && changedFilesInLastPoll.length) {
       scheduleNextPoll(250 /* Low */);
     }
@@ -3562,7 +3562,7 @@ function createDynamicPriorityPollingWatchFile(host) {
     }
   }
   function scheduleNextPoll(pollingInterval) {
-    pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingIntervalQueue(pollingInterval));
+    pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === 250 /* Low */ ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
   }
 }
 function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames) {
@@ -3641,7 +3641,7 @@ function createFixedChunkSizePollingWatchFile(host) {
   function scheduleNextPoll() {
     if (!watchedFiles.length || pollScheduled)
       return;
-    pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */);
+    pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */, "pollQueue");
   }
 }
 function createSingleWatcherPerName(cache, useCaseSensitiveFileNames, name, callback, createWatcher) {
@@ -3809,7 +3809,7 @@ function createDirectoryWatcherSupportingRecursive({
       clearTimeout2(timerToUpdateChildWatches);
       timerToUpdateChildWatches = void 0;
     }
-    timerToUpdateChildWatches = setTimeout2(onTimerToUpdateChildWatches, 1e3);
+    timerToUpdateChildWatches = setTimeout2(onTimerToUpdateChildWatches, 1e3, "timerToUpdateChildWatches");
   }
   function onTimerToUpdateChildWatches() {
     timerToUpdateChildWatches = void 0;
@@ -5596,7 +5596,6 @@ var Diagnostics = {
   Constructors_for_derived_classes_must_contain_a_super_call: diag(2377, 1 /* Error */, "Constructors_for_derived_classes_must_contain_a_super_call_2377", "Constructors for derived classes must contain a 'super' call."),
   A_get_accessor_must_return_a_value: diag(2378, 1 /* Error */, "A_get_accessor_must_return_a_value_2378", "A 'get' accessor must return a value."),
   Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_with_exactOptionalPropertyTypes_Colon_true_Consider_adding_undefined_to_the_types_of_the_target_s_properties: diag(2379, 1 /* Error */, "Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_with_exactOptionalPropertyTypes_Colon_tr_2379", "Argument of type '{0}' is not assignable to parameter of type '{1}' with 'exactOptionalPropertyTypes: true'. Consider adding 'undefined' to the types of the target's properties."),
-  The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type: diag(2380, 1 /* Error */, "The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type_2380", "The return type of a 'get' accessor must be assignable to its 'set' accessor type"),
   Overload_signatures_must_all_be_exported_or_non_exported: diag(2383, 1 /* Error */, "Overload_signatures_must_all_be_exported_or_non_exported_2383", "Overload signatures must all be exported or non-exported."),
   Overload_signatures_must_all_be_ambient_or_non_ambient: diag(2384, 1 /* Error */, "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", "Overload signatures must all be ambient or non-ambient."),
   Overload_signatures_must_all_be_public_private_or_protected: diag(2385, 1 /* Error */, "Overload_signatures_must_all_be_public_private_or_protected_2385", "Overload signatures must all be public, private or protected."),

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.1.0-dev.20230330",
+    "version": "5.1.0-dev.20230331",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "14.21.1",
         "npm": "8.19.3"
     },
-    "gitHead": "7bde5efe9431f6b7029a612b71a90896a07444b5"
+    "gitHead": "13c374a868c926f6a907666a5599992c1351b773"
 }