@artel/artc 0.6.25277 → 0.6.25279

package/build/api/ApiServices.js

@@ -27,7 +27,6 @@ import {
   DefaultNamesOfDirectoriesToIgnore,
   DereferenceOperatorDeclaration_typeMember,
   DestructorDeclaration,
-  DiagnosticCollector,
   DisplayService,
   Emitter,
   ExpressionAnalysisOptions,
@@ -109,6 +108,7 @@ import {
   Scanner,
   SinglePackageImportDirective,
   SourceFile,
+  SourceFileAnalyzer,
   SourcePackageDependencyGraph,
   StatementBlock,
   StatementList,
@@ -117,6 +117,7 @@ import {
   Tag,
   TagList,
   TargetPlatformConfig,
+  TaskController,
   Token,
   TokenExpression,
   TopLevelTranslationList,
@@ -182,100 +183,36 @@ import {
   operatorKinds,
   setUserLocale,
   tokenKindValues,
-  traverseTreeWithCancellationToken,
+  traverseTree,
   unaliasType,
   unwrapParenthesizedExpressions,
   visitChildren,
-  yieldExecution
-} from "../chunk-EVYL6VFM.js";
+  yieldTask
+} from "../chunk-HPU7DXMO.js";
 
-// source/services/CustomCommand.ts
+// source/services/CustomRequests.ts
 import * as ls from "vscode-languageserver";
-var customCommandName = {
-  /**
-   * Возвращает `string[] | null`.
-   */
-  getLocalesAvailableForTranslation: "artel/getLocalesAvailableForTranslation",
-  /**
-   * Возвращает `string | null`.
-   */
-  translateProject: "artel/translateSourceFile",
-  /**
-   * Возвращает `EvaluatableExpression | null`.
-   */
-  provideEvaluatableExpression: "artel/provideEvaluatableExpression",
-  /**
-   * Возвращает `string | null`.
-   */
-  provideServerOwnedDocumentContent: "artel/provideServerOwnedDocumentContent",
-  /**
-   * Возвращает `EmitCodeToStringResult`.
-   */
-  emitCodeToString: "artel/emitCodeToString",
-  /**
-   * Возвращает `string | null`.
-   */
-  displayFileSystemTree: "artel/displayFileSystemTree",
-  /**
-   * Возвращает `void`.
-   */
-  createOrUpdateSourceFile: "artel/fs.createOrUpdateSourceFile",
-  /**
-   * Возвращает `void`.
-   */
-  deleteSourceFile: "artel/fs.deleteSourceFile",
-  /**
-   * Возвращает `ls.Range | null`.
-   */
-  getNodeRange: "artel/getNodeRange",
-  /**
-   * Возвращает `void`.
-   */
-  assignField: "artel/assignField"
-};
-function isProvideEvaluatableExpressionParams(value) {
-  cast(value);
-  return !isNullOrUndefined(value) && ls.TextDocumentIdentifier.is(value.textDocument) && ls.Position.is(value.position);
-}
-function isProvideServerOwnedDocumentContentParams(value) {
-  cast(value);
-  return !isNullOrUndefined(value) && ls.DocumentUri.is(value.uri);
-}
-function isEmitCodeToStringParams(value) {
-  cast(value);
-  return !isNullOrUndefined(value) && (value.workspaceFolderUri === void 0 || ls.URI.is(value.workspaceFolderUri));
-}
-function isDisplayFileSystemTreeParams(value) {
-  cast(value);
-  return !isNullOrUndefined(value) && (value.workspaceFolderUri === void 0 || ls.URI.is(value.workspaceFolderUri)) && (value.log === void 0 || typeof value.log === "boolean");
-}
-function isCreateOrUpdateSourceFileParams(value) {
-  cast(value);
-  return !isNullOrUndefined(value) && ls.DocumentUri.is(value.uri) && typeof value.text === "string";
-}
-function isDeleteSourceFileParams(value) {
-  cast(value);
-  return !isNullOrUndefined(value) && ls.DocumentUri.is(value.uri);
-}
-function isGetNodeRangeParams(value) {
-  cast(value);
-  return !isNullOrUndefined(value) && ls.DocumentUri.is(value.uri);
-}
-function isAssignFieldParams(value) {
-  cast(value);
-  return !isNullOrUndefined(value) && ls.DocumentUri.is(value.functionNodePath) && typeof value.fieldName === "string" && typeof value.value === "string" && (value.lastAssignmentLocation === void 0 || ls.DocumentUri.is(value.lastAssignmentLocation));
-}
-function isNullOrUndefined(value) {
-  return value === null || value === void 0;
-}
-function cast(value) {
-}
+var CustomRequestType = class extends ls.RequestType {
+};
+var customRequests = {
+  getLocalesAvailableForTranslation: new CustomRequestType("artel/getLocalesAvailableForTranslation"),
+  translateSourceFile: new CustomRequestType("artel/translateSourceFile"),
+  provideEvaluatableExpression: new CustomRequestType("artel/provideEvaluatableExpression"),
+  provideServerOwnedDocumentContent: new CustomRequestType("artel/provideServerOwnedDocumentContent"),
+  emitCodeToString: new CustomRequestType("artel/emitCodeToString"),
+  displayFileSystemTree: new CustomRequestType("artel/displayFileSystemTree"),
+  createOrUpdateSourceFile: new CustomRequestType("artel/fs.createOrUpdateSourceFile"),
+  deleteSourceFile: new CustomRequestType("artel/fs.deleteSourceFile"),
+  getNodeRange: new CustomRequestType("artel/getNodeRange"),
+  assignField: new CustomRequestType("artel/assignField"),
+  deleteBlockFromScript: new CustomRequestType("artel/deleteBlockFromScript")
+};
 
 // source/services/LanguageServer.ts
-import { atomic as atomic6, runAtomically as runAtomically3 } from "reactronic";
+import { atomic as atomic7, runAtomically as runAtomically2 } from "reactronic";
 import * as ls3 from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
-import { URI as URI2 } from "vscode-uri";
+import { URI } from "vscode-uri";
 
 // source/services/Types.ts
 import * as ls2 from "vscode-languageserver";
@@ -517,7 +454,7 @@ var SyntaxFactory = class {
   }
   static structuredTypeDeclarationBody(structuredTypeKind, baseTypes, members) {
     const structuredTypeKindKeyword = this.keyword(structuredTypeKind);
-    const baseTypeList = baseTypes !== void 0 ? new BaseTypeList(this.createTokenSeparatedElements(baseTypes, 25 /* Comma */), void 0) : void 0;
+    const baseTypeList = baseTypes !== void 0 && baseTypes.length > 0 ? new BaseTypeList(this.createTokenSeparatedElements(baseTypes, 25 /* Comma */), void 0) : void 0;
     const memberBlock = this.typeMemberDeclarationBlock(members);
     return new StructuredTypeDeclarationBody(
       structuredTypeKindKeyword,
@@ -1110,17 +1047,17 @@ var SyntaxFactory = class {
 
 // source/tree/SyntaxToCode.ts
 var SyntaxToCode = class _SyntaxToCode {
-  constructor(node, options6) {
+  constructor(node, options7) {
     this.code = "";
     this.isIndentationWritten = false;
     this.isSingleLineMode = false;
     this.node = node;
-    this.newLine = options6?.newLine ?? "\n";
-    this.indentationStep = options6?.indentationStep ?? "  ";
-    this.keywordsLocale = options6?.keywordsLocale ?? 1 /* Ru */;
-    this.keywordsDialect = options6?.keywordsDialect ?? DefaultDialect;
+    this.newLine = options7?.newLine ?? "\n";
+    this.indentationStep = options7?.indentationStep ?? "  ";
+    this.keywordsLocale = options7?.keywordsLocale ?? 1 /* Ru */;
+    this.keywordsDialect = options7?.keywordsDialect ?? DefaultDialect;
     this.singleWordKeywordValues = Query.from(getOrCreateKeywordDictionary(this.keywordsLocale, this.keywordsDialect).values()).mapAndFilter((k) => k.keywordKind !== 0 /* Unknown */ ? k.value : void 0).uniqueToSet();
-    this.indentation = options6?.initialIndentation ?? "";
+    this.indentation = options7?.initialIndentation ?? "";
   }
   static get writeFunctions() {
     return this.writeFunctions_ ??= this.createWriteFunctions();
@@ -2606,7 +2543,7 @@ var TranslationsGenerator = class _TranslationsGenerator {
   }
   isNotTranslatedEntity(entity) {
     const translation = entity.getTranslation();
-    return translation === void 0 || translation.definition.kind === "intrinsic" && translation.definition.isMissingTranslationReplacement;
+    return translation === void 0 || translation.definition.kind === "intrinsic";
   }
   createPackageMemberTranslationNode(entity) {
     switch (entity.kind) {
@@ -3452,11 +3389,9 @@ var CompletionService = class {
       hasPrecedingKeyword = true;
     }
     if (translationsDeclaration !== void 0) {
-      const sourceLocale = translationPackage.getTargetPackage().getLocale();
       const translatedPackageMemberLookup = new PackageMemberLookup(translationPackage.getTargetPackage());
       const hidingMatcher = semanticContext.getHidingMatcher();
       return new TopLevelTranslationListCompletionContext(
-        sourceLocale,
         translatedPackageMemberLookup,
         hidingMatcher,
         translationKind,
@@ -3493,7 +3428,6 @@ var CompletionService = class {
       hasPrecedingKeyword = true;
     }
     if (typeTranslation !== void 0) {
-      const sourceLocale = translationPackage.getTargetPackage().getLocale();
       let type;
       if (this.sourceFile.package.kind === "translation") {
         const translationPackage2 = this.analyzer.getAnalyzedTranslationPackageIfTargetResolved(this.sourceFile.package);
@@ -3503,13 +3437,7 @@ var CompletionService = class {
         }
       }
       const hidingMatcher = semanticContext.getHidingMatcher();
-      return new TypeMemberTranslationListCompletionContext(
-        sourceLocale,
-        type,
-        hidingMatcher,
-        translationKind,
-        hasPrecedingKeyword
-      );
+      return new TypeMemberTranslationListCompletionContext(type, hidingMatcher, translationKind, hasPrecedingKeyword);
     }
     return void 0;
   }
@@ -3992,8 +3920,8 @@ var CompletionService = class {
   getTypeMemberCompletionItemInfos(ctx) {
     const type = this.analyzer.excludeNullFromType(ctx.type);
     const memberLookup = TypeMemberLookup.ofType(this.analyzer, type, this.locale);
-    const options6 = ctx.isStaticAccess ? 2 /* OnlyStaticMembers */ : 1 /* OnlyInstanceMembers */;
-    return memberLookup.getNamedMembers(options6, ctx.hidingMatcher, ctx.typeExtensionLookup).map((m) => {
+    const options7 = ctx.isStaticAccess ? 2 /* OnlyStaticMembers */ : 1 /* OnlyInstanceMembers */;
+    return memberLookup.getNamedMembers(options7, ctx.hidingMatcher, ctx.typeExtensionLookup).map((m) => {
       switch (m.kind) {
         case "method":
           return new MethodCompletionItemInfo(this.completionItemInfoContext, m);
@@ -4002,7 +3930,7 @@ var CompletionService = class {
         default:
           Debug.never(m);
       }
-    }).concat(memberLookup.getOperators(options6, ctx.hidingMatcher, ctx.typeExtensionLookup).map((o) => new OperatorCompletionItemInfo(this.completionItemInfoContext, o)));
+    }).concat(memberLookup.getOperators(options7, ctx.hidingMatcher, ctx.typeExtensionLookup).map((o) => new OperatorCompletionItemInfo(this.completionItemInfoContext, o)));
   }
   getPackageImportCompletionItemInfos(ctx) {
     const result = this.analyzer.packageImports.getPackagesAvailableForImport(this.sourceFile.package).map((p) => p.getName()).filter((n) => {
@@ -4019,20 +3947,13 @@ var CompletionService = class {
   }
   getTopLevelAliasListCompletionItemInfos(ctx) {
     let result;
-    const displayService_ = new DisplayService(
-      this.analyzer,
-      ctx.sourceLocale,
-      this.dialect,
-      this.sourceFile
-    );
     if (ctx.translationKind === 1 /* Method */) {
       result = Query.from(ctx.packageMemberLookup.getNamedMembers(ctx.hidingMatcher)).mapAndFilter((d) => {
         if (d.kind === 1 /* Function */) {
-          return new AliasesSourceFunctionCompletionItemInfo(
+          return new TranslationsSourceFunctionCompletionItemInfo(
             this.completionItemInfoContext,
             d,
-            !ctx.hasPrecedingKeyword,
-            displayService_
+            !ctx.hasPrecedingKeyword
           );
         }
         return void 0;
@@ -4040,11 +3961,10 @@ var CompletionService = class {
     } else if (ctx.translationKind === 2 /* Type */) {
       result = Query.from(ctx.packageMemberLookup.getNamedMembers(ctx.hidingMatcher)).mapAndFilter((d) => {
         if (d.kind === 2 /* Type */) {
-          return new AliasesSourcePackageTypeCompletionItemInfo(
+          return new TranslationsSourcePackageTypeCompletionItemInfo(
             this.completionItemInfoContext,
             d,
-            !ctx.hasPrecedingKeyword,
-            displayService_
+            !ctx.hasPrecedingKeyword
           );
         }
         return void 0;
@@ -4053,20 +3973,18 @@ var CompletionService = class {
       result = Query.from(ctx.packageMemberLookup.getNamedMembers(ctx.hidingMatcher)).map((d) => {
         switch (d.kind) {
           case 0 /* Variable */:
-            return new AliasesSourceVariableCompletionItemInfo(this.completionItemInfoContext, d, displayService_);
+            return new TranslationsSourceVariableCompletionItemInfo(this.completionItemInfoContext, d);
           case 1 /* Function */:
-            return new AliasesSourceFunctionCompletionItemInfo(
+            return new TranslationsSourceFunctionCompletionItemInfo(
               this.completionItemInfoContext,
               d,
-              !ctx.hasPrecedingKeyword,
-              displayService_
+              !ctx.hasPrecedingKeyword
             );
           case 2 /* Type */:
-            return new AliasesSourcePackageTypeCompletionItemInfo(
+            return new TranslationsSourcePackageTypeCompletionItemInfo(
               this.completionItemInfoContext,
               d,
-              !ctx.hasPrecedingKeyword,
-              displayService_
+              !ctx.hasPrecedingKeyword
             );
           default:
             Debug.never(d);
@@ -4081,7 +3999,7 @@ var CompletionService = class {
         12 /* Function */
       ];
       result = result.chain(
-        Query.from(keywords).map((k) => LocalizationHelper.localizeKeyword(k, ctx.sourceLocale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v))).flatMap((i) => i)
+        Query.from(keywords).map((k) => LocalizationHelper.localizeKeyword(k, this.locale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v))).flatMap((i) => i)
       );
     }
     return result.toArray();
@@ -4089,55 +4007,45 @@ var CompletionService = class {
   getTypeAliasMemberListItemInfos(ctx) {
     let result = Query.empty();
     if (ctx.typeEntity !== void 0) {
-      const displayService_ = new DisplayService(
-        this.analyzer,
-        ctx.sourceLocale,
-        this.dialect,
-        this.sourceFile
-      );
       if (ctx.translationKind === 1 /* Method */) {
         result = Query.from(ctx.typeEntity.getMembers().getNamedMembers()).mapAndFilter((m) => {
           if (m.kind === 1 /* Function */) {
-            return new AliasesSourceFunctionCompletionItemInfo(
+            return new TranslationsSourceFunctionCompletionItemInfo(
               this.completionItemInfoContext,
               m,
-              !ctx.hasPrecedingKeyword,
-              displayService_
+              !ctx.hasPrecedingKeyword
             );
           }
           return void 0;
         });
       } else if (ctx.translationKind === 3 /* Constructor */) {
-        result = Query.from(ctx.typeEntity.getMembers().getConstructors()).map((c) => new AliasesSourceConstructorCompletionItemInfo(
+        result = Query.from(ctx.typeEntity.getMembers().getConstructors()).map((c) => new TranslationsSourceConstructorCompletionItemInfo(
           this.completionItemInfoContext,
           c,
-          !ctx.hasPrecedingKeyword,
-          displayService_
+          !ctx.hasPrecedingKeyword
         ));
       } else if (ctx.translationKind === 2 /* Indexer */) {
-        result = Query.from(ctx.typeEntity.getMembers().getIndexers()).map((i) => new AliasesSourceIndexerCompletionItemInfo(this.completionItemInfoContext, i, displayService_));
+        result = Query.from(ctx.typeEntity.getMembers().getIndexers()).map((i) => new TranslationsSourceIndexerCompletionItemInfo(this.completionItemInfoContext, i));
       } else if (ctx.translationKind === 0 /* Any */) {
         result = Query.from(ctx.typeEntity.getMembers().getNamedMembers()).mapAndFilter((m) => {
           if (m.kind === 0 /* Variable */) {
-            return new AliasesSourceVariableCompletionItemInfo(this.completionItemInfoContext, m, displayService_);
+            return new TranslationsSourceVariableCompletionItemInfo(this.completionItemInfoContext, m);
           } else if (m.kind === 1 /* Function */) {
-            return new AliasesSourceFunctionCompletionItemInfo(
+            return new TranslationsSourceFunctionCompletionItemInfo(
               this.completionItemInfoContext,
               m,
-              !ctx.hasPrecedingKeyword,
-              displayService_
+              !ctx.hasPrecedingKeyword
             );
           }
           return void 0;
         }).chain(
-          ctx.typeEntity.getMembers().getConstructors().map((c) => new AliasesSourceConstructorCompletionItemInfo(
+          ctx.typeEntity.getMembers().getConstructors().map((c) => new TranslationsSourceConstructorCompletionItemInfo(
             this.completionItemInfoContext,
             c,
-            !ctx.hasPrecedingKeyword,
-            displayService_
+            !ctx.hasPrecedingKeyword
           ))
         ).chain(
-          ctx.typeEntity.getMembers().getIndexers().map((i) => new AliasesSourceIndexerCompletionItemInfo(this.completionItemInfoContext, i, displayService_))
+          ctx.typeEntity.getMembers().getIndexers().map((i) => new TranslationsSourceIndexerCompletionItemInfo(this.completionItemInfoContext, i))
         );
       } else {
         Debug.never(ctx.translationKind);
@@ -4149,7 +4057,7 @@ var CompletionService = class {
         31 /* Creation */
       ];
       result = result.chain(
-        Query.from(keywords).map((k) => LocalizationHelper.localizeKeyword(k, ctx.sourceLocale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v))).flatMap((i) => i)
+        Query.from(keywords).map((k) => LocalizationHelper.localizeKeyword(k, this.locale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v))).flatMap((i) => i)
       );
     }
     return result.toArray();
@@ -4203,7 +4111,7 @@ var CompletionService = class {
     const seenLabels = /* @__PURE__ */ new Set();
     const result = new Array();
     for (const completionItemInfo of completionItemInfos) {
-      if (completionItemInfo.kind === "aliases-source-function" || completionItemInfo.kind === "aliases-source-package-type") {
+      if (completionItemInfo.kind === "translations-source-function" || completionItemInfo.kind === "translations-source-package-type") {
         result.push(completionItemInfo);
         continue;
       }
@@ -4397,8 +4305,7 @@ var ExpressionCompletionContext = class {
   }
 };
 var TopLevelTranslationListCompletionContext = class {
-  constructor(sourceLocale, packageMemberLookup, hidingMatcher, translationKind, hasPrecedingKeyword) {
-    this.sourceLocale = sourceLocale;
+  constructor(packageMemberLookup, hidingMatcher, translationKind, hasPrecedingKeyword) {
     this.packageMemberLookup = packageMemberLookup;
     this.hidingMatcher = hidingMatcher;
     this.translationKind = translationKind;
@@ -4407,8 +4314,7 @@ var TopLevelTranslationListCompletionContext = class {
   }
 };
 var TypeMemberTranslationListCompletionContext = class {
-  constructor(sourceLocale, typeEntity, hidingMatcher, translationKind, hasPrecedingKeyword) {
-    this.sourceLocale = sourceLocale;
+  constructor(typeEntity, hidingMatcher, translationKind, hasPrecedingKeyword) {
     this.typeEntity = typeEntity;
     this.hidingMatcher = hidingMatcher;
     this.translationKind = translationKind;
@@ -4769,12 +4675,11 @@ var TargetSignatureParameterCompletionItemInfo = class {
     return void 0;
   }
 };
-var AliasesSourceVariableCompletionItemInfo = class {
-  constructor(ctx, variable, displayService) {
+var TranslationsSourceVariableCompletionItemInfo = class {
+  constructor(ctx, variable) {
     this.ctx = ctx;
     this.variable = variable;
-    this.displayService = displayService;
-    this.kind = "aliases-source-variable";
+    this.kind = "translations-source-variable";
   }
   getLabel() {
     return this.ctx.getInsertTextForName(this.variable.getName());
@@ -4794,7 +4699,7 @@ var AliasesSourceVariableCompletionItemInfo = class {
     }
   }
   getDetails() {
-    return this.displayService.displayEntity(this.variable);
+    return this.ctx.displayService.displayEntity(this.variable);
   }
   getInsertText() {
     return void 0;
@@ -4806,13 +4711,12 @@ var AliasesSourceVariableCompletionItemInfo = class {
     return void 0;
   }
 };
-var AliasesSourceFunctionCompletionItemInfo = class {
-  constructor(ctx, func, includeFunctionKeyword, displayService) {
+var TranslationsSourceFunctionCompletionItemInfo = class {
+  constructor(ctx, func, includeFunctionKeyword) {
     this.ctx = ctx;
     this.func = func;
     this.includeFunctionKeyword = includeFunctionKeyword;
-    this.displayService = displayService;
-    this.kind = "aliases-source-function";
+    this.kind = "translations-source-function";
   }
   getLabel() {
     return this.ctx.getInsertTextForName(this.func.getName());
@@ -4830,15 +4734,14 @@ var AliasesSourceFunctionCompletionItemInfo = class {
     }
   }
   getDetails() {
-    return this.displayService.displayFunctionDeclaration(new FunctionDeclaration_entity(this.func));
+    return this.ctx.displayService.displayFunctionDeclaration(new FunctionDeclaration_entity(this.func));
   }
   getInsertText() {
-    const displayParts = this.displayService.getFunctionDeclarationDisplayParts(
-      new FunctionDeclaration_entity(this.func)
-    );
-    const keywordWithWhitespace = this.includeFunctionKeyword ? displayParts.functionKeyword + displayParts.whitespaceAfterFunctionKeyword : "";
-    const parameters = displayParts.parameters.map((p) => p.name).join(displayParts.typeParameterSeparator);
-    return keywordWithWhitespace + displayParts.name + displayParts.typeParametersStart + displayParts.typeParameters.join(displayParts.typeParameterSeparator) + displayParts.typeParametersEnd + displayParts.parametersStart + parameters + displayParts.parametersEnd;
+    const keywordWithWhitespace = this.includeFunctionKeyword ? `${this.ctx.displayService.displayKeyword(12 /* Function */)} ` : "";
+    const typeParameters = this.func.getTypeParameters().map((p) => this.ctx.getInsertTextForName(p.getName(), true)).join(", ");
+    const typeParametersWithAngles = typeParameters.length > 0 ? `<${typeParameters}>` : "";
+    const parameters = this.func.getParameters().map((p) => this.ctx.getInsertTextForName(p.getName(), true)).join(", ");
+    return `${keywordWithWhitespace}${this.ctx.getInsertTextForName(this.func.getName())}${typeParametersWithAngles}(${parameters})`;
   }
   getSortText() {
     return void 0;
@@ -4847,13 +4750,12 @@ var AliasesSourceFunctionCompletionItemInfo = class {
     return void 0;
   }
 };
-var AliasesSourcePackageTypeCompletionItemInfo = class {
-  constructor(ctx, typeEntity, includeTypeKeyword, displayService) {
+var TranslationsSourcePackageTypeCompletionItemInfo = class {
+  constructor(ctx, typeEntity, includeTypeKeyword) {
     this.ctx = ctx;
     this.typeEntity = typeEntity;
     this.includeTypeKeyword = includeTypeKeyword;
-    this.displayService = displayService;
-    this.kind = "aliases-source-package-type";
+    this.kind = "translations-source-package-type";
   }
   getLabel() {
     return this.ctx.getInsertTextForName(this.typeEntity.getName());
@@ -4883,13 +4785,18 @@ var AliasesSourcePackageTypeCompletionItemInfo = class {
   }
   getDetails() {
     const typeDeclaration = this.getDisplayServiceTypeDeclaration();
-    return this.displayService.displayTypeDeclaration(typeDeclaration);
+    return this.ctx.displayService.displayTypeDeclaration(typeDeclaration);
   }
   getInsertText() {
-    const typeDeclaration = this.getDisplayServiceTypeDeclaration();
-    const displayParts = this.displayService.getTypeDeclarationDisplayParts(typeDeclaration);
-    const keywordWithWhitespace = this.includeTypeKeyword ? displayParts.typeKeyword + displayParts.whitespaceAfterTypeKeyword : "";
-    return keywordWithWhitespace + displayParts.name + displayParts.typeParametersStart + displayParts.typeParameters.join(displayParts.typeParameterSeparator) + displayParts.typeParametersEnd;
+    const keywordWithWhitespace = this.includeTypeKeyword ? `${this.ctx.displayService.displayKeyword(16 /* Type */)} ` : "";
+    const typeParameters = this.typeEntity.getTypeParameters().map((p) => this.ctx.getInsertTextForName(p.getName(), true)).join(", ");
+    const typeParametersWithAngles = typeParameters.length > 0 ? `<${typeParameters}>` : "";
+    let result = `${keywordWithWhitespace}${this.ctx.getInsertTextForName(this.typeEntity.getName())}${typeParametersWithAngles}`;
+    if (this.typeEntity.typeEntityKind === 0 /* Function */) {
+      const parameters = this.typeEntity.getParameters().map((p) => this.ctx.getInsertTextForName(p.getName(), true)).join(", ");
+      result = `${result}(${parameters})`;
+    }
+    return result;
   }
   getSortText() {
     return void 0;
@@ -4920,16 +4827,15 @@ var AliasesSourcePackageTypeCompletionItemInfo = class {
     return void 0;
   }
 };
-var AliasesSourceIndexerCompletionItemInfo = class {
-  constructor(ctx, indexer, displayService) {
+var TranslationsSourceIndexerCompletionItemInfo = class {
+  constructor(ctx, indexer) {
     this.ctx = ctx;
     this.indexer = indexer;
-    this.displayService = displayService;
-    this.kind = "aliases-source-type-indexer";
+    this.kind = "translations-source-type-indexer";
     this.label_ = new Cached();
   }
   get label() {
-    return this.label_.getOrInsertWith(() => this.displayService.displayIndexerDeclaration(new IndexerDeclaration_entity(this.indexer)));
+    return this.label_.getOrInsertWith(() => this.ctx.displayService.displayIndexerDeclaration(new IndexerDeclaration_entity(this.indexer)));
   }
   getLabel() {
     return this.label;
@@ -4951,20 +4857,19 @@ var AliasesSourceIndexerCompletionItemInfo = class {
     return void 0;
   }
 };
-var AliasesSourceConstructorCompletionItemInfo = class {
-  constructor(ctx, constructor_, includeOnCreateKeyword, displayService) {
+var TranslationsSourceConstructorCompletionItemInfo = class {
+  constructor(ctx, constructor_, includeOnCreateKeyword) {
     this.ctx = ctx;
     this.constructor_ = constructor_;
     this.includeOnCreateKeyword = includeOnCreateKeyword;
-    this.displayService = displayService;
-    this.kind = "aliases-source-type-constructor";
+    this.kind = "translations-source-type-constructor";
     this.label_ = new Cached();
   }
   get label() {
     return this.label_.getOrInsertWith(() => {
       const constructorDeclaration = new ConstructorDeclaration_entity(this.constructor_);
-      const displayParts = this.displayService.getConstructorDeclarationDisplayParts(constructorDeclaration);
-      const creationKeyword = this.displayService.displayKeyword(31 /* Creation */);
+      const displayParts = this.ctx.displayService.getConstructorDeclarationDisplayParts(constructorDeclaration);
+      const creationKeyword = this.ctx.displayService.displayKeyword(31 /* Creation */);
       return creationKeyword + displayParts.parametersStart + displayParts.parameters.map((p) => p.toString()).join(displayParts.parameterSeparator) + displayParts.parametersEnd;
     });
   }
@@ -4978,7 +4883,7 @@ var AliasesSourceConstructorCompletionItemInfo = class {
     return this.label;
   }
   getInsertText() {
-    const creationKeyword = this.includeOnCreateKeyword ? this.displayService.displayKeyword(31 /* Creation */) : "";
+    const creationKeyword = this.includeOnCreateKeyword ? this.ctx.displayService.displayKeyword(31 /* Creation */) : "";
     const parameters = this.constructor_.getParameters().map((p) => this.ctx.getInsertTextForName(p.getName(), true)).join(", ");
     return `${creationKeyword}(${parameters})`;
   }
@@ -5653,21 +5558,21 @@ var CompletionItemInfoCache = class {
 
 // source/services/NodeSemanticInfo.ts
 var NodeSemanticInfoService = class {
-  static ofTokenOrKeyword(analyzer, tokenOrKeyword, options6) {
+  static ofTokenOrKeyword(analyzer, tokenOrKeyword, options7) {
     if (isIdentifier(tokenOrKeyword.value)) {
-      return this.ofNonKeywordIdentifier(analyzer, tokenOrKeyword.value, options6);
+      return this.ofNonKeywordIdentifier(analyzer, tokenOrKeyword.value, options7);
     } else if (tokenOrKeyword.isKeyword(2 /* Autotype */) && tokenOrKeyword.parent.kind === 69 /* AutotypeCallExpression */) {
-      return this.ofAutotypeCallExpression(analyzer, tokenOrKeyword.parent, options6);
+      return this.ofAutotypeCallExpression(analyzer, tokenOrKeyword.parent, options7);
     } else if (tokenOrKeyword.parent.kind === 75 /* PrefixUnaryExpression */) {
-      return this.ofPrefixUnaryExpressionOperator(analyzer, tokenOrKeyword.parent, options6);
+      return this.ofPrefixUnaryExpressionOperator(analyzer, tokenOrKeyword.parent, options7);
     } else if (tokenOrKeyword.parent.kind === 64 /* BinaryExpression */) {
-      return this.ofBinaryExpressionOperator(analyzer, tokenOrKeyword.parent, options6);
+      return this.ofBinaryExpressionOperator(analyzer, tokenOrKeyword.parent, options7);
     } else if (tokenOrKeyword.isToken(20 /* Caret */) && (tokenOrKeyword.parent.kind === 48 /* DereferencedVariableGetterDeclaration */ || tokenOrKeyword.parent.kind === 49 /* DereferencedVariableSetterDeclaration */)) {
       return this.ofDereferenceOperatorDeclaration(analyzer, tokenOrKeyword.parent);
     } else if (tokenOrKeyword.isToken(20 /* Caret */) && tokenOrKeyword.parent.kind === 78 /* DereferenceExpression */) {
-      return this.ofDereferenceExpressionOperator(analyzer, tokenOrKeyword.parent, options6);
+      return this.ofDereferenceExpressionOperator(analyzer, tokenOrKeyword.parent, options7);
     } else if (tokenOrKeyword.parent.kind === 92 /* AssignmentStatement */) {
-      return this.ofAssignmentStatementOperator(analyzer, tokenOrKeyword.parent, options6);
+      return this.ofAssignmentStatementOperator(analyzer, tokenOrKeyword.parent, options7);
     } else if (tokenOrKeyword.isKeyword(31 /* Creation */) && tokenOrKeyword.parent.kind === 43 /* ConstructorDeclaration */) {
       return this.ofConstructorDeclaration(analyzer, tokenOrKeyword.parent);
     } else if (tokenOrKeyword.isToken(14 /* Asterisk */) && tokenOrKeyword.parent.kind === 91 /* DefaultMatchExpression */) {
@@ -5677,46 +5582,46 @@ var NodeSemanticInfoService = class {
     } else if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 95 /* FunctionBlock */ && tokenOrKeyword.parent.parent.kind === 66 /* FunctionBlockLiteral */) {
       return this.ofRegularOrBlockFunctionLiteral(analyzer, tokenOrKeyword.parent.parent);
     } else if (tokenOrKeyword.isKeyword(4 /* Object */) && tokenOrKeyword.parent.kind === 87 /* ObjectExpression */) {
-      return this.ofObjectExpression(analyzer, tokenOrKeyword.parent, options6);
+      return this.ofObjectExpression(analyzer, tokenOrKeyword.parent, options7);
     } else if (tokenOrKeyword.isKeyword(56 /* Base */) && tokenOrKeyword.parent.kind === 88 /* BaseExpression */) {
-      return this.ofBaseExpression(analyzer, tokenOrKeyword.parent, options6);
+      return this.ofBaseExpression(analyzer, tokenOrKeyword.parent, options7);
     } else if ((tokenOrKeyword.isToken(46 /* OpenSquareBracket */) || tokenOrKeyword.isToken(23 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 47 /* IndexParameterClause */) {
       return this.ofIndexedElementAccessorDeclaration(analyzer, tokenOrKeyword.parent.parent);
     } else if ((tokenOrKeyword.isToken(46 /* OpenSquareBracket */) || tokenOrKeyword.isToken(23 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 70 /* IndexedAccessExpression */) {
-      return this.ofIndexedAccessExpressionOperator(analyzer, tokenOrKeyword.parent, options6);
+      return this.ofIndexedAccessExpressionOperator(analyzer, tokenOrKeyword.parent, options7);
     } else if (tokenOrKeyword.isKeyword(31 /* Creation */) && tokenOrKeyword.parent.kind === 127 /* ConstructorTranslation */) {
-      return this.ofConstructorTranslationSourceConstructor(analyzer, tokenOrKeyword.parent, options6);
+      return this.ofConstructorTranslationSourceConstructor(analyzer, tokenOrKeyword.parent, options7);
     } else if ((tokenOrKeyword.isToken(45 /* OpenParenthesis */) || tokenOrKeyword.isToken(22 /* CloseParenthesis */)) && tokenOrKeyword.parent.kind === 126 /* TranslationParameterClause */ && tokenOrKeyword.parent.parent.kind === 127 /* ConstructorTranslation */ && tokenOrKeyword.parent.parent.translatedParameterClause === tokenOrKeyword.parent) {
-      return this.ofConstructorTranslationTranslatedConstructor(analyzer, tokenOrKeyword.parent.parent, options6);
+      return this.ofConstructorTranslationTranslatedConstructor(analyzer, tokenOrKeyword.parent.parent, options7);
     } else if ((tokenOrKeyword.isToken(46 /* OpenSquareBracket */) || tokenOrKeyword.isToken(23 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 128 /* IndexParameterTranslationClause */ && tokenOrKeyword.parent.parent.kind === 129 /* IndexerTranslation */ && tokenOrKeyword.parent.parent.sourceParameterClause === tokenOrKeyword.parent) {
-      return this.ofIndexerTranslationSourceIndexer(analyzer, tokenOrKeyword.parent.parent, options6);
+      return this.ofIndexerTranslationSourceIndexer(analyzer, tokenOrKeyword.parent.parent, options7);
     } else if ((tokenOrKeyword.isToken(46 /* OpenSquareBracket */) || tokenOrKeyword.isToken(23 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 128 /* IndexParameterTranslationClause */ && tokenOrKeyword.parent.parent.kind === 129 /* IndexerTranslation */ && tokenOrKeyword.parent.parent.translatedParameterClause === tokenOrKeyword.parent) {
-      return this.ofIndexerTranslationTranslatedIndexer(analyzer, tokenOrKeyword.parent.parent, options6);
+      return this.ofIndexerTranslationTranslatedIndexer(analyzer, tokenOrKeyword.parent.parent, options7);
     }
     return void 0;
   }
   static ofRegularOrBlockFunctionLiteral(analyzer, node) {
-    const type = analyzer.type.ofRegularOrBlockFunctionLiteral(node);
-    return new RegularOrBlockFunctionLiteralNodeSemanticInfo(type);
+    const entity = analyzer.entity.ofRegularOrBlockFunctionLiteral(node);
+    return new DefinitionNodeSemanticInfo(entity);
   }
   static ofDefaultMatchExpression(analyzer, node) {
     const type = analyzer.type.ofExpression(node);
     return new DefaultSwitchMatchNodeSemanticInfo(type);
   }
-  static ofNonKeywordIdentifier(analyzer, node, options6) {
+  static ofNonKeywordIdentifier(analyzer, node, options7) {
     let result;
     const parent = node.parent;
     switch (parent.kind) {
       case 130 /* TranslationTypeParameterList */:
-        return this.ofTranslationTypeParameterListParameter(analyzer, node, parent, options6);
+        return this.ofTranslationTypeParameterListParameter(analyzer, node, parent, options7);
       case 125 /* TranslationParameterList */:
-        return this.ofTranslationParameterListParameter(analyzer, node, parent, options6);
+        return this.ofTranslationParameterListParameter(analyzer, node, parent, options7);
       case 150 /* Argument */: {
         const respectiveParameter = analyzer.getRespectiveParameter(parent);
         if (respectiveParameter !== void 0) {
           const target = new MatchResultParameterReferenceTarget(respectiveParameter, 0 /* Get */);
           result = new ReferenceNodeSemanticInfo([target], false);
-          if (options6.includeBetterReferenceTargets) {
+          if (options7.includeBetterReferenceTargets) {
             result = this.getBetterReferenceTargetsOrPreserve(result);
           }
         }
@@ -5747,7 +5652,7 @@ var NodeSemanticInfoService = class {
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofPackageVariantTypeDeclaration(parent));
         break;
       case 89 /* IdentifierExpression */:
-        result = this.ofIdentifierExpression(analyzer, parent, options6);
+        result = this.ofIdentifierExpression(analyzer, parent, options7);
         break;
       case 56 /* NestedFunctionDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofNestedFunctionDeclaration(parent));
@@ -5756,7 +5661,7 @@ var NodeSemanticInfoService = class {
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofLocalVariableDeclaration(parent));
         break;
       case 135 /* QualifiedName */:
-        result = this.ofQualifiedNameQualifier(analyzer, parent, node, options6);
+        result = this.ofQualifiedNameQualifier(analyzer, parent, node, options7);
         break;
       case 136 /* PackageVariableTranslationDeclaration */:
       case 132 /* PackageFunctionTranslationDeclaration */:
@@ -5768,7 +5673,7 @@ var NodeSemanticInfoService = class {
           if (node === parent.sourceName) {
             const targets = translationTargets.values.map((t) => new EntityReferenceTarget(t, 0 /* Get */));
             result = new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), !translationTargets.areSuitable);
-            if (options6.includeBetterReferenceTargets) {
+            if (options7.includeBetterReferenceTargets) {
               result = this.getBetterReferenceTargetsOrPreserve(result);
             }
           } else if (node === parent.translatedName) {
@@ -5777,7 +5682,7 @@ var NodeSemanticInfoService = class {
               0 /* Get */
             ));
             result = new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), !translationTargets.areSuitable);
-            if (options6.includeBetterReferenceTargets) {
+            if (options7.includeBetterReferenceTargets) {
               result = this.getBetterReferenceTargetsOrPreserve(result);
             }
           }
@@ -5792,7 +5697,7 @@ var NodeSemanticInfoService = class {
           if (node === parent.sourceName) {
             const targets = translationTargets.values.map((t) => new EntityReferenceTarget(t, 0 /* Get */));
             result = new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), !translationTargets.areSuitable);
-            if (options6.includeBetterReferenceTargets) {
+            if (options7.includeBetterReferenceTargets) {
               result = this.getBetterReferenceTargetsOrPreserve(result);
             }
           } else if (node === parent.translatedName) {
@@ -5801,7 +5706,7 @@ var NodeSemanticInfoService = class {
               0 /* Get */
             ));
             result = new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), !translationTargets.areSuitable);
-            if (options6.includeBetterReferenceTargets) {
+            if (options7.includeBetterReferenceTargets) {
               result = this.getBetterReferenceTargetsOrPreserve(result);
             }
           }
@@ -5818,7 +5723,7 @@ var NodeSemanticInfoService = class {
         result = void 0;
         break;
       case 76 /* MemberAccessExpression */:
-        result = this.ofMember(analyzer, parent, options6);
+        result = this.ofMember(analyzer, parent, options7);
         break;
       case 50 /* MethodDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofMethodDeclaration(parent));
@@ -5854,7 +5759,7 @@ var NodeSemanticInfoService = class {
     }
     return result;
   }
-  static ofMember(analyzer, node, options6) {
+  static ofMember(analyzer, node, options7) {
     let result;
     const meaning = analyzer.resolveMemberAccessExpression(node).meaning;
     switch (meaning.kind) {
@@ -5960,7 +5865,7 @@ var NodeSemanticInfoService = class {
           callExpressionMeaning.singleNotSuitableSubstitutedCandidate,
           callExpressionMeaning.suitableConstructors,
           callExpressionMeaning.candidates,
-          options6
+          options7
         );
         break;
       }
@@ -5979,7 +5884,7 @@ var NodeSemanticInfoService = class {
       default:
         Debug.never(meaning);
     }
-    if (result !== void 0 && options6.includeBetterReferenceTargets) {
+    if (result !== void 0 && options7.includeBetterReferenceTargets) {
       result = this.getBetterReferenceTargetsOrPreserve(result);
     }
     return result;
@@ -5988,19 +5893,19 @@ var NodeSemanticInfoService = class {
       return new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), isAmbiguous);
     }
   }
-  static ofQualifiedNameQualifier(analyzer, node, qualifier, options6) {
+  static ofQualifiedNameQualifier(analyzer, node, qualifier, options7) {
     switch (node.parent.kind) {
       case 10 /* NamedTypeSpecifier */:
-        return this.ofNamedTypeSpecifierNameQualifier(analyzer, node.parent, qualifier, options6);
+        return this.ofNamedTypeSpecifierNameQualifier(analyzer, node.parent, qualifier, options7);
       case 152 /* Tag */:
-        return this.ofTagNameQualifier(analyzer, node.parent, qualifier, options6);
+        return this.ofTagNameQualifier(analyzer, node.parent, qualifier, options7);
       case 40 /* ExtendedTypeClause */:
         return void 0;
       default:
         Debug.never(node.parent);
     }
   }
-  static ofNamedTypeSpecifierNameQualifier(analyzer, node, qualifier, options6) {
+  static ofNamedTypeSpecifierNameQualifier(analyzer, node, qualifier, options7) {
     let result;
     const resolutionResult = analyzer.resolveNamedTypeSpecifier(node);
     const qualifierIndex = node.qualifiedName.qualifiers.toArray().indexOf(qualifier);
@@ -6047,12 +5952,12 @@ var NodeSemanticInfoService = class {
         result = new ReferenceNodeSemanticInfo(targets, true);
       }
     }
-    if (result !== void 0 && options6.includeBetterReferenceTargets) {
+    if (result !== void 0 && options7.includeBetterReferenceTargets) {
       result = this.getBetterReferenceTargetsOrPreserve(result);
     }
     return result;
   }
-  static ofTagNameQualifier(analyzer, node, qualifier, options6) {
+  static ofTagNameQualifier(analyzer, node, qualifier, options7) {
     let result;
     const resolutionResult = analyzer.resolveTag(node);
     const qualifierIndex = node.name.qualifiers.toArray().indexOf(qualifier);
@@ -6077,7 +5982,7 @@ var NodeSemanticInfoService = class {
               resolutionResult.meaning.singleNotSuitableSubstitutedCandidate,
               resolutionResult.meaning.suitableConstructors,
               resolutionResult.meaning.candidates,
-              options6
+              options7
             );
           }
           break;
@@ -6131,12 +6036,12 @@ var NodeSemanticInfoService = class {
         result = new ReferenceNodeSemanticInfo(targets, true);
       }
     }
-    if (result !== void 0 && options6.includeBetterReferenceTargets) {
+    if (result !== void 0 && options7.includeBetterReferenceTargets) {
       result = this.getBetterReferenceTargetsOrPreserve(result);
     }
     return result;
   }
-  static ofIdentifierExpression(analyzer, node, options6) {
+  static ofIdentifierExpression(analyzer, node, options7) {
     let result;
     const meaning = analyzer.resolveIdentifierExpression(node).meaning;
     switch (meaning.kind) {
@@ -6165,7 +6070,7 @@ var NodeSemanticInfoService = class {
           callExpressionMeaning.singleNotSuitableSubstitutedCandidate,
           callExpressionMeaning.suitableConstructors,
           callExpressionMeaning.candidates,
-          options6
+          options7
         );
         break;
       }
@@ -6244,7 +6149,7 @@ var NodeSemanticInfoService = class {
       default:
         Debug.never(meaning);
     }
-    if (result !== void 0 && options6.includeBetterReferenceTargets) {
+    if (result !== void 0 && options7.includeBetterReferenceTargets) {
       result = this.getBetterReferenceTargetsOrPreserve(result);
     }
     return result;
@@ -6261,7 +6166,7 @@ var NodeSemanticInfoService = class {
     const entity = analyzer.entity.ofIndexerDeclaration(node);
     return new DefinitionNodeSemanticInfo(entity);
   }
-  static ofIndexedAccessExpressionOperator(analyzer, node, options6) {
+  static ofIndexedAccessExpressionOperator(analyzer, node, options7) {
     const meaning = analyzer.resolveIndexedAccessExpression(node).meaning;
     if (meaning.kind === "resolved") {
       let result;
@@ -6274,7 +6179,7 @@ var NodeSemanticInfoService = class {
       } else if (isNonEmptyArray(meaning.candidates)) {
         result = createIndexersReference(meaning.candidates, meaning.accessKind, true);
       }
-      if (result !== void 0 && options6.includeBetterReferenceTargets) {
+      if (result !== void 0 && options7.includeBetterReferenceTargets) {
         result = this.getBetterReferenceTargetsOrPreserve(result);
       }
       return result;
@@ -6285,14 +6190,14 @@ var NodeSemanticInfoService = class {
       return new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), isAmbiguous);
     }
   }
-  static ofAssignmentStatementOperator(analyzer, node, options6) {
+  static ofAssignmentStatementOperator(analyzer, node, options7) {
     const operatorKind = analyzer.getBinaryOperatorKindIfCompoundAssignmentOperator(node.operator);
     if (operatorKind !== void 0) {
       const operator = analyzer.resolveCompoundAssignmentStatementOperator(node, operatorKind);
       if (operator.kind === "ok") {
         const target = new OperatorReferenceTarget(operator.value);
         let result = new ReferenceNodeSemanticInfo([target], false);
-        if (options6.includeBetterReferenceTargets) {
+        if (options7.includeBetterReferenceTargets) {
           result = this.getBetterReferenceTargetsOrPreserve(result);
         }
         return result;
@@ -6300,14 +6205,14 @@ var NodeSemanticInfoService = class {
     }
     return void 0;
   }
-  static ofBinaryExpressionOperator(analyzer, node, options6) {
+  static ofBinaryExpressionOperator(analyzer, node, options7) {
     const classificationResult = analyzer.classifyBinaryExpressionOperator(node.operator);
     if (classificationResult.kind === "user-definable") {
       const operator = analyzer.resolveBinaryExpressionUserDefinableOperator(node, classificationResult.operatorKind);
       if (operator.kind === "ok") {
         const target = new OperatorReferenceTarget(operator.value);
         let result = new ReferenceNodeSemanticInfo([target], false);
-        if (options6.includeBetterReferenceTargets) {
+        if (options7.includeBetterReferenceTargets) {
           result = this.getBetterReferenceTargetsOrPreserve(result);
         }
         return result;
@@ -6315,12 +6220,12 @@ var NodeSemanticInfoService = class {
     }
     return void 0;
   }
-  static ofPrefixUnaryExpressionOperator(analyzer, node, options6) {
+  static ofPrefixUnaryExpressionOperator(analyzer, node, options7) {
     const operator = analyzer.resolvePrefixUnaryExpressionUserDefinableOperator(node);
     if (operator.kind === "ok") {
       const target = new OperatorReferenceTarget(operator.value);
       let result = new ReferenceNodeSemanticInfo([target], false);
-      if (options6.includeBetterReferenceTargets) {
+      if (options7.includeBetterReferenceTargets) {
         result = this.getBetterReferenceTargetsOrPreserve(result);
       }
       return result;
@@ -6331,19 +6236,19 @@ var NodeSemanticInfoService = class {
     const entity = analyzer.entity.ofDereferenceOperatorDeclaration(node);
     return new DefinitionNodeSemanticInfo(entity);
   }
-  static ofDereferenceExpressionOperator(analyzer, node, options6) {
+  static ofDereferenceExpressionOperator(analyzer, node, options7) {
     const meaning = analyzer.getDereferenceExpressionMeaning(node);
     if (meaning.kind === "resolved") {
       const target = new DereferenceOperatorReferenceTarget(meaning.operator, meaning.accessKind);
       let result = new ReferenceNodeSemanticInfo([target], false);
-      if (options6.includeBetterReferenceTargets) {
+      if (options7.includeBetterReferenceTargets) {
         result = this.getBetterReferenceTargetsOrPreserve(result);
       }
       return result;
     }
     return void 0;
   }
-  static ofAutotypeCallExpression(analyzer, node, options6) {
+  static ofAutotypeCallExpression(analyzer, node, options7) {
     const meaning = analyzer.resolveAutotypeCallExpression(node).meaning;
     let result;
     if (meaning.kind === "constructor-call") {
@@ -6357,12 +6262,12 @@ var NodeSemanticInfoService = class {
         result = this.ofConstructors(analyzer, constructors);
       }
     }
-    if (result !== void 0 && options6.includeBetterReferenceTargets) {
+    if (result !== void 0 && options7.includeBetterReferenceTargets) {
       result = this.getBetterReferenceTargetsOrPreserve(result);
     }
     return result;
   }
-  static ofObjectExpression(analyzer, node, options6) {
+  static ofObjectExpression(analyzer, node, options7) {
     const meaning = analyzer.resolveObjectExpression(node).meaning;
     let result;
     switch (meaning.kind) {
@@ -6389,12 +6294,12 @@ var NodeSemanticInfoService = class {
       default:
         Debug.never(meaning);
     }
-    if (result !== void 0 && options6.includeBetterReferenceTargets) {
+    if (result !== void 0 && options7.includeBetterReferenceTargets) {
       result = this.getBetterReferenceTargetsOrPreserve(result);
     }
     return result;
   }
-  static ofBaseExpression(analyzer, node, options6) {
+  static ofBaseExpression(analyzer, node, options7) {
     const meaning = analyzer.resolveBaseExpression(node).meaning;
     let result;
     switch (meaning.kind) {
@@ -6428,64 +6333,64 @@ var NodeSemanticInfoService = class {
       default:
         Debug.never(meaning);
     }
-    if (result !== void 0 && options6.includeBetterReferenceTargets) {
+    if (result !== void 0 && options7.includeBetterReferenceTargets) {
       result = this.getBetterReferenceTargetsOrPreserve(result);
     }
     return result;
   }
-  static ofConstructorTranslationSourceConstructor(analyzer, node, options6) {
+  static ofConstructorTranslationSourceConstructor(analyzer, node, options7) {
     let result;
     const translationPackage = this.getContainingTranslationPackage(analyzer, node);
     const translationTargets = translationPackage?.getTypeMemberTranslationTargets(node);
-    if (translationTargets !== void 0) {
+    if (translationTargets !== void 0 && translationTargets.values.length > 0) {
       const targets = translationTargets.values.map((t) => new EntityReferenceTarget(t, 0 /* Get */));
       result = new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), !translationTargets.areSuitable);
-      if (options6.includeBetterReferenceTargets) {
+      if (options7.includeBetterReferenceTargets) {
         result = this.getBetterReferenceTargetsOrPreserve(result);
       }
     }
     return result;
   }
-  static ofConstructorTranslationTranslatedConstructor(analyzer, node, options6) {
+  static ofConstructorTranslationTranslatedConstructor(analyzer, node, options7) {
     let result;
     const translationPackage = this.getContainingTranslationPackage(analyzer, node);
     const translationTargets = translationPackage?.getTypeMemberTranslationTargets(node);
-    if (translationPackage !== void 0 && translationTargets !== void 0) {
+    if (translationPackage !== void 0 && translationTargets !== void 0 && translationTargets.values.length > 0) {
       const targets = translationTargets.values.map((t) => new EntityReferenceTarget(
         translationPackage.localizationContext.getLocalizedTypeMemberEntity(t),
         0 /* Get */
       ));
       result = new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), !translationTargets.areSuitable);
-      if (options6.includeBetterReferenceTargets) {
+      if (options7.includeBetterReferenceTargets) {
         result = this.getBetterReferenceTargetsOrPreserve(result);
       }
     }
     return result;
   }
-  static ofIndexerTranslationSourceIndexer(analyzer, node, options6) {
+  static ofIndexerTranslationSourceIndexer(analyzer, node, options7) {
     let result;
     const translationPackage = this.getContainingTranslationPackage(analyzer, node);
     const translationTargets = translationPackage?.getTypeMemberTranslationTargets(node);
-    if (translationTargets !== void 0) {
+    if (translationTargets !== void 0 && translationTargets.values.length > 0) {
       const targets = translationTargets.values.map((t) => new EntityReferenceTarget(t, 0 /* Get */));
       result = new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), !translationTargets.areSuitable);
-      if (options6.includeBetterReferenceTargets) {
+      if (options7.includeBetterReferenceTargets) {
         result = this.getBetterReferenceTargetsOrPreserve(result);
       }
     }
     return result;
   }
-  static ofIndexerTranslationTranslatedIndexer(analyzer, node, options6) {
+  static ofIndexerTranslationTranslatedIndexer(analyzer, node, options7) {
     let result;
     const translationPackage = this.getContainingTranslationPackage(analyzer, node);
     const translationTargets = translationPackage?.getTypeMemberTranslationTargets(node);
-    if (translationPackage !== void 0 && translationTargets !== void 0) {
+    if (translationPackage !== void 0 && translationTargets !== void 0 && translationTargets.values.length > 0) {
       const targets = translationTargets.values.map((t) => new EntityReferenceTarget(
         translationPackage.localizationContext.getLocalizedTypeMemberEntity(t),
         0 /* Get */
       ));
       result = new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), !translationTargets.areSuitable);
-      if (options6.includeBetterReferenceTargets) {
+      if (options7.includeBetterReferenceTargets) {
         result = this.getBetterReferenceTargetsOrPreserve(result);
       }
     }
@@ -6507,8 +6412,8 @@ var NodeSemanticInfoService = class {
     }
     return new ReferenceNodeSemanticInfo([new PackageReferenceTarget(packageTreeNode.package)], false);
   }
-  static ofConstructorCallWithTypeAccess(analyzer, suitableType, typeCandidates, singleNotSuitableSubstitutedCandidate, suitableConstructors, candidates, options6) {
-    if (options6.preferredTargetOfExplicitConstructorCall === "type-declaration") {
+  static ofConstructorCallWithTypeAccess(analyzer, suitableType, typeCandidates, singleNotSuitableSubstitutedCandidate, suitableConstructors, candidates, options7) {
+    if (options7.preferredTargetOfExplicitConstructorCall === "type-declaration") {
       const targets2 = suitableType !== void 0 ? [new EntityReferenceTarget(suitableType, 0 /* Get */)] : typeCandidates.map((t) => new EntityReferenceTarget(t, 0 /* Get */));
       return new ReferenceNodeSemanticInfo(createNonEmptyArray(targets2), targets2.length > 1);
     }
@@ -6526,7 +6431,7 @@ var NodeSemanticInfoService = class {
     const targets = suitableType !== void 0 ? [new EntityReferenceTarget(suitableType, 0 /* Get */)] : typeCandidates.map((t) => new EntityReferenceTarget(t, 0 /* Get */));
     return new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), targets.length > 1);
   }
-  static ofTranslationTypeParameterListParameter(analyzer, node, typeParameterList, options6) {
+  static ofTranslationTypeParameterListParameter(analyzer, node, typeParameterList, options7) {
     const parameterIndex = typeParameterList.typeParameters.indexOf(node);
     if (parameterIndex < 0) {
       return void 0;
@@ -6564,14 +6469,14 @@ var NodeSemanticInfoService = class {
       if (isNonEmptyArray(typeParameters)) {
         const targets = typeParameters.map((t) => new EntityReferenceTarget(t, 0 /* Get */));
         result = new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), !translationTargets.areSuitable);
-        if (options6.includeBetterReferenceTargets) {
+        if (options7.includeBetterReferenceTargets) {
           result = this.getBetterReferenceTargetsOrPreserve(result);
         }
       }
     }
     return result;
   }
-  static ofTranslationParameterListParameter(analyzer, node, parameterList, options6) {
+  static ofTranslationParameterListParameter(analyzer, node, parameterList, options7) {
     const parameterIndex = parameterList.parameters.indexOf(node);
     if (parameterIndex < 0) {
       return void 0;
@@ -6610,7 +6515,7 @@ var NodeSemanticInfoService = class {
       if (isNonEmptyArray(typeParameters)) {
         const targets = typeParameters.map((t) => new EntityReferenceTarget(t, 0 /* Get */));
         result = new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), !translationTargets.areSuitable);
-        if (options6.includeBetterReferenceTargets) {
+        if (options7.includeBetterReferenceTargets) {
           result = this.getBetterReferenceTargetsOrPreserve(result);
         }
       }
@@ -6807,12 +6712,6 @@ var DefaultSwitchMatchNodeSemanticInfo = class {
     this.kind = "default-switch-match";
   }
 };
-var RegularOrBlockFunctionLiteralNodeSemanticInfo = class {
-  constructor(type) {
-    this.type = type;
-    this.kind = "regular-or-block-function-literal";
-  }
-};
 
 // source/services/Utils.ts
 function getEntitySourceLocations(analyzer, entity) {
@@ -6921,6 +6820,12 @@ function getEntitySourceLocations(analyzer, entity) {
         case 49 /* DereferencedVariableSetterDeclaration */:
           range = node.caretToken.rangeWithoutTrivia;
           break;
+        case 65 /* FunctionLiteral */:
+          range = node.functionKeyword.rangeWithoutTrivia;
+          break;
+        case 66 /* FunctionBlockLiteral */:
+          range = node.block.openBraceToken.rangeWithoutTrivia;
+          break;
         default:
           Debug.never(node);
       }
@@ -6945,7 +6850,7 @@ var DefinitionService = class {
   constructor(sourceGenerationService) {
     this.sourceGenerationService = sourceGenerationService;
   }
-  getDefinition(analyzer, sourceFile, offset, cancellationToken) {
+  getDefinition(analyzer, sourceFile, offset, taskController) {
     return __async(this, null, function* () {
       const tokenOrKeyword = getTokenOrKeywordsTouchingOffset(sourceFile.getSyntaxNode(), offset).getSingleWithHighestPriority((t) => {
         if (t.isToken(10 /* Identifier */) || t.isKeyword()) {
@@ -6959,11 +6864,11 @@ var DefinitionService = class {
       if (tokenOrKeyword === void 0) {
         return void 0;
       }
-      const options6 = {
+      const options7 = {
         includeBetterReferenceTargets: true,
         preferredTargetOfExplicitConstructorCall: "constructor-declaration"
       };
-      const semanticInfo = NodeSemanticInfoService.ofTokenOrKeyword(analyzer, tokenOrKeyword, options6);
+      const semanticInfo = NodeSemanticInfoService.ofTokenOrKeyword(analyzer, tokenOrKeyword, options7);
       if (semanticInfo === void 0) {
         return void 0;
       }
@@ -6982,8 +6887,6 @@ var DefinitionService = class {
         }
         case "default-switch-match":
           break;
-        case "regular-or-block-function-literal":
-          break;
         default:
           Debug.never(semanticInfo);
       }
@@ -6995,7 +6898,7 @@ var DefinitionService = class {
             const locations = yield this.sourceGenerationService.getDefinitionInGeneratedCode(
               analyzer,
               referencedEntity,
-              cancellationToken
+              taskController
             );
             if (locations !== void 0) {
               sourceLocations.push(...locations);
@@ -7177,31 +7080,63 @@ var DefinitionsAndReferenceInfo = class {
   }
 };
 
+// source/services/DeleteBlockFromScriptService.ts
+var DeleteBlockFromScriptService = class {
+  createEditDeletingBlock(sourceFile, subprogramDeclaration) {
+    let result;
+    if (NodeTypeUtils.isRegularOrBlockFunctionLiteral(subprogramDeclaration) && subprogramDeclaration.parent.kind === 150 /* Argument */ && subprogramDeclaration.parent.parent.parent.kind === 68 /* CallExpression */) {
+      const callExpression = subprogramDeclaration.parent.parent.parent;
+      let rangeStart = callExpression.rangeWithoutTrivia.start;
+      let rangeEnd = callExpression.rangeWithoutTrivia.end;
+      const leadingTrivia = callExpression.findLeftmostToken()?.selectLeadingTrivia(() => true);
+      const lastLeadingTrivia = leadingTrivia !== void 0 && leadingTrivia.length > 0 ? leadingTrivia[leadingTrivia.length - 1] : void 0;
+      if (lastLeadingTrivia?.kind === 0 /* Whitespace */) {
+        rangeStart = lastLeadingTrivia.range.start;
+      }
+      const trailingTrivia = callExpression.findRightmostToken()?.selectTrailingTrivia(() => true);
+      if (trailingTrivia !== void 0) {
+        let trailingTriviaIndex = -1;
+        if (trailingTrivia.length > trailingTriviaIndex + 1 && trailingTrivia[trailingTriviaIndex + 1].kind === 0 /* Whitespace */) {
+          trailingTriviaIndex++;
+        }
+        if (trailingTrivia.length > trailingTriviaIndex + 1 && trailingTrivia[trailingTriviaIndex + 1].kind === 1 /* NewLine */) {
+          trailingTriviaIndex++;
+        }
+        if (trailingTriviaIndex >= 0) {
+          rangeEnd = trailingTrivia[trailingTriviaIndex].range.end;
+        }
+      }
+      result = new SourceFileEdit(sourceFile, new Range(rangeStart, rangeEnd), "");
+    }
+    return result;
+  }
+};
+
 // source/services/ReferencesService.ts
 var ReferencesService = class {
-  getReferencesInCompilation(analyzer, sourceFile, offset, options6, cancellationToken) {
+  getReferencesInCompilation(analyzer, sourceFile, offset, options7, taskController) {
     return __async(this, null, function* () {
       return this.getReferencesInFiles(
         analyzer,
         sourceFile,
         offset,
         analyzer.compilation.enumerateSourceFiles(),
-        options6,
-        cancellationToken
+        options7,
+        taskController
       );
     });
   }
-  getReferencesInFiles(analyzer, sourceFile, offset, sourceFiles, options6, cancellationToken) {
+  getReferencesInFiles(analyzer, sourceFile, offset, sourceFiles, options7, taskController) {
     return __async(this, null, function* () {
-      const definitions = this.getReferencedDefinitionInfosAtOffset(analyzer, sourceFile, offset, options6);
+      const definitions = this.getReferencedDefinitionInfosAtOffset(analyzer, sourceFile, offset, options7);
       if (definitions.length === 0) {
         return [];
       }
-      const allowAmbiguous = options6.allowAmbiguous;
-      const isForRename = options6.isForRename ?? false;
+      const allowAmbiguous = options7.allowAmbiguous;
+      const isForRename = options7.isForRename ?? false;
       const result = [];
       const firstDefinition = definitions[0];
-      const restrictions = this.getReferenceRestrictions(firstDefinition, options6);
+      const restrictions = this.getReferenceRestrictions(firstDefinition, options7);
       let semanticInfoOptions;
       if (firstDefinition.value.kind === 7 /* Constructor */) {
         semanticInfoOptions = {
@@ -7215,11 +7150,10 @@ var ReferencesService = class {
         };
       }
       for (const sourceFile2 of sourceFiles) {
-        yield traverseTreeWithCancellationToken(
+        yield traverseTree(
           sourceFile2.getSyntaxNode(),
-          cancellationToken,
-          LanguageServer.DefaultCancellationTokenThrottleTime,
           true,
+          taskController,
           (node) => {
             if (isIdentifier(node) && restrictions.canBeIdentifier && node.parent.kind !== 3 /* Keyword */) {
               const semanticInfo = NodeSemanticInfoService.ofNonKeywordIdentifier(analyzer, node, semanticInfoOptions);
@@ -7233,7 +7167,7 @@ var ReferencesService = class {
                 result.push(new Reference(sourceFile2, node.rangeWithoutTrivia, referenceKind));
               }
             }
-            if (!options6.onlyNamed) {
+            if (!options7.onlyNamed) {
               if (node.kind === 69 /* AutotypeCallExpression */ && restrictions.canBeAutotypeCall) {
                 const semanticInfo = NodeSemanticInfoService.ofAutotypeCallExpression(analyzer, node, semanticInfoOptions);
                 const referenceKind = this.ifReferenceToSomeOfDefinitionsThenKind(
@@ -7467,13 +7401,14 @@ var ReferencesService = class {
                 }
               }
             }
+            return void 0;
           }
         );
       }
       return result;
     });
   }
-  getReferencedDefinitionInfosAtOffset(analyzer, sourceFile, offset, options6) {
+  getReferencedDefinitionInfosAtOffset(analyzer, sourceFile, offset, options7) {
     const tokenOrKeyword = getTokenOrKeywordsTouchingOffset(sourceFile.getSyntaxNode(), offset).getSingleWithHighestPriority((t) => {
       if (t.isToken(10 /* Identifier */) || t.isKeyword()) {
         return 2;
@@ -7487,7 +7422,7 @@ var ReferencesService = class {
       return [];
     }
     let semanticInfoOptions;
-    if (options6.onlyNamed) {
+    if (options7.onlyNamed) {
       semanticInfoOptions = {
         includeBetterReferenceTargets: true,
         preferredTargetOfExplicitConstructorCall: "type-declaration"
@@ -7512,8 +7447,6 @@ var ReferencesService = class {
         return getDefinitionOfReference(info);
       case "default-switch-match":
         return [];
-      case "regular-or-block-function-literal":
-        return [];
       default:
         Debug.never(info);
     }
@@ -7705,8 +7638,13 @@ var ReferencesService = class {
             Debug.never(entity);
         }
       }
-      case 1 /* Function */:
-        return { name: entity.getName() };
+      case 1 /* Function */: {
+        const naming = entity.getNaming();
+        if (naming.kind === "named") {
+          return { name: naming.value };
+        }
+        return void 0;
+      }
       case 10 /* PackageAlias */:
         return { name: entity.getName() };
       case 3 /* Getter */:
@@ -7758,9 +7696,9 @@ var DocumentHighlightsService = class _DocumentHighlightsService {
   constructor() {
     this.referencesService = new ReferencesService();
   }
-  getDocumentHighlights(analyzer, sourceFile, offset, cancellationToken) {
+  getDocumentHighlights(analyzer, sourceFile, offset, taskController) {
     return __async(this, null, function* () {
-      const options6 = {
+      const options7 = {
         onlyWithSameAlias: false,
         onlyNamed: false,
         allowAmbiguous: true
@@ -7770,8 +7708,8 @@ var DocumentHighlightsService = class _DocumentHighlightsService {
         sourceFile,
         offset,
         [sourceFile],
-        options6,
-        cancellationToken
+        options7,
+        taskController
       );
       const result = references.map((r) => ({
         range: r.range,
@@ -7988,11 +7926,11 @@ var HoverService = class {
     if (tokenOrKeyword === void 0) {
       return void 0;
     }
-    const options6 = {
+    const options7 = {
       includeBetterReferenceTargets: false,
       preferredTargetOfExplicitConstructorCall: "constructor-declaration"
     };
-    const semanticInfo = NodeSemanticInfoService.ofTokenOrKeyword(analyzer, tokenOrKeyword, options6);
+    const semanticInfo = NodeSemanticInfoService.ofTokenOrKeyword(analyzer, tokenOrKeyword, options7);
     if (semanticInfo === void 0) {
       return void 0;
     }
@@ -8012,8 +7950,6 @@ var HoverService = class {
           `*: ${this.displayService.displayType(semanticInfo.type)}`,
           tokenOrKeyword.value.rangeWithoutTrivia
         );
-      case "regular-or-block-function-literal":
-        return new Hover(this.displayService.displayType(semanticInfo.type), tokenOrKeyword.value.rangeWithoutTrivia);
       default:
         Debug.never(semanticInfo);
     }
@@ -8423,11 +8359,11 @@ var RenameService = class {
     const checkResult = this.canRename(analyzer, sourceFile, offset);
     return checkResult?.renameRange;
   }
-  rename(analyzer, sourceFile, offset, newText, cancellationToken) {
+  rename(analyzer, sourceFile, offset, newText, taskController) {
     return __async(this, null, function* () {
       let result;
       if (this.canRename(analyzer, sourceFile, offset) !== void 0) {
-        const options6 = {
+        const options7 = {
           onlyWithSameAlias: true,
           onlyNamed: true,
           allowAmbiguous: false,
@@ -8439,8 +8375,8 @@ var RenameService = class {
           sourceFile,
           offset,
           sourceFiles,
-          options6,
-          cancellationToken
+          options7,
+          taskController
         );
         result = references.map((r) => new Rename(r.sourceFile, r.range, newText));
       } else {
@@ -8454,11 +8390,11 @@ var RenameService = class {
     if (!(tokenOrKeyword !== void 0 && isIdentifier(tokenOrKeyword.value))) {
       return void 0;
     }
-    const options6 = {
+    const options7 = {
       includeBetterReferenceTargets: false,
       preferredTargetOfExplicitConstructorCall: "type-declaration"
     };
-    const semanticInfo = NodeSemanticInfoService.ofNonKeywordIdentifier(analyzer, tokenOrKeyword.value, options6);
+    const semanticInfo = NodeSemanticInfoService.ofNonKeywordIdentifier(analyzer, tokenOrKeyword.value, options7);
     if (semanticInfo !== void 0) {
       if (semanticInfo.kind === "reference") {
         if (semanticInfo.isAmbiguous) {
@@ -8601,27 +8537,26 @@ var SelectionRange = class {
 
 // source/services/SemanticTokensService.ts
 var SemanticTokensService = class {
-  getSemanticTokens(analyzer, sourceFile, cancellationToken) {
+  getSemanticTokens(analyzer, sourceFile, taskController) {
     return __async(this, null, function* () {
       return this.getSemanticTokensInRange(
         analyzer,
         sourceFile,
         sourceFile.getSyntaxNode().rangeWithTrivia,
-        cancellationToken
+        taskController
       );
     });
   }
-  getSemanticTokensInRange(analyzer, sourceFile, range, cancellationToken) {
+  getSemanticTokensInRange(analyzer, sourceFile, range, taskController) {
     return __async(this, null, function* () {
       const result = new Array();
-      yield traverseTreeWithCancellationToken(
+      yield traverseTree(
         sourceFile.getSyntaxNode(),
-        cancellationToken,
-        LanguageServer.DefaultCancellationTokenThrottleTime,
         false,
+        taskController,
         (node, controller) => {
           if (!this.rangesOverlap(range, node.rangeWithoutTrivia)) {
-            controller.stopChildrenTraverse();
+            controller.skipChildrenTraverse();
             return;
           }
           if (node.kind === 89 /* IdentifierExpression */) {
@@ -8665,7 +8600,7 @@ var SemanticTokensService = class {
               result.push(
                 new SemanticToken(
                   node.rangeWithoutTrivia,
-                  this.getSemanticTokenKindForFunctionEntity(func.getEntity()),
+                  this.getSemanticTokenKindForNamedFunctionEntity(func.getEntity()),
                   new SemanticTokenModifiers().setCapitalized(this.isCapitalizedName(func.value.getName()))
                 )
               );
@@ -8709,7 +8644,7 @@ var SemanticTokensService = class {
               result.push(
                 new SemanticToken(
                   node.memberName.rangeWithoutTrivia,
-                  this.getSemanticTokenKindForFunctionEntity(func.getEntity()),
+                  this.getSemanticTokenKindForNamedFunctionEntity(func.getEntity()),
                   new SemanticTokenModifiers().setCapitalized(this.isCapitalizedName(func.getName()))
                 )
               );
@@ -8759,6 +8694,7 @@ var SemanticTokensService = class {
               new SemanticToken(node.name.rangeWithoutTrivia, 7 /* Operator */, new SemanticTokenModifiers().makeDeclaration())
             );
           }
+          return void 0;
         }
       );
       return result.sort((t1, t2) => t1.range.start - t2.range.end);
@@ -8767,7 +8703,7 @@ var SemanticTokensService = class {
   rangesOverlap(range1, range2) {
     return range1.start < range2.end && range1.end > range2.start;
   }
-  getSemanticTokenKindForFunctionEntity(entity) {
+  getSemanticTokenKindForNamedFunctionEntity(entity) {
     switch (entity.subkind) {
       case "package":
         return 4 /* PackageFunction */;
@@ -9412,7 +9348,16 @@ var SignatureInfo = class {
 };
 
 // source/services/source-generation/SourceGenerationService.ts
-import { ObservableMap as ObservableMap6, ObservableObject as ObservableObject7, reactive as reactive6, runAtomically as runAtomically2, Transaction as Transaction4 } from "reactronic";
+import {
+  atomic as atomic6,
+  observable as observable7,
+  ObservableMap as ObservableMap6,
+  ObservableObject as ObservableObject7,
+  options as options6,
+  reactive as reactive6,
+  Reentrance as Reentrance3,
+  Transaction as Transaction4
+} from "reactronic";
 
 // source/services/workspace/ClientTrackedSourceFiles.ts
 import { ObservableMap, ObservableObject, observable, atomic, disposeObservableObject } from "reactronic";
@@ -9577,6 +9522,30 @@ var CompilationController = class extends ObservableObject2 {
   get state() {
     return this.state_;
   }
+  waitFullyLoadedAndConfigsProcessed(taskController) {
+    return __async(this, null, function* () {
+      yield this.waitFullyLoaded();
+      while (!this.hasAllConfigsProcessed()) {
+        if (taskController.shouldYieldOnceOutOf100()) {
+          yield taskController.yieldTask();
+        }
+        taskController.throwIfCancellationRequested();
+      }
+    });
+  }
+  hasAllConfigsProcessed() {
+    switch (this.state) {
+      case 2 /* ProcessedPackageConfigsWithErrors */:
+      case 3 /* LoadedMainCompilation */:
+      case 4 /* ErrorsCreatingAnalyzer */:
+        return true;
+      case 0 /* Created */:
+      case 1 /* ProcessingInitialPackageConfigs */:
+        return false;
+      default:
+        Debug.never(this.state);
+    }
+  }
   waitFullyLoaded() {
     return __async(this, null, function* () {
       yield Transaction.outside(() => __async(this, null, function* () {
@@ -9654,12 +9623,14 @@ var CompilationController = class extends ObservableObject2 {
         // Включаем логирование только при первой загрузке.
         additionalPackageContents: this.config.additionalPackageContents
       };
+      const currentTransaction = Transaction.current;
       const loadResult = yield runNonReactively(() => __async(this, null, function* () {
+        const taskController = new TaskController(50, new GenericCancellationToken(() => currentTransaction.isCanceled));
         return yield CompilationLoader.loadFromFileSystemTree(
           this.rootDirectory,
           this.fileSystemTree,
-          loaderOptions,
-          void 0
+          taskController,
+          loaderOptions
         );
       }));
       this.previousCompilationLoadResult = loadResult;
@@ -9903,7 +9874,7 @@ var CompilationController = class extends ObservableObject2 {
       if (compilationState === void 0) {
         return;
       }
-      const cancellationToken = new GenericCancellationToken(() => currentTransaction.isCanceled);
+      const taskController = new TaskController(50, new GenericCancellationToken(() => currentTransaction.isCanceled));
       try {
         for (const package_ of compilationState.analyzer.compilation.userPackages) {
           for (const sourceFile of package_.sourceFiles) {
@@ -9912,7 +9883,7 @@ var CompilationController = class extends ObservableObject2 {
             }
             const diagnostics = yield compilationState.collectSourceFileDiagnosticsWithLowPriority(
               sourceFile,
-              cancellationToken
+              taskController
             );
             if (currentTransaction.isCanceled) {
               return;
@@ -10101,36 +10072,36 @@ var ReadonlyCompilationState = class {
     this.version = version;
     this.diagnosticsCollectionSummaryByUri = /* @__PURE__ */ new Map();
   }
-  collectSourceFileDiagnosticsWithHighPriority(sourceFile, cancellationToken) {
+  collectSourceFileDiagnosticsWithHighPriority(sourceFile, taskController) {
     return __async(this, null, function* () {
-      const { diagnostics, summary } = yield this.collectSourceFileDiagnostics(sourceFile, cancellationToken);
+      const { diagnostics, summary } = yield this.analyzeSourceFile(sourceFile, taskController);
       this.diagnosticsCollectionSummaryByUri.set(sourceFile.uri.toString(), summary);
       return diagnostics;
     });
   }
-  collectSourceFileDiagnosticsWithLowPriority(sourceFile, cancellationToken) {
+  collectSourceFileDiagnosticsWithLowPriority(sourceFile, taskController) {
     return __async(this, null, function* () {
       yield highPriorityDiagnosticsCollectionIndicator.whenIdle();
-      const { diagnostics, summary } = yield this.collectSourceFileDiagnostics(sourceFile, cancellationToken);
+      const { diagnostics, summary } = yield this.analyzeSourceFile(sourceFile, taskController);
       this.diagnosticsCollectionSummaryByUri.set(sourceFile.uri.toString(), summary);
       return diagnostics;
     });
   }
-  getDiagnosticsCollectionSummary(sourceFile, cancellationToken) {
+  getDiagnosticsCollectionSummary(sourceFile, taskController) {
     return __async(this, null, function* () {
       let result = this.diagnosticsCollectionSummaryByUri.get(sourceFile.uri.toString());
       if (result === void 0) {
-        const { summary } = yield this.collectSourceFileDiagnostics(sourceFile, cancellationToken);
+        const { summary } = yield this.analyzeSourceFile(sourceFile, taskController);
         result = summary;
         this.diagnosticsCollectionSummaryByUri.set(sourceFile.uri.toString(), summary);
       }
       return result;
     });
   }
-  collectSourceFileDiagnostics(sourceFile, cancellationToken) {
+  analyzeSourceFile(sourceFile, taskController) {
     return __async(this, null, function* () {
-      const diagnosticCollector = new DiagnosticCollector(this.analyzer, sourceFile);
-      const diagnostics = yield diagnosticCollector.collect(cancellationToken);
+      const sourceFileAnalyzer = new SourceFileAnalyzer(this.analyzer, sourceFile);
+      const diagnostics = yield sourceFileAnalyzer.analyze(taskController);
       const summary = this.createDiagnosticsCollectionSummary(diagnostics);
       return { diagnostics, summary };
     });
@@ -10503,9 +10474,9 @@ var FileSystemTreeProviderBasedOnWatchedFileSystem = class extends ObservableObj
     this.trackedSourceFiles = trackedSourceFiles;
     this.isInitialized = true;
   }
-  waitLoaded(cancellationToken) {
+  waitLoaded(taskController) {
     return __async(this, null, function* () {
-      yield this.taskQueue.waitAllTasksProcessed(cancellationToken);
+      yield this.taskQueue.waitAllTasksProcessed(taskController);
     });
   }
   dispose() {
@@ -10850,7 +10821,7 @@ var FileSystemTreeProviderBasedOnWatchedFileSystem = class extends ObservableObj
     const directory = this.fileSystemTree.getDirectory(uri);
     if (directory !== void 0) {
       this.loadedDirectoryUris.delete(directory.uri.toString());
-      for (const descendant of directory.enumerateDescendants()) {
+      for (const descendant of directory.getFlatChildren()) {
         if (descendant.kind === "directory" && this.loadedDirectoryUris.has(descendant.uri.toString())) {
           this.loadedDirectoryUris.delete(descendant.uri.toString());
         }
@@ -11134,19 +11105,19 @@ var TaskQueue = class extends ObservableObject3 {
     disposeObservableObject3(this.tasks);
     disposeObservableObject3(this);
   }
-  waitAllTasksProcessed(cancellationToken) {
+  waitAllTasksProcessed(taskController) {
     return __async(this, null, function* () {
       yield Transaction2.outside(() => __async(this, null, function* () {
         while (this.tasks.length > 0 || this.currentTask !== void 0) {
           if (!(this.processTasksIndicator.isBusy || this.executeTaskIndicator.isBusy)) {
-            yield yieldExecution(10);
+            yield yieldTask();
             if (!(this.processTasksIndicator.isBusy || this.executeTaskIndicator.isBusy)) {
               return;
             }
           }
           yield this.processTasksIndicator.whenIdle();
           yield this.executeTaskIndicator.whenIdle();
-          cancellationToken?.throwIfCancellationRequested();
+          taskController?.throwIfCancellationRequested();
         }
       }));
     });
@@ -11211,7 +11182,7 @@ var ManuallyUpdatedFileSystemTreeProvider = class extends ObservableObject4 {
     this.workspaceFolderUris = workspaceFolderUris;
     this.trackedSourceFiles = trackedSourceFiles;
   }
-  waitLoaded(_cancellationToken) {
+  waitLoaded(_taskController) {
     return Promise.resolve();
   }
   dispose() {
@@ -11404,9 +11375,9 @@ var WorkspaceFiles = class extends ObservableObject5 {
     }
     this.trackedSourceFiles.close(uri);
   }
-  waitLoaded(cancellationToken) {
+  waitLoaded(taskController) {
     return __async(this, null, function* () {
-      yield this.fileSystemTreeProvider.waitLoaded(cancellationToken);
+      yield this.fileSystemTreeProvider.waitLoaded(taskController);
     });
   }
   dispose() {
@@ -11544,12 +11515,12 @@ var _Workspace = class _Workspace extends ObservableObject6 {
   notifyClosedTextDocument(uri) {
     this.files.stopTrackingSourceFile(uri);
   }
-  waitLoadedAndGetWorkspaceElementInfo(uri, cancellationToken) {
+  waitLoadedAndGetWorkspaceElementInfo(uri, taskController) {
     return __async(this, null, function* () {
-      yield this.files.waitLoaded(cancellationToken);
+      yield this.files.waitLoaded(taskController);
       const controllerGroups = [
-        this.compilationControllers_.filter((c) => this.isCompilationControllerStateWithProcessedConfigs(c.state)),
-        this.compilationControllers_.filter((c) => !this.isCompilationControllerStateWithProcessedConfigs(c.state))
+        this.compilationControllers_.filter((c) => c.hasAllConfigsProcessed()),
+        this.compilationControllers_.filter((c) => !c.hasAllConfigsProcessed())
       ];
       let result = yield findWorkspaceElement(this, true);
       if (result === void 0) {
@@ -11560,7 +11531,7 @@ var _Workspace = class _Workspace extends ObservableObject6 {
         return __async(this, null, function* () {
           for (const group of controllerGroups) {
             for (const controller of group) {
-              yield workspace.waitForControllerToFullyLoad(controller, cancellationToken);
+              yield controller.waitFullyLoadedAndConfigsProcessed(taskController);
               const state = yield controller.getStateOfCompilationContainingItemAtUri(uri);
               if (state !== void 0) {
                 const sourceFile = state.analyzer.compilation.getSourceFileByUri(uri);
@@ -11586,14 +11557,14 @@ var _Workspace = class _Workspace extends ObservableObject6 {
       }
     });
   }
-  getStandardPackageContents(cancellationToken) {
+  getStandardPackageContents(taskController) {
     return __async(this, null, function* () {
       return this.standardPackageContents.getOrInsertWith(() => __async(this, null, function* () {
         if (this.config.builtInStandardPackagesUri !== void 0) {
-          yield this.files.waitLoaded(cancellationToken);
+          yield this.files.waitLoaded(taskController);
           const directory = this.files.fileSystemTree.getDirectory(this.config.builtInStandardPackagesUri);
           if (directory !== void 0 && Query.from(directory.getChildren()).count() > 0) {
-            return yield createPackageContentsFromFSTree(directory, this.files.fileSystemTree);
+            return yield createPackageContentsFromFSTree(directory, this.files.fileSystemTree, taskController);
           }
         }
         return Promise.resolve(void 0);
@@ -11656,13 +11627,13 @@ var _Workspace = class _Workspace extends ObservableObject6 {
     });
   }
   updateIsDiagnosticsCollectionInBackgroundEnabled() {
-    const shouldColletDiagnostics = this.isReadyToAcceptWorkspaceDiagnostics && this.compilationControllers_.every((c) => this.isCompilationControllerStateWithProcessedConfigs(c.state));
+    const shouldColletDiagnostics = this.isReadyToAcceptWorkspaceDiagnostics && this.compilationControllers_.every((c) => c.hasAllConfigsProcessed());
     this.compilationControllers_.forEach((c) => c.isDiagnosticsCollectionInBackgroundEnabled = shouldColletDiagnostics);
   }
   updateControllersWithOpenedFiles() {
     return __async(this, null, function* () {
-      const controllersWithProcessedConfigs = this.compilationControllers_.filter((c) => this.isCompilationControllerStateWithProcessedConfigs(c.state));
-      const controllersWithUnprocessedConfigs = this.compilationControllers_.filter((c) => !this.isCompilationControllerStateWithProcessedConfigs(c.state));
+      const controllersWithProcessedConfigs = this.compilationControllers_.filter((c) => c.hasAllConfigsProcessed());
+      const controllersWithUnprocessedConfigs = this.compilationControllers_.filter((c) => !c.hasAllConfigsProcessed());
       this.controllersWithOpenedFiles.clear();
       outer:
         for (const trackedFile of this.files.trackedSourceFiles.items.values()) {
@@ -11709,7 +11680,7 @@ var _Workspace = class _Workspace extends ObservableObject6 {
     return new CompilationController(config);
   }
   getControllerToLoad() {
-    const controllersWithUnprocessedConfigs = this.compilationControllers_.filter((c) => !this.isCompilationControllerStateWithProcessedConfigs(c.state));
+    const controllersWithUnprocessedConfigs = this.compilationControllers_.filter((c) => !c.hasAllConfigsProcessed());
     if (controllersWithUnprocessedConfigs.length === 0) {
       return void 0;
     }
@@ -11725,28 +11696,6 @@ var _Workspace = class _Workspace extends ObservableObject6 {
     }
     return controller;
   }
-  isCompilationControllerStateWithProcessedConfigs(state) {
-    switch (state) {
-      case 2 /* ProcessedPackageConfigsWithErrors */:
-      case 3 /* LoadedMainCompilation */:
-      case 4 /* ErrorsCreatingAnalyzer */:
-        return true;
-      case 0 /* Created */:
-      case 1 /* ProcessingInitialPackageConfigs */:
-        return false;
-      default:
-        Debug.never(state);
-    }
-  }
-  waitForControllerToFullyLoad(controller, cancellationToken) {
-    return __async(this, null, function* () {
-      yield controller.waitFullyLoaded();
-      while (!this.isCompilationControllerStateWithProcessedConfigs(controller.state)) {
-        yield new Promise((r) => setTimeout(r, 30));
-        cancellationToken.throwIfCancellationRequested();
-      }
-    });
-  }
 };
 __decorateClass([
   observable6(false)
@@ -12116,16 +12065,13 @@ var EntityToSyntax = class {
     const baseAspectTypes = entity.getBaseAspectTypes().declared;
     if (baseObjectType !== void 0 || baseAspectTypes.length > 0) {
       baseTypes = [];
-      if (baseObjectType !== void 0) {
+      if (baseObjectType !== void 0 && this.analyzer.getImplicitBaseTypeForStructuredType(entity)?.equals(baseObjectType) !== true) {
         const baseObjectTypeSpecifier = this.convertType(baseObjectType);
         if (baseObjectTypeSpecifier.kind === 10 /* NamedTypeSpecifier */) {
           baseTypes.push(baseObjectTypeSpecifier);
         }
       }
       baseTypes.push(...baseAspectTypes.map((t) => this.convertType(t)).filter((t) => t.kind === 10 /* NamedTypeSpecifier */));
-      if (baseAspectTypes.length === 0) {
-        baseTypes = void 0;
-      }
     }
     const members = this.convertTypeEntityMembers(entity.getMembers());
     return SyntaxFactory.structuredTypeDeclarationBody(structuredTypeKindKeyword, baseTypes, members);
@@ -12302,11 +12248,13 @@ var SourceGenerationService = class extends ObservableObject7 {
     this.tsLibrariesProvider = tsLibrariesProvider;
     this.standardPackageContentsProviders = standardPackageContentsProviders;
     this.generatedPackageStates = new ObservableMap6();
+    this.packagesToDeleteAfterFileIsClosed = new Array();
+    this.nextId = 0;
   }
   get compilationControllers() {
-    return Array.from(this.generatedPackageStates.values()).map((s) => s.compilationController);
+    return Array.from(this.generatedPackageStates.values()).map((s) => s.compilationController).concat(this.packagesToDeleteAfterFileIsClosed.map((s) => s.compilationController));
   }
-  getDefinitionInGeneratedCode(analyzer, entity, cancellationToken) {
+  getDefinitionInGeneratedCode(analyzer, entity, taskController) {
     return __async(this, null, function* () {
       if (!this.entityDefinitionRequiresSourceGeneration(entity)) {
         return void 0;
@@ -12314,13 +12262,12 @@ var SourceGenerationService = class extends ObservableObject7 {
       const generatedPackageState = yield this.getOrGeneratePackageSource(
         analyzer,
         entity.getContainingPackage(),
-        cancellationToken
+        taskController
       );
       if (generatedPackageState === void 0) {
         return void 0;
       }
       const compilationController = generatedPackageState.compilationController;
-      runAtomically2(() => compilationController.isConfigurationsProcessingEnabled = true);
       yield compilationController.waitFullyLoaded();
       const compilationState = compilationController.mainCompilationState;
       if (compilationState?.analyzer.compilation.mainPackage === void 0) {
@@ -12364,30 +12311,50 @@ var SourceGenerationService = class extends ObservableObject7 {
   }
   onOpenedSourceFilesChanged() {
     this.trackedSourceFiles.items.entries();
-    for (const [key, state] of this.generatedPackageStates.entries()) {
+    for (const state of this.generatedPackageStates.values()) {
       if (this.trackedSourceFiles.items.has(state.generatedFileUri.toString())) {
         state.fileWasOpenedByClient = true;
-        if (state.deleteAfterTimeoutId !== void 0) {
-          clearTimeout(state.deleteAfterTimeoutId);
-          state.deleteAfterTimeoutId = void 0;
-        }
+        state.cancelScheduledDispose();
       } else if (state.fileWasOpenedByClient) {
         state.fileWasOpenedByClient = false;
-        this.setDeleteGeneratedPackageTimeout(key, state, deleteGeneratedPackageTimeoutMs);
+        state.scheduleDisposeAfterTimeout(deleteGeneratedPackageTimeoutMs, (state2) => {
+          if (this.generatedPackageStates.get(state2.key) === state2) {
+            this.generatedPackageStates.delete(state2.key);
+          }
+        });
       }
     }
+    this.packagesToDeleteAfterFileIsClosed = this.packagesToDeleteAfterFileIsClosed.filter((p) => {
+      if (!this.trackedSourceFiles.items.has(p.generatedFileUri.toString())) {
+        p.dispose();
+        return false;
+      } else {
+        return true;
+      }
+    });
   }
-  getOrGeneratePackageSource(analyzer, packageEntity, cancellationToken) {
+  getOrGeneratePackageSource(analyzer, packageEntity, taskController) {
     return __async(this, null, function* () {
       const packageLocale = packageEntity.getLocale();
       const key = `${packageEntity.getName().toString()}-${localeToString(packageLocale)}`;
       let result = this.generatedPackageStates.get(key);
+      if (result !== void 0 && result.originalPackageEntity !== packageEntity) {
+        if (result.fileWasOpenedByClient) {
+          result.deleteAfterFileIsClosed = true;
+          result.cancelScheduledDispose();
+          this.packagesToDeleteAfterFileIsClosed.push(result);
+        } else {
+          result.dispose();
+        }
+        this.generatedPackageStates.delete(key);
+        result = void 0;
+      }
       if (result === void 0) {
         const node = new EntityToSyntax(analyzer, packageEntity).convert();
         const code = new SyntaxToCode(node, { keywordsLocale: packageLocale }).convert();
-        const generatedPackageUri = new Uri(GeneratedSourceFileScheme, "", [key]);
+        const generatedPackageUri = new Uri(GeneratedSourceFileScheme, "", [`${key}-${this.nextId++}`]);
         const generatedFileUri = generatedPackageUri.append(`${packageEntity.getName().toString()}.art`);
-        const fileSystemTree = runAtomically2(() => new FileSystemTree());
+        const fileSystemTree = new FileSystemTree();
         const packageDirectory = fileSystemTree.addDirectory(generatedPackageUri);
         fileSystemTree.addFile(generatedFileUri, code);
         const packageConfiguration = this.createGeneratedPackageConfiguration(
@@ -12395,7 +12362,12 @@ var SourceGenerationService = class extends ObservableObject7 {
           packageLocale,
           DefaultDialect
         );
-        const standardPackageContents = yield this.standardPackageContentsProviders(cancellationToken);
+        const standardPackageContents = yield Transaction4.outside(() => __async(this, null, function* () {
+          return yield this.standardPackageContentsProviders(taskController);
+        }));
+        if (Transaction4.current.isCanceled) {
+          return void 0;
+        }
         if (standardPackageContents === void 0) {
           Logger.warn("\u0421\u0435\u0440\u0432\u0438\u0441\u0443 \u0433\u0435\u043D\u0435\u0440\u0430\u0446\u0438\u0438 \u0438\u0441\u0445\u043E\u0434\u043D\u043E\u0433\u043E \u043A\u043E\u0434\u0430 \u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0435 \u043F\u0430\u043A\u0435\u0442\u044B. \u0418\u0441\u0445\u043E\u0434\u043D\u044B\u0439 \u043A\u043E\u0434 \u043D\u0435 \u0431\u0443\u0434\u0435\u0442 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D.");
           return void 0;
@@ -12409,10 +12381,15 @@ var SourceGenerationService = class extends ObservableObject7 {
           getTreatRootAsPackageIfConfigIsMissing: () => true,
           additionalPackageContents: standardPackageContents
         };
-        const controller = runAtomically2(() => new CompilationController(controllerConfig));
-        result = new GeneratedPackageState(controller, generatedFileUri);
-        this.setDeleteGeneratedPackageTimeout(key, result, deleteGeneratedPackageTimeoutMs);
-        runAtomically2(() => this.generatedPackageStates.set(key, result));
+        const controller = new CompilationController(controllerConfig);
+        controller.isConfigurationsProcessingEnabled = true;
+        result = new GeneratedPackageState(key, controller, generatedFileUri, packageEntity);
+        result.scheduleDisposeAfterTimeout(deleteGeneratedPackageTimeoutMs, (state) => {
+          if (this.generatedPackageStates.get(state.key) === state) {
+            this.generatedPackageStates.delete(state.key);
+          }
+        });
+        this.generatedPackageStates.set(key, result);
       }
       return result;
     });
@@ -12498,30 +12475,58 @@ var SourceGenerationService = class extends ObservableObject7 {
         Debug.never(entity);
     }
   }
-  setDeleteGeneratedPackageTimeout(key, state, timeoutMs) {
-    const timeoutId = setTimeout(() => {
-      Transaction4.isolate(() => {
-        const state2 = this.generatedPackageStates.get(key);
-        if (state2 !== void 0) {
-          this.generatedPackageStates.delete(key);
-          state2.compilationController.dispose();
-        }
-      });
-    }, timeoutMs);
-    state.deleteAfterTimeoutId = timeoutId;
-  }
 };
+__decorateClass([
+  observable7(false)
+], SourceGenerationService.prototype, "generatedPackageStates", 2);
+__decorateClass([
+  observable7(false)
+], SourceGenerationService.prototype, "packagesToDeleteAfterFileIsClosed", 2);
+__decorateClass([
+  observable7(false)
+], SourceGenerationService.prototype, "nextId", 2);
 __decorateClass([
   reactive6
 ], SourceGenerationService.prototype, "onOpenedSourceFilesChanged", 1);
+__decorateClass([
+  atomic6,
+  options6({ reentrance: Reentrance3.cancelAndWaitPrevious })
+], SourceGenerationService.prototype, "getOrGeneratePackageSource", 1);
 var deleteGeneratedPackageTimeoutMs = 1e4;
 var GeneratedPackageState = class {
-  constructor(compilationController, generatedFileUri) {
+  constructor(key, compilationController, generatedFileUri, originalPackageEntity) {
+    this.key = key;
     this.compilationController = compilationController;
     this.generatedFileUri = generatedFileUri;
+    this.originalPackageEntity = originalPackageEntity;
     this.fileWasOpenedByClient = false;
+    this.deleteAfterFileIsClosed = false;
+  }
+  scheduleDisposeAfterTimeout(timeoutMs, onDispose) {
+    if (this.deleteAfterTimeoutId !== void 0) {
+      clearTimeout(this.deleteAfterTimeoutId);
+    }
+    this.deleteAfterTimeoutId = setTimeout(() => {
+      Transaction4.isolate(() => {
+        onDispose(this);
+        this.dispose();
+      });
+    }, timeoutMs);
+  }
+  cancelScheduledDispose() {
+    if (this.deleteAfterTimeoutId !== void 0) {
+      clearTimeout(this.deleteAfterTimeoutId);
+      this.deleteAfterTimeoutId = void 0;
+    }
+  }
+  dispose() {
+    this.cancelScheduledDispose();
+    this.compilationController.dispose();
   }
 };
+__decorateClass([
+  atomic6
+], GeneratedPackageState.prototype, "dispose", 1);
 var EntityFinder = class {
   constructor(entity, packageEntity) {
     this.entity = entity;
@@ -12634,6 +12639,7 @@ var EntityFinder = class {
         }
       }
       case "nested":
+      case "anonymous":
         return void 0;
       default:
         Debug.never(entity);
@@ -12821,7 +12827,7 @@ var DataForFindingOverloadedMember = class {
 };
 
 // source/services/LanguageServer.ts
-var LanguageServer = class {
+var _LanguageServer = class _LanguageServer {
   constructor(config) {
     this.disposables = new Array();
     this.isInitialized = false;
@@ -12839,6 +12845,7 @@ var LanguageServer = class {
     this.fileSystemTreeDisplayService = new FileSystemTreeDisplayService();
     this.selectionRangeService = new SelectionRangeService();
     this.assignFieldService = new AssignFieldService();
+    this.deleteBlockFromScriptService = new DeleteBlockFromScriptService();
     this.codeActionsService = new CodeActionsService();
     this.connection = config.connection;
     this.config = config;
@@ -12871,39 +12878,71 @@ var LanguageServer = class {
     this.disposables.push(disposable);
     disposable = this.connection.onDidCloseTextDocument((params) => this.onDidCloseTextDocument(params));
     this.disposables.push(disposable);
-    disposable = this.connection.onDefinition((params, token) => this.withCancellation(token, (token2) => this.onDefinition(params, token2)));
-    this.disposables.push(disposable);
-    disposable = this.connection.onReferences((params, token) => this.withCancellation(token, (token2) => this.onReferences(params, token2)));
+    disposable = this.connection.onDefinition((params, token) => this.withTaskController(token, (taskController) => this.onDefinition(params, taskController)));
     this.disposables.push(disposable);
-    disposable = this.connection.onDocumentHighlight((params, token) => this.withCancellation(token, (token2) => this.onDocumentHighlight(params, token2)));
+    disposable = this.connection.onReferences((params, token) => this.withTaskController(token, (taskController) => this.onReferences(params, taskController)));
     this.disposables.push(disposable);
-    disposable = this.connection.onPrepareRename((params, token) => this.withCancellation(token, (token2) => this.onPrepareRename(params, token2)));
+    disposable = this.connection.onDocumentHighlight((params, token) => this.withTaskController(token, (taskController) => this.onDocumentHighlight(params, taskController)));
     this.disposables.push(disposable);
-    disposable = this.connection.onRenameRequest((params, token) => this.withCancellation(token, (token2) => this.onRename(params, token2)));
+    disposable = this.connection.onPrepareRename((params, token) => this.withTaskController(token, (taskController) => this.onPrepareRename(params, taskController)));
     this.disposables.push(disposable);
-    disposable = this.connection.onWorkspaceSymbol((params, token) => this.withCancellation(token, (token2) => this.onWorkspaceSymbol(params, token2)));
+    disposable = this.connection.onRenameRequest((params, token) => this.withTaskController(token, (taskController) => this.onRename(params, taskController)));
     this.disposables.push(disposable);
-    disposable = this.connection.onDocumentSymbol((params, token) => this.withCancellation(token, (token2) => this.onDocumentSymbol(params, token2)));
+    disposable = this.connection.onWorkspaceSymbol((params, token) => this.withTaskController(token, (taskController) => this.onWorkspaceSymbol(params, taskController)));
     this.disposables.push(disposable);
-    disposable = this.connection.onHover((params, token) => this.withCancellation(token, (token2) => this.onHover(params, token2)));
+    disposable = this.connection.onDocumentSymbol((params, token) => this.withTaskController(token, (taskController) => this.onDocumentSymbol(params, taskController)));
     this.disposables.push(disposable);
-    disposable = this.connection.onExecuteCommand((params, token) => this.withCancellation(token, (token2) => this.onExecuteCommand(params, token2)));
+    disposable = this.connection.onHover((params, token) => this.withTaskController(token, (taskController) => this.onHover(params, taskController)));
     this.disposables.push(disposable);
-    disposable = this.connection.onCompletion((params, token) => this.withCancellation(token, (token2) => this.onCompletion(params, token2)));
+    disposable = this.connection.onCompletion((params, token) => this.withTaskController(token, (taskController) => this.onCompletion(params, taskController)));
     this.disposables.push(disposable);
     disposable = this.connection.onCompletionResolve((params) => this.onCompletionResolve(params));
     this.disposables.push(disposable);
-    disposable = this.connection.languages.semanticTokens.on((params, token) => this.withCancellation(token, (token2) => this.onSemanticTokens(params, token2)));
+    disposable = this.connection.languages.semanticTokens.on((params, token) => this.withTaskController(token, (taskController) => this.onSemanticTokens(params, taskController)));
+    this.disposables.push(disposable);
+    disposable = this.connection.languages.semanticTokens.onRange((params, token) => this.withTaskController(token, (taskController) => this.onSemanticTokensRange(params, taskController)));
+    this.disposables.push(disposable);
+    disposable = this.connection.onSignatureHelp((params, token) => this.withTaskController(token, (taskController) => this.onSignatureHelp(params, taskController)));
     this.disposables.push(disposable);
-    disposable = this.connection.languages.semanticTokens.onRange((params, token) => this.withCancellation(token, (token2) => this.onSemanticTokensRange(params, token2)));
+    disposable = this.connection.onSelectionRanges((params, token) => this.withTaskController(token, (taskController) => this.onSelectionRanges(params, taskController)));
     this.disposables.push(disposable);
-    disposable = this.connection.onSignatureHelp((params, token) => this.withCancellation(token, (token2) => this.onSignatureHelp(params, token2)));
+    disposable = this.connection.onCodeAction((params, token) => this.withTaskController(token, (taskController) => this.onCodeAction(params, taskController)));
     this.disposables.push(disposable);
-    disposable = this.connection.onSelectionRanges((params, token) => this.withCancellation(token, (token2) => this.onSelectionRanges(params, token2)));
+    disposable = this.connection.onCodeActionResolve((params, token) => this.withTaskController(token, (taskController) => this.onCodeActionResolve(params, taskController)));
     this.disposables.push(disposable);
-    disposable = this.connection.onCodeAction((params, token) => this.withCancellation(token, (token2) => this.onCodeAction(params, token2)));
+    disposable = this.connection.onRequest(customRequests.getLocalesAvailableForTranslation, (params, token) => this.withTaskController(token, (_taskController) => __async(this, null, function* () {
+      return void 0;
+    })));
+    this.disposables.push(disposable);
+    disposable = this.connection.onRequest(customRequests.provideEvaluatableExpression, (params, token) => this.withTaskController(token, (taskController) => this.onProvideEvaluatableExpression(params, taskController)));
+    this.disposables.push(disposable);
+    disposable = this.connection.onRequest(customRequests.provideServerOwnedDocumentContent, (params, token) => this.withTaskController(
+      token,
+      (taskController) => this.onProvideServerOwnedDocumentContent(params, taskController)
+    ));
+    this.disposables.push(disposable);
+    disposable = this.connection.onRequest(customRequests.emitCodeToString, (params, token) => this.withTaskController(token, (taskController) => this.onEmitCodeToString(params, taskController)));
+    this.disposables.push(disposable);
+    disposable = this.connection.onRequest(
+      customRequests.displayFileSystemTree,
+      (params) => this.onDisplayFileSystemTree(params)
+    );
+    this.disposables.push(disposable);
+    disposable = this.connection.onRequest(
+      customRequests.createOrUpdateSourceFile,
+      (params) => this.onCreateOrUpdateSourceFile(params)
+    );
+    this.disposables.push(disposable);
+    disposable = this.connection.onRequest(
+      customRequests.deleteSourceFile,
+      (params) => this.onDeleteSourceFile(params)
+    );
     this.disposables.push(disposable);
-    disposable = this.connection.onCodeActionResolve((params, token) => this.withCancellation(token, (token2) => this.onCodeActionResolve(params, token2)));
+    disposable = this.connection.onRequest(customRequests.getNodeRange, (params, token) => this.withTaskController(token, (taskController) => this.onGetNodeRange(params, taskController)));
+    this.disposables.push(disposable);
+    disposable = this.connection.onRequest(customRequests.assignField, (params, token) => this.withTaskController(token, (taskController) => this.onAssignField(params, taskController)));
+    this.disposables.push(disposable);
+    disposable = this.connection.onRequest(customRequests.deleteBlockFromScript, (params, token) => this.withTaskController(token, (taskController) => this.onDeleteBlockFromScript(params, taskController)));
     this.disposables.push(disposable);
     this.connection.listen();
   }
@@ -12920,13 +12959,13 @@ var LanguageServer = class {
       setUserLocale(params.initializationOptions?.localeOverride ?? params.locale ?? "en");
       let workspaceFolderUris;
       if (params.initializationOptions?.workspaceFoldersOverride !== void 0) {
-        workspaceFolderUris = params.initializationOptions.workspaceFoldersOverride.map((f) => this.convertVscodeUriToUri(URI2.parse(f.uri)));
+        workspaceFolderUris = params.initializationOptions.workspaceFoldersOverride.map((f) => this.convertVscodeUriToUri(URI.parse(f.uri)));
       } else if (params.workspaceFolders) {
-        workspaceFolderUris = params.workspaceFolders.map((f) => this.convertVscodeUriToUri(URI2.parse(f.uri)));
+        workspaceFolderUris = params.workspaceFolders.map((f) => this.convertVscodeUriToUri(URI.parse(f.uri)));
       } else if (params.rootUri) {
-        workspaceFolderUris = [this.convertVscodeUriToUri(URI2.parse(params.rootUri))];
+        workspaceFolderUris = [this.convertVscodeUriToUri(URI.parse(params.rootUri))];
       } else if (params.rootPath) {
-        workspaceFolderUris = [this.convertVscodeUriToUri(URI2.parse(params.rootPath))];
+        workspaceFolderUris = [this.convertVscodeUriToUri(URI.parse(params.rootPath))];
       } else {
         workspaceFolderUris = [];
       }
@@ -12942,7 +12981,7 @@ var LanguageServer = class {
           if (builtInStandardPackagesUri !== void 0) {
             additionalUrisOfDirectoriesToLoad.push(builtInStandardPackagesUri);
           }
-          fileSystemTreeProvider = runAtomically3(() => new FileSystemTreeProviderBasedOnWatchedFileSystem(
+          fileSystemTreeProvider = runAtomically2(() => new FileSystemTreeProviderBasedOnWatchedFileSystem(
             fileSystem,
             publisher,
             void 0,
@@ -12951,7 +12990,7 @@ var LanguageServer = class {
           break;
         }
         case "client-to-server-requests": {
-          this.manuallyUpdatedFileSystemTreeProvider = runAtomically3(() => new ManuallyUpdatedFileSystemTreeProvider());
+          this.manuallyUpdatedFileSystemTreeProvider = runAtomically2(() => new ManuallyUpdatedFileSystemTreeProvider());
           fileSystemTreeProvider = this.manuallyUpdatedFileSystemTreeProvider;
           break;
         }
@@ -12963,21 +13002,21 @@ var LanguageServer = class {
         tsLibrariesProvider: this.config.tsLibrariesProvider,
         diagnosticsCollectedInBackgroundHandler: this.reportDiagnostics.bind(this),
         rawPackageConfigurationsChangedHandler: this.onRawPackageConfigurationsChanged.bind(this),
-        initiallyOpenedFileUris: params.initializationOptions?.initiallyOpenedFileUris?.map((u) => this.convertVscodeUriToUri(URI2.parse(u))),
-        standardPackagesUri: params.initializationOptions?.standardPackagesUri !== void 0 ? this.convertVscodeUriToUri(URI2.parse(params.initializationOptions.standardPackagesUri)) : void 0,
+        initiallyOpenedFileUris: params.initializationOptions?.initiallyOpenedFileUris?.map((u) => this.convertVscodeUriToUri(URI.parse(u))),
+        standardPackagesUri: params.initializationOptions?.standardPackagesUri !== void 0 ? this.convertVscodeUriToUri(URI.parse(params.initializationOptions.standardPackagesUri)) : void 0,
         showErrorMessage: (message) => __async(this, null, function* () {
           this.connection.window.showErrorMessage(message);
         }),
         builtInStandardPackagesUri,
         additionalPackageContents: this.config.additionalPackageContents
       };
-      this.workspace = yield runAtomically3(() => Workspace.create(config));
+      this.workspace = yield runAtomically2(() => Workspace.create(config));
       this.workspace.addWorkspaceFolders(workspaceFolderUris);
-      this.sourceGenerationService = runAtomically3(() => new SourceGenerationService(
+      this.sourceGenerationService = runAtomically2(() => new SourceGenerationService(
         this.workspace.trackedSourceFiles,
         this.config.tsLibrariesProvider,
-        (token) => __async(this, null, function* () {
-          return yield this.workspace.getStandardPackageContents(token);
+        (taskController) => __async(this, null, function* () {
+          return yield this.workspace.getStandardPackageContents(taskController);
         })
       ));
       this.definitionService = new DefinitionService(this.sourceGenerationService);
@@ -13045,12 +13084,18 @@ var LanguageServer = class {
       if (this.clientCapabilities.textDocument?.diagnostic?.dynamicRegistration === true) {
         disposable = this.connection.onRequest(
           ls3.DocumentDiagnosticRequest.type,
-          (params, token) => this.withCancellation(token, (token2) => this.onDocumentDiagnostic(params, token2))
+          (params, token) => this.withTaskController(
+            token,
+            (taskController) => this.onDocumentDiagnostic(params, taskController)
+          )
         );
         this.disposables.push(disposable);
         disposable = this.connection.onRequest(
           ls3.WorkspaceDiagnosticRequest.type,
-          (params, token) => this.withCancellation(token, (token2) => this.onWorkspaceDiagnostic(params, token2))
+          (params, token) => this.withTaskController(
+            token,
+            (taskController) => this.onWorkspaceDiagnostic(params, taskController)
+          )
         );
         this.disposables.push(disposable);
         disposable = yield this.connection.client.register(ls3.DocumentDiagnosticRequest.type, {
@@ -13078,11 +13123,11 @@ var LanguageServer = class {
     });
   }
   onDidOpenTextDocument(params) {
-    const uri = this.convertVscodeUriToUri(URI2.parse(params.textDocument.uri));
+    const uri = this.convertVscodeUriToUri(URI.parse(params.textDocument.uri));
     this.workspace.notifyOpenedTextDocument(uri, params.textDocument.text, params.textDocument.version);
   }
   onDidChangeTextDocument(params) {
-    const uri = this.convertVscodeUriToUri(URI2.parse(params.textDocument.uri));
+    const uri = this.convertVscodeUriToUri(URI.parse(params.textDocument.uri));
     const applyEdits = (text) => {
       const textDocument = TextDocument.create(params.textDocument.uri, "artel", 0, text);
       TextDocument.update(textDocument, params.contentChanges, 1);
@@ -13091,21 +13136,21 @@ var LanguageServer = class {
     this.workspace.notifyUpdatedTextDocument(uri, applyEdits, params.textDocument.version);
   }
   onDidSaveTextDocument(params) {
-    const uri = this.convertVscodeUriToUri(URI2.parse(params.textDocument.uri));
+    const uri = this.convertVscodeUriToUri(URI.parse(params.textDocument.uri));
     this.workspace.notifySavedTextDocument(uri);
   }
   onDidCloseTextDocument(params) {
-    const uri = this.convertVscodeUriToUri(URI2.parse(params.textDocument.uri));
+    const uri = this.convertVscodeUriToUri(URI.parse(params.textDocument.uri));
     this.workspace.notifyClosedTextDocument(uri);
   }
   onDidChangeWorkspaceFolders(event) {
-    this.workspace.addWorkspaceFolders(event.added.map((f) => this.convertVscodeUriToUri(URI2.parse(f.uri))));
-    this.workspace.removeWorkspaceFolders(event.removed.map((f) => this.convertVscodeUriToUri(URI2.parse(f.uri))));
+    this.workspace.addWorkspaceFolders(event.added.map((f) => this.convertVscodeUriToUri(URI.parse(f.uri))));
+    this.workspace.removeWorkspaceFolders(event.removed.map((f) => this.convertVscodeUriToUri(URI.parse(f.uri))));
   }
   onDidChangeWatchedFiles(event) {
     if (this.fileSystemUpdateNotificationsPublisher !== void 0) {
       const notifications = event.changes.map((c) => {
-        const uri = this.convertVscodeUriToUri(URI2.parse(c.uri));
+        const uri = this.convertVscodeUriToUri(URI.parse(c.uri));
         switch (c.type) {
           case ls3.FileChangeType.Created:
             return new FileSystemUpdateNotification(uri, "created");
@@ -13120,13 +13165,13 @@ var LanguageServer = class {
       this.fileSystemUpdateNotificationsPublisher.publish(notifications);
     }
   }
-  onDocumentDiagnostic(params, token) {
+  onDocumentDiagnostic(params, taskController) {
     return __async(this, null, function* () {
-      const vscodeUri = URI2.parse(params.textDocument.uri);
+      const vscodeUri = URI.parse(params.textDocument.uri);
       if (vscodeUri.scheme === GeneratedSourceFileScheme) {
         return void 0;
       }
-      const sourceFileContext = yield this.getSourceFileContext(vscodeUri, token);
+      const sourceFileContext = yield this.getSourceFileContext(vscodeUri, taskController);
       let result = { kind: "full", items: [] };
       if (sourceFileContext !== void 0) {
         const uri = this.convertVscodeUriToUri(vscodeUri);
@@ -13137,7 +13182,7 @@ var LanguageServer = class {
           } else {
             const sourceFile = state.analyzer.compilation.getSourceFileByUri(uri);
             if (sourceFile !== void 0) {
-              const diagnostics = yield state.collectSourceFileDiagnosticsWithHighPriority(sourceFile, token);
+              const diagnostics = yield state.collectSourceFileDiagnosticsWithHighPriority(sourceFile, taskController);
               if (diagnostics !== void 0) {
                 const protocolDiagnostics = diagnostics.map((d) => this.convertDiagnostic(d, sourceFile));
                 result = { kind: "full", items: protocolDiagnostics, resultId: state.version.toString() };
@@ -13150,16 +13195,16 @@ var LanguageServer = class {
       return result;
     });
   }
-  onWorkspaceDiagnostic(params, token) {
+  onWorkspaceDiagnostic(params, taskController) {
     return __async(this, null, function* () {
       this.workspaceDiagnosticsPartialResultToken = params.partialResultToken;
-      runAtomically3(() => this.workspace.isReadyToAcceptWorkspaceDiagnostics = true);
-      while (!token.isCancellationRequested) {
-        yield new Promise((r) => setTimeout(r, 1e3));
+      runAtomically2(() => this.workspace.isReadyToAcceptWorkspaceDiagnostics = true);
+      while (!taskController.isCancellationRequested()) {
+        yield taskController.yieldTask(1e3);
       }
       if (this.workspaceDiagnosticsPartialResultToken === params.partialResultToken) {
         this.workspaceDiagnosticsPartialResultToken = void 0;
-        runAtomically3(() => this.workspace.isReadyToAcceptWorkspaceDiagnostics = false);
+        runAtomically2(() => this.workspace.isReadyToAcceptWorkspaceDiagnostics = false);
       }
       throw new CancelledError();
     });
@@ -13185,7 +13230,7 @@ var LanguageServer = class {
       }
     });
   }
-  onDocumentSymbol(params, token) {
+  onDocumentSymbol(params, taskController) {
     return __async(this, null, function* () {
       const convertSourceFileItem = (item) => {
         const kind = this.convertSourceFileItemKind(item.kind);
@@ -13194,7 +13239,7 @@ var LanguageServer = class {
         const children = Query.from(item.items).map((item2) => convertSourceFileItem(item2)).toArray();
         return ls3.DocumentSymbol.create(item.name, void 0, kind, range, selectionRange, children);
       };
-      const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.textDocument.uri), token);
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
       let result = new Array();
       if (sourceFileContext !== void 0) {
         const { sourceFile } = sourceFileContext;
@@ -13203,7 +13248,7 @@ var LanguageServer = class {
       return result;
     });
   }
-  onWorkspaceSymbol(_params, token) {
+  onWorkspaceSymbol(_params, _taskController) {
     return __async(this, null, function* () {
       const convertSourceFileItem = (item) => {
         const result = new Array();
@@ -13221,16 +13266,21 @@ var LanguageServer = class {
       return items.flatMap((i) => convertSourceFileItem(i));
     });
   }
-  onDefinition(params, token) {
+  onDefinition(params, taskController) {
     return __async(this, null, function* () {
-      const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.textDocument.uri), token);
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
       if (sourceFileContext === void 0) {
         return;
       }
       const { analyzer, sourceFile } = sourceFileContext;
       const position = new Position(params.position.line, params.position.character);
       const offset = sourceFile.getOffsetAtPosition(position);
-      const definitionAndReferenceInfo = yield this.definitionService.getDefinition(analyzer, sourceFile, offset, token);
+      const definitionAndReferenceInfo = yield this.definitionService.getDefinition(
+        analyzer,
+        sourceFile,
+        offset,
+        taskController
+      );
       if (definitionAndReferenceInfo === void 0) {
         return;
       }
@@ -13248,15 +13298,15 @@ var LanguageServer = class {
       return result;
     });
   }
-  onReferences(params, token) {
+  onReferences(params, taskController) {
     return __async(this, null, function* () {
       let result = new Array();
-      const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.textDocument.uri), token);
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
       if (sourceFileContext !== void 0) {
         const { analyzer, sourceFile } = sourceFileContext;
         const position = new Position(params.position.line, params.position.character);
         const offset = sourceFile.getOffsetAtPosition(position);
-        const options6 = {
+        const options7 = {
           onlyNamed: false,
           onlyWithSameAlias: false,
           allowAmbiguous: true
@@ -13265,8 +13315,8 @@ var LanguageServer = class {
           analyzer,
           sourceFile,
           offset,
-          options6,
-          token
+          options7,
+          taskController
         );
         result = Query.from(references).map((reference) => ({
           uri: this.convertUriToVscodeUri(reference.sourceFile.uri).toString(),
@@ -13276,15 +13326,20 @@ var LanguageServer = class {
       return result;
     });
   }
-  onDocumentHighlight(params, token) {
+  onDocumentHighlight(params, taskController) {
     return __async(this, null, function* () {
       let result = new Array();
-      const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.textDocument.uri), token);
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
       if (sourceFileContext !== void 0) {
         const { analyzer, sourceFile } = sourceFileContext;
         const position = new Position(params.position.line, params.position.character);
         const offset = sourceFile.getOffsetAtPosition(position);
-        const highlights = yield this.documentHighlightService.getDocumentHighlights(analyzer, sourceFile, offset, token);
+        const highlights = yield this.documentHighlightService.getDocumentHighlights(
+          analyzer,
+          sourceFile,
+          offset,
+          taskController
+        );
         result = Query.from(highlights).map((highlight) => {
           let kind;
           switch (highlight.kind) {
@@ -13304,10 +13359,10 @@ var LanguageServer = class {
       return result;
     });
   }
-  onPrepareRename(params, token) {
+  onPrepareRename(params, taskController) {
     return __async(this, null, function* () {
       let result;
-      const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.textDocument.uri), token);
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
       if (sourceFileContext !== void 0) {
         const { analyzer, sourceFile } = sourceFileContext;
         const position = new Position(params.position.line, params.position.character);
@@ -13320,15 +13375,15 @@ var LanguageServer = class {
       return result;
     });
   }
-  onRename(params, token) {
+  onRename(params, taskController) {
     return __async(this, null, function* () {
       let result;
-      const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.textDocument.uri), token);
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
       if (sourceFileContext !== void 0) {
         const { analyzer, sourceFile } = sourceFileContext;
         const position = new Position(params.position.line, params.position.character);
         const offset = sourceFile.getOffsetAtPosition(position);
-        const renames = yield this.renameService.rename(analyzer, sourceFile, offset, params.newName, token);
+        const renames = yield this.renameService.rename(analyzer, sourceFile, offset, params.newName, taskController);
         const changes = Query.from(renames).groupBy((rename) => rename.sourceFile.uri.toString()).reduce({}, (changes2, group) => {
           const uri = this.convertUriToVscodeUri(group[1][0].sourceFile.uri).toString();
           const edits = group[1].map((rename) => ({
@@ -13343,10 +13398,10 @@ var LanguageServer = class {
       return result ?? {};
     });
   }
-  onHover(params, token) {
+  onHover(params, taskController) {
     return __async(this, null, function* () {
       let result = void 0;
-      const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.textDocument.uri), token);
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
       if (sourceFileContext !== void 0) {
         const { analyzer, sourceFile } = sourceFileContext;
         const position = new Position(params.position.line, params.position.character);
@@ -13436,40 +13491,10 @@ var LanguageServer = class {
     const code = diagnostic.data.code;
     return { message, range, severity, tags, code };
   }
-  onExecuteCommand(params, token) {
-    switch (params.command) {
-      case customCommandName.provideEvaluatableExpression:
-        Debug.assert(params.arguments?.length === 1 && isProvideEvaluatableExpressionParams(params.arguments[0]));
-        return this.onProvideEvaluatableExpression(params.arguments[0], token);
-      case customCommandName.provideServerOwnedDocumentContent:
-        Debug.assert(params.arguments?.length === 1 && isProvideServerOwnedDocumentContentParams(params.arguments[0]));
-        return this.onProvideInMemoryDocumentContent(params.arguments[0], token);
-      case customCommandName.emitCodeToString:
-        Debug.assert(params.arguments?.length === 1 && isEmitCodeToStringParams(params.arguments[0]));
-        return this.onEmitCodeToString(params.arguments[0], token);
-      case customCommandName.displayFileSystemTree:
-        Debug.assert(params.arguments?.length === 1 && isDisplayFileSystemTreeParams(params.arguments[0]));
-        return this.onDisplayFileSystemTree(params.arguments[0]);
-      case customCommandName.createOrUpdateSourceFile:
-        Debug.assert(params.arguments?.length === 1 && isCreateOrUpdateSourceFileParams(params.arguments[0]));
-        return this.onCreateOrUpdateSourceFile(params.arguments[0]);
-      case customCommandName.deleteSourceFile:
-        Debug.assert(params.arguments?.length === 1 && isDeleteSourceFileParams(params.arguments[0]));
-        return this.onDeleteSourceFile(params.arguments[0]);
-      case customCommandName.getNodeRange:
-        Debug.assert(params.arguments?.length === 1 && isGetNodeRangeParams(params.arguments[0]));
-        return this.onGetNodeRange(params.arguments[0], token);
-      case customCommandName.assignField:
-        Debug.assert(params.arguments?.length === 1 && isAssignFieldParams(params.arguments[0]));
-        return this.onAssignField(params.arguments[0], token);
-      default:
-        return void 0;
-    }
-  }
-  onAssignField(params, token) {
+  onAssignField(params, taskController) {
     return __async(this, null, function* () {
-      const functionNodeUri = URI2.parse(params.functionNodePath);
-      const sourceFileContext = yield this.getSourceFileContext(functionNodeUri, token);
+      const functionNodeUri = URI.parse(params.functionNodeUri);
+      const sourceFileContext = yield this.getSourceFileContext(functionNodeUri, taskController);
       if (sourceFileContext !== void 0) {
         const functionDeclaration = NodePath.parse(functionNodeUri.fragment).getNode(sourceFileContext.sourceFile.getSyntaxNode());
         if (functionDeclaration !== void 0 && NodeTypeUtils.isSubprogramDeclarationOrLiteral(functionDeclaration)) {
@@ -13489,6 +13514,26 @@ var LanguageServer = class {
       }
     });
   }
+  onDeleteBlockFromScript(params, taskController) {
+    return __async(this, null, function* () {
+      const functionNodeUri = URI.parse(params.functionNodeUri);
+      const sourceFileContext = yield this.getSourceFileContext(functionNodeUri, taskController);
+      if (sourceFileContext !== void 0) {
+        const functionDeclaration = NodePath.parse(functionNodeUri.fragment).getNode(sourceFileContext.sourceFile.getSyntaxNode());
+        if (functionDeclaration !== void 0 && NodeTypeUtils.isSubprogramDeclarationOrLiteral(functionDeclaration)) {
+          const sourceFileEdit = this.deleteBlockFromScriptService.createEditDeletingBlock(
+            sourceFileContext.sourceFile,
+            functionDeclaration
+          );
+          if (sourceFileEdit !== void 0) {
+            const textDocumentEdit = this.convertSourceFileEdit(sourceFileEdit);
+            const workspaceEdit = { documentChanges: [textDocumentEdit] };
+            yield this.connection.workspace.applyEdit(workspaceEdit);
+          }
+        }
+      }
+    });
+  }
   convertSourceFileEdit(edit) {
     const range = this.convertSourceFileRange(edit.sourceFile, edit.range);
     const textDocument = ls3.OptionalVersionedTextDocumentIdentifier.create(
@@ -13501,10 +13546,10 @@ var LanguageServer = class {
     const convertedEdits = edits.map((e) => this.convertSourceFileEdit(e));
     return { documentChanges: convertedEdits };
   }
-  onGetNodeRange(params, token) {
+  onGetNodeRange(params, taskController) {
     return __async(this, null, function* () {
-      const uri = URI2.parse(params.uri);
-      const sourceFileContext = yield this.getSourceFileContext(uri, token);
+      const uri = URI.parse(params.uri);
+      const sourceFileContext = yield this.getSourceFileContext(uri, taskController);
       let result;
       if (sourceFileContext !== void 0) {
         const node = NodePath.parse(uri.fragment).getNode(sourceFileContext.sourceFile.getSyntaxNode());
@@ -13521,13 +13566,13 @@ var LanguageServer = class {
   }
   onCreateOrUpdateSourceFile(params) {
     return __async(this, null, function* () {
-      const uri = this.convertVscodeUriToUri(URI2.parse(params.uri));
+      const uri = this.convertVscodeUriToUri(URI.parse(params.uri));
       this.manuallyUpdatedFileSystemTreeProvider?.createOrUpdateSourceFile(uri, params.text);
     });
   }
   onDeleteSourceFile(params) {
     return __async(this, null, function* () {
-      const uri = this.convertVscodeUriToUri(URI2.parse(params.uri));
+      const uri = this.convertVscodeUriToUri(URI.parse(params.uri));
       this.manuallyUpdatedFileSystemTreeProvider?.deleteSourceFile(uri);
     });
   }
@@ -13544,11 +13589,11 @@ var LanguageServer = class {
       return result;
     });
   }
-  onEmitCodeToString(params, cancellationToken) {
+  onEmitCodeToString(params, taskController) {
     return __async(this, null, function* () {
       let compilationControllerUri;
       if (params.workspaceFolderUri !== void 0) {
-        compilationControllerUri = this.convertVscodeUriToUri(URI2.parse(params.workspaceFolderUri));
+        compilationControllerUri = this.convertVscodeUriToUri(URI.parse(params.workspaceFolderUri));
       } else {
         if (this.workspace.workspaceFolderUris.length !== 1) {
           throw new ls3.ResponseError(
@@ -13558,7 +13603,10 @@ var LanguageServer = class {
         }
         compilationControllerUri = this.workspace.workspaceFolderUris[0];
       }
-      const workspaceElementInfo = yield this.workspace.waitLoadedAndGetWorkspaceElementInfo(compilationControllerUri, cancellationToken);
+      const workspaceElementInfo = yield this.workspace.waitLoadedAndGetWorkspaceElementInfo(
+        compilationControllerUri,
+        taskController
+      );
       const compilationController = workspaceElementInfo?.compilationController;
       if (compilationController === void 0) {
         throw new ls3.ResponseError(
@@ -13574,12 +13622,12 @@ var LanguageServer = class {
       const trackedSourceFiles = this.workspace.trackedSourceFiles.createItemsSnapshot();
       const packageGraph = new SourcePackageDependencyGraph(compilationState.analyzer);
       let hasErrors = false;
-      for (const pkg of packageGraph.enumeratePackages(0 /* JavaScript */)) {
+      for (const pkg of packageGraph.packagesForTargetPlatform(0 /* JavaScript */)) {
         if (pkg.kind === "translation") {
           continue;
         }
         for (const sourceFile of pkg.sourceFiles) {
-          const summary = yield compilationState.getDiagnosticsCollectionSummary(sourceFile, cancellationToken);
+          const summary = yield compilationState.getDiagnosticsCollectionSummary(sourceFile, taskController);
           hasErrors ||= summary.hasErrors;
           if (summary.hasErrors) {
             const uri = this.convertUriToVscodeUri(sourceFile.uri).toString();
@@ -13591,14 +13639,14 @@ var LanguageServer = class {
       if (hasErrors) {
         return { hasErrors, filesWithErrors };
       }
-      const options6 = {
+      const options7 = {
         importEmitKind: 2 /* Custom */,
         isCustomImportSynchronous: true
       };
       let result;
       try {
-        const emitter = new Emitter(compilationController.mainCompilationState.analyzer, options6);
-        const code = yield emitter.emitToString(cancellationToken);
+        const emitter = new Emitter(compilationController.mainCompilationState.analyzer, options7);
+        const code = yield emitter.emitToString(taskController);
         result = { hasErrors: false, code };
       } catch (e) {
         Logger.error(`\u0412\u043E \u0432\u0440\u0435\u043C\u044F \u0433\u0435\u043D\u0435\u0440\u0430\u0446\u0438\u0438 \u043A\u043E\u0434\u0430 \u043F\u0440\u043E\u0435\u043A\u0442\u0430 ${compilationController.uri} \u0432\u043E\u0437\u043D\u0438\u043A\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430
@@ -13608,11 +13656,11 @@ ${e}`);
       return result;
     });
   }
-  onProvideInMemoryDocumentContent(params, token) {
+  onProvideServerOwnedDocumentContent(params, taskController) {
     return __async(this, null, function* () {
-      const vscodeUri = URI2.parse(params.uri);
+      const vscodeUri = URI.parse(params.uri);
       if (vscodeUri.scheme === InMemoryPackageScheme) {
-        const sourceFileContext = yield this.getSourceFileContext(vscodeUri, token);
+        const sourceFileContext = yield this.getSourceFileContext(vscodeUri, taskController);
         return sourceFileContext?.sourceFile.getSourceText();
       } else if (vscodeUri.scheme === GeneratedSourceFileScheme) {
         const uri = this.convertVscodeUriToUri(vscodeUri);
@@ -13629,10 +13677,10 @@ ${e}`);
       }
     });
   }
-  onProvideEvaluatableExpression(params, token) {
+  onProvideEvaluatableExpression(params, taskController) {
     return __async(this, null, function* () {
       let result;
-      const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.textDocument.uri), token);
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
       if (sourceFileContext !== void 0) {
         const { analyzer, sourceFile } = sourceFileContext;
         const position = new Position(params.position.line, params.position.character);
@@ -13648,10 +13696,10 @@ ${e}`);
       return result;
     });
   }
-  onCompletion(params, token) {
+  onCompletion(params, taskController) {
     return __async(this, null, function* () {
       let result = new Array();
-      const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.textDocument.uri), token);
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
       if (sourceFileContext !== void 0) {
         const { analyzer, sourceFile } = sourceFileContext;
         const position = new Position(params.position.line, params.position.character);
@@ -13753,22 +13801,22 @@ ${e}`);
         Debug.never(kind);
     }
   }
-  onSemanticTokens(params, token) {
+  onSemanticTokens(params, taskController) {
     return __async(this, null, function* () {
       let result;
-      const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.textDocument.uri), token);
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
       if (sourceFileContext !== void 0) {
         const { analyzer, sourceFile } = sourceFileContext;
-        const semanticTokens = yield this.semanticTokensService.getSemanticTokens(analyzer, sourceFile, token);
+        const semanticTokens = yield this.semanticTokensService.getSemanticTokens(analyzer, sourceFile, taskController);
         result = this.convertSemanticTokens(semanticTokens, sourceFile);
       }
       return result ?? { data: [] };
     });
   }
-  onSemanticTokensRange(params, token) {
+  onSemanticTokensRange(params, taskController) {
     return __async(this, null, function* () {
       let result;
-      const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.textDocument.uri), token);
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
       if (sourceFileContext !== void 0) {
         const { analyzer, sourceFile } = sourceFileContext;
         const range = new Range(
@@ -13779,7 +13827,7 @@ ${e}`);
           analyzer,
           sourceFile,
           range,
-          token
+          taskController
         );
         return this.convertSemanticTokens(semanticTokens, sourceFile);
       }
@@ -13867,10 +13915,10 @@ ${e}`);
         Debug.never(flag);
     }
   }
-  onSignatureHelp(params, token) {
+  onSignatureHelp(params, taskController) {
     return __async(this, null, function* () {
       let result;
-      const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.textDocument.uri), token);
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
       if (sourceFileContext !== void 0) {
         const { analyzer, sourceFile } = sourceFileContext;
         const position = new Position(params.position.line, params.position.character);
@@ -13891,10 +13939,10 @@ ${e}`);
       return result;
     });
   }
-  onSelectionRanges(params, token) {
+  onSelectionRanges(params, taskController) {
     return __async(this, null, function* () {
       let result;
-      const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.textDocument.uri), token);
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
       if (sourceFileContext !== void 0) {
         result = [];
         const { sourceFile } = sourceFileContext;
@@ -13916,10 +13964,10 @@ ${e}`);
     const range = this.convertSourceFileRange(sourceFile, selectionRange.range);
     return ls3.SelectionRange.create(range, parent);
   }
-  onCodeAction(params, token) {
+  onCodeAction(params, taskController) {
     return __async(this, null, function* () {
       let result;
-      const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.textDocument.uri), token);
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
       if (sourceFileContext !== void 0) {
         const { analyzer, sourceFile } = sourceFileContext;
         const offset = sourceFile.getOffsetAtPosition(new Position(params.range.start.line, params.range.start.character));
@@ -13930,11 +13978,11 @@ ${e}`);
       return result;
     });
   }
-  onCodeActionResolve(params, token) {
+  onCodeActionResolve(params, taskController) {
     return __async(this, null, function* () {
       const result = params;
       if (isCodeActionData(params.data)) {
-        const sourceFileContext = yield this.getSourceFileContext(URI2.parse(params.data.location.uri), token);
+        const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.data.location.uri), taskController);
         if (sourceFileContext !== void 0) {
           const { analyzer, sourceFile } = sourceFileContext;
           const offset = sourceFile.getOffsetAtPosition(new Position(
@@ -14001,7 +14049,7 @@ ${e}`);
     const endPosition = sourceFile.getPositionAt(range.end);
     return ls3.Range.create(startPosition, endPosition);
   }
-  getSourceFileContext(vscodeUri, token) {
+  getSourceFileContext(vscodeUri, taskController) {
     return __async(this, null, function* () {
       const uri = this.convertVscodeUriToUri(vscodeUri);
       if (uri.scheme === GeneratedSourceFileScheme) {
@@ -14017,7 +14065,7 @@ ${e}`);
         }
         return void 0;
       } else {
-        const workspaceElementInfo = yield this.workspace.waitLoadedAndGetWorkspaceElementInfo(uri, token);
+        const workspaceElementInfo = yield this.workspace.waitLoadedAndGetWorkspaceElementInfo(uri, taskController);
         if (workspaceElementInfo?.sourceFile !== void 0) {
           return new SourceFileContext(
             workspaceElementInfo.compilationController,
@@ -14030,7 +14078,7 @@ ${e}`);
     });
   }
   convertUriToVscodeUri(uri) {
-    return URI2.from({ scheme: uri.scheme, authority: uri.authority, path: uri.path });
+    return URI.from({ scheme: uri.scheme, authority: uri.authority, path: uri.path });
   }
   convertVscodeUriToUri(uri) {
     return Uri.from(uri.scheme, uri.authority, uri.path);
@@ -14041,11 +14089,14 @@ ${e}`);
     }
     return new ClientCancellationToken(cancellationToken);
   }
-  withCancellation(token, handler) {
+  withTaskController(token, handler) {
     return __async(this, null, function* () {
-      const serverToken = this.createCancellationToken(token);
+      const taskController = new TaskController(
+        _LanguageServer.DefaultCancellationTokenThrottleTime,
+        this.createCancellationToken(token)
+      );
       try {
-        return yield handler(serverToken);
+        return yield handler(taskController);
       } catch (e) {
         if (e instanceof CancelledError) {
           throw new ls3.ResponseError(ls3.LSPErrorCodes.RequestCancelled, e.message);
@@ -14056,8 +14107,9 @@ ${e}`);
   }
 };
 __decorateClass([
-  atomic6
-], LanguageServer.prototype, "onDidChangeWorkspaceFolders", 1);
+  atomic7
+], _LanguageServer.prototype, "onDidChangeWorkspaceFolders", 1);
+var LanguageServer = _LanguageServer;
 var FileSystemSynchronizationMode;
 ((FileSystemSynchronizationMode2) => {
   class ClientSideFSWatcher {
@@ -14106,13 +14158,5 @@ export {
   ClientCancellationToken,
   FileSystemSynchronizationMode,
   LanguageServer,
-  customCommandName,
-  isAssignFieldParams,
-  isCreateOrUpdateSourceFileParams,
-  isDeleteSourceFileParams,
-  isDisplayFileSystemTreeParams,
-  isEmitCodeToStringParams,
-  isGetNodeRangeParams,
-  isProvideEvaluatableExpressionParams,
-  isProvideServerOwnedDocumentContentParams
+  customRequests
 };