@artel/artc 0.6.25222 → 0.6.25223

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-MBMOAUK7.js";
-import "./chunk-UZK7JCND.js";
+} from "./chunk-AX3LQ2CF.js";
+import "./chunk-LG4Z4SWO.js";
 import {
   __async
-} from "./chunk-ODWG5ZXF.js";
+} from "./chunk-DZNNWICP.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "../chunk-UZK7JCND.js";
+} from "../chunk-LG4Z4SWO.js";
 import {
   AccessKind,
   AccessedMethodValueParameter,
@@ -238,6 +238,7 @@ import {
   TypeIndexerParameterDeclarationEntity,
   TypeMemberEntityContainer,
   TypeMemberLookup,
+  TypeMemberLookupOptions,
   TypeMethodDeclarationEntity,
   TypeOrTypeExtension,
   TypeParameterConstraint,
@@ -245,6 +246,7 @@ import {
   TypeVariableDeclarationEntity,
   TypeVariableGetterDeclarationEntity,
   TypeVariableSetterDeclarationEntity,
+  TypeVariableWithInitializerSemanticContext,
   UnfinishedIntrinsicAnonymousMethodTypeEntity,
   UnfinishedIntrinsicAnonymousStructuredTypeEntity,
   UnfinishedIntrinsicPackageMethodTypeEntity,
@@ -296,6 +298,7 @@ import {
   isTypeEntity,
   isTypeEntityWithMembers,
   isTypeMemberEntity,
+  isTypeWithMembersOrExtensionEntity,
   isUnaryOperator,
   javaScriptIdentifierRegExp,
   kebabCaseToCamelCase,
@@ -329,7 +332,7 @@ import {
   withoutQuotes,
   withoutTemplateQuotes,
   yieldExecution
-} from "../chunk-ODWG5ZXF.js";
+} from "../chunk-DZNNWICP.js";
 export {
   AccessKind,
   AccessedMethodValueParameter,
@@ -564,6 +567,7 @@ export {
   TypeIndexerParameterDeclarationEntity,
   TypeMemberEntityContainer,
   TypeMemberLookup,
+  TypeMemberLookupOptions,
   TypeMethodDeclarationEntity,
   TypeOrTypeExtension,
   TypeParameterConstraint,
@@ -571,6 +575,7 @@ export {
   TypeVariableDeclarationEntity,
   TypeVariableGetterDeclarationEntity,
   TypeVariableSetterDeclarationEntity,
+  TypeVariableWithInitializerSemanticContext,
   UnfinishedIntrinsicAnonymousMethodTypeEntity,
   UnfinishedIntrinsicAnonymousStructuredTypeEntity,
   UnfinishedIntrinsicPackageMethodTypeEntity,
@@ -625,6 +630,7 @@ export {
   isTypeEntity,
   isTypeEntityWithMembers,
   isTypeMemberEntity,
+  isTypeWithMembersOrExtensionEntity,
   isUnaryOperator,
   javaScriptIdentifierRegExp,
   kebabCaseToCamelCase,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-MBMOAUK7.js";
-import "../chunk-UZK7JCND.js";
-import "../chunk-ODWG5ZXF.js";
+} from "../chunk-AX3LQ2CF.js";
+import "../chunk-LG4Z4SWO.js";
+import "../chunk-DZNNWICP.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

@@ -182,7 +182,7 @@ import {
   unwrapParenthesizedExpressions,
   visitChildren,
   yieldExecution
-} from "../chunk-ODWG5ZXF.js";
+} from "../chunk-DZNNWICP.js";
 
 // source/services/CustomCommand.ts
 import * as ls from "vscode-languageserver";
@@ -319,7 +319,7 @@ var AddPropertyAssignmentService = class {
     const reassignmentText = `${leftValueText} = ${value}`;
     const subprogramBody = this.ifShouldBeAssignedAtTheEndOfSubprogramThenBody(assignmentNode);
     if (subprogramBody !== void 0) {
-      const lastStatement = subprogramBody.expression ?? subprogramBody.statementList?.statements.last();
+      const lastStatement = subprogramBody.expressionOrStatementList.kind === 92 /* StatementList */ ? subprogramBody.expressionOrStatementList?.statements.last() : subprogramBody.expressionOrStatementList;
       let editRangeStart;
       let indentationText;
       if (lastStatement !== void 0) {
@@ -349,39 +349,12 @@ var AddPropertyAssignmentService = class {
    * расположить сразу после. Иначе присваивание необходимо расположить в конце подпрограммы (после всех ветвлений).
    */
   ifShouldBeAssignedAtTheEndOfSubprogramThenBody(node) {
-    const parent = node.parent.parent.parent;
+    const parent = node.parent.parent;
     switch (parent.kind) {
-      case 25 /* PackageConstructorDeclaration */:
-      case 26 /* PackageEntryPointDeclaration */:
-      case 27 /* PackageMethodDeclaration */:
-      case 36 /* PackageVariableGetterDeclaration */:
-      case 37 /* PackageVariableSetterDeclaration */:
-      case 45 /* TypeConstructorDeclaration */:
-      case 46 /* TypeDestructorDeclaration */:
-      case 47 /* TypeIndexedGetterDeclaration */:
-      case 48 /* TypeIndexedSetterDeclaration */:
-      case 50 /* TypeDereferencedVariableGetterDeclaration */:
-      case 51 /* TypeDereferencedVariableSetterDeclaration */:
-      case 52 /* TypeMethodDeclaration */:
-      case 55 /* TypeVariableGetterDeclaration */:
-      case 56 /* TypeVariableSetterDeclaration */:
-      case 58 /* NestedMethodDeclaration */:
-      case 67 /* MethodBlockLiteral */:
-      case 74 /* MethodLiteral */:
-      case 53 /* OperatorDeclaration */:
-        return void 0;
-      case 98 /* RunStatement */:
-      case 99 /* TryStatement */:
-      case 100 /* CatchClause */:
-      case 102 /* FinallyClause */:
-      case 108 /* ForStatement */:
-      case 109 /* IfStatement */:
-      case 111 /* ElseIfClause */:
-      case 112 /* ElseClause */:
-      case 116 /* LoopStatement */:
-      case 121 /* CaseClause */:
-      case 122 /* WhileStatement */:
+      case 93 /* StatementBlock */:
         return this.getContainingSubprogram(parent)?.block;
+      case 94 /* FunctionBlock */:
+        return void 0;
       default:
         Debug.never(parent);
     }
@@ -859,13 +832,13 @@ var SyntaxFactory = class {
   static functionExpressionBlock(expression) {
     const openBraceToken = this.token(43 /* OpenBrace */);
     const closeBraceToken = this.token(20 /* CloseBrace */);
-    return new FunctionBlock(openBraceToken, expression, void 0, closeBraceToken);
+    return new FunctionBlock(openBraceToken, expression, closeBraceToken);
   }
   static functionStatementBlock(statements) {
     const openBraceToken = this.token(43 /* OpenBrace */);
     const statementList = new StatementList(statements);
     const closeBraceToken = this.token(20 /* CloseBrace */);
-    return new FunctionBlock(openBraceToken, void 0, statementList, closeBraceToken);
+    return new FunctionBlock(openBraceToken, statementList, closeBraceToken);
   }
   static noneLiteral() {
     return new KeywordExpression(this.keyword(57 /* None */));
@@ -1672,7 +1645,7 @@ var SyntaxToCode = class _SyntaxToCode {
     this.writeNodeDefault(node);
   }
   writeDeclarationBody(node, addLeadingNewLineOrWhitespace = true) {
-    if (node.statementList === void 0 || node.statementList.elements.length === 0) {
+    if (node.expressionOrStatementList.kind !== 92 /* StatementList */ || node.expressionOrStatementList.elements.length === 0) {
       this.writeWhitespace();
       this.writeFunctionBlock(node, false);
     } else {
@@ -4049,8 +4022,9 @@ var CompletionService = class {
   }
   getTypeMemberCompletionItemInfos(ctx) {
     const type = this._analyzer.excludeNoneFromType(ctx.type);
-    const memberLookup = new TypeMemberLookup(this._analyzer, type, ctx.localizationContext);
-    return memberLookup.getNamedMembers(ctx.hidingMatcher, ctx.typeExtensionsLookup).filter((m) => m.value.isStatic() === ctx.isStaticAccess).map((m) => {
+    const memberLookup = TypeMemberLookup.ofType(this._analyzer, type, ctx.localizationContext);
+    const options6 = ctx.isStaticAccess ? 2 /* OnlyStaticMembers */ : 0 /* None */;
+    return memberLookup.getNamedMembers(options6, ctx.hidingMatcher, ctx.typeExtensionsLookup).map((m) => {
       switch (m.value.kind) {
         case "method":
           return new TypeMethodCompletionItemInfo(
@@ -4069,7 +4043,7 @@ var CompletionService = class {
         default:
           Debug.never(m.value);
       }
-    }).concat(memberLookup.getOperators(ctx.hidingMatcher, ctx.typeExtensionsLookup).filter((m) => m.value.isStatic() === ctx.isStaticAccess).map((o) => new OperatorCompletionItemInfo(this.completionItemInfoContext, o.value, o.localization)));
+    }).concat(memberLookup.getOperators(options6, ctx.hidingMatcher, ctx.typeExtensionsLookup).map((o) => new OperatorCompletionItemInfo(this.completionItemInfoContext, o.value, o.localization)));
   }
   getPackageImportCompletionItemInfos(ctx) {
     const result = this._analyzer.packageImports.getPackagesAvailableForImport(this._sourceFile.package).map((p) => p.getImportName()).filter((n) => {
@@ -5319,7 +5293,7 @@ var SyntaxContextFactory = class {
     }
     if (tokenOrKeyword.isToken(43 /* OpenBrace */) && tokenOrKeyword.parent.kind === 94 /* FunctionBlock */) {
       const block = tokenOrKeyword.parent;
-      if (block.expression !== void 0 || block.statementList?.statements.count() === 0) {
+      if (block.expressionOrStatementList.kind !== 92 /* StatementList */ || block.expressionOrStatementList.statements.count() === 0) {
         return {
           isExpressionContext: { expressionRole: new ExpressionRole_functionBlockExpression(block) },
           isStatementContext: true

package/build/{chunk-MBMOAUK7.js → chunk-AX3LQ2CF.js}

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "./chunk-UZK7JCND.js";
+} from "./chunk-LG4Z4SWO.js";
 import {
   ArtelVersion,
   Cached,
@@ -14,7 +14,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-ODWG5ZXF.js";
+} from "./chunk-DZNNWICP.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";