@artel/artc 0.6.26013 → 0.6.26014

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-TIVWJ4TV.js";
-import "./chunk-I7TWILR4.js";
+} from "./chunk-IIRVH26U.js";
+import "./chunk-NNBGH7J7.js";
 import {
   __async
-} from "./chunk-E266GANB.js";
+} from "./chunk-K3EBH7V6.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "../chunk-I7TWILR4.js";
+} from "../chunk-NNBGH7J7.js";
 import {
   AccessKind,
   AccessedFunctionParameter,
@@ -343,7 +343,7 @@ import {
   withoutQuotes,
   withoutTemplateQuotes,
   yieldTask
-} from "../chunk-E266GANB.js";
+} from "../chunk-K3EBH7V6.js";
 export {
   AccessKind,
   AccessedFunctionParameter,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-TIVWJ4TV.js";
-import "../chunk-I7TWILR4.js";
-import "../chunk-E266GANB.js";
+} from "../chunk-IIRVH26U.js";
+import "../chunk-NNBGH7J7.js";
+import "../chunk-K3EBH7V6.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

@@ -185,7 +185,7 @@ import {
   unwrapParenthesizedExpressions,
   visitChildren,
   yieldTask
-} from "../chunk-E266GANB.js";
+} from "../chunk-K3EBH7V6.js";
 
 // source/services/CustomRequests.ts
 import * as ls from "vscode-languageserver";

package/build/{chunk-TIVWJ4TV.js → chunk-IIRVH26U.js}

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "./chunk-I7TWILR4.js";
+} from "./chunk-NNBGH7J7.js";
 import {
   ArtelVersion,
   Cached,
@@ -15,7 +15,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-E266GANB.js";
+} from "./chunk-K3EBH7V6.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";

package/build/{chunk-E266GANB.js → chunk-K3EBH7V6.js}

@@ -764,7 +764,7 @@ var UniqueWithComparatorQuery = class extends Query {
 };
 
 // source/common/Constants.ts
-var ArtelVersion = true ? "0.6.26013" : "";
+var ArtelVersion = true ? "0.6.26014" : "";
 var ArtelSourceFileExtensions = [".\u0430\u0440\u0442", ".\u0430\u0440\u0442\u0435\u043B\u044C", ".art", ".artel", ".\u0430\u0440\u0442\u043C", ".\u0430\u0440\u0442\u0435\u043B\u044C\u043C", ".artm", ".artelm"];
 var ArtelSourceFileExtensionSet = new Set(ArtelSourceFileExtensions);
 var ArtelSourceAndConfigurationFileExtensionSet = new Set(ArtelSourceFileExtensionSet).add(".json");
@@ -2434,6 +2434,9 @@ var Token = class extends BaseNode {
   getTextWithTrivia() {
     return this.leadingTrivia.map((t) => t.value).join("") + this.value + this.trailingTrivia.map((t) => t.value).join("");
   }
+  hasLeadingLineBreak() {
+    return this.leadingTrivia.some((x) => x.kind === 1 /* NewLine */);
+  }
   hasTrailingLineBreak() {
     return this.trailingTrivia.length > 0 && this.trailingTrivia[this.trailingTrivia.length - 1].kind === 1 /* NewLine */;
   }
@@ -6919,16 +6922,16 @@ var englishKeywords = new Lazy(() => [
   { keyword: "xor", kind: 28 /* Xor */, flags: 3145728 /* AllContexts */, dialects: [0 /* ArtelA */] },
   { keyword: "yes", kind: 56 /* Yes */, flags: 3145728 /* AllContexts */, dialects: [0 /* ArtelA */, 1 /* ArtelM */] },
   { keyword: "yield", kind: 32 /* Yield */, flags: 3145728 /* AllContexts */, dialects: [0 /* ArtelA */] },
-  { keyword: "abstract", kind: 42 /* Abstract */, flags: 1055752 /* DeclComAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "abstract", kind: 42 /* Abstract */, flags: 3152904 /* ComAdjective */, dialects: [0 /* ArtelA */] },
   { keyword: "async", kind: 44 /* Async */, flags: 3152904 /* ComAdjective */, dialects: [0 /* ArtelA */] },
   { keyword: "base", kind: 21 /* Basic */, flags: 1055752 /* DeclComAdjective */, dialects: [0 /* ArtelA */] },
   { keyword: "hidden", kind: 41 /* Hidden */, flags: 1055752 /* DeclComAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "in type", kind: 55 /* InType */, flags: 1048576 /* Declaration */, dialects: [0 /* ArtelA */] },
-  { keyword: "in hierarchy", kind: 52 /* InHierarchy */, flags: 1048576 /* Declaration */, dialects: [0 /* ArtelA */] },
-  { keyword: "in file", kind: 53 /* InFile */, flags: 1048576 /* Declaration */, dialects: [0 /* ArtelA */] },
-  { keyword: "in package", kind: 54 /* InPackage */, flags: 1048576 /* Declaration */, dialects: [0 /* ArtelA */] },
-  { keyword: "override", kind: 43 /* Override */, flags: 1055752 /* DeclComAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "static", kind: 45 /* Static */, flags: 1055752 /* DeclComAdjective */, dialects: [0 /* ArtelA */] }
+  { keyword: "in type", kind: 55 /* InType */, flags: 3145728 /* AllContexts */, dialects: [0 /* ArtelA */] },
+  { keyword: "in hierarchy", kind: 52 /* InHierarchy */, flags: 3145728 /* AllContexts */, dialects: [0 /* ArtelA */] },
+  { keyword: "in file", kind: 53 /* InFile */, flags: 3145728 /* AllContexts */, dialects: [0 /* ArtelA */] },
+  { keyword: "in package", kind: 54 /* InPackage */, flags: 3145728 /* AllContexts */, dialects: [0 /* ArtelA */] },
+  { keyword: "override", kind: 43 /* Override */, flags: 3152904 /* ComAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "static", kind: 45 /* Static */, flags: 3152904 /* ComAdjective */, dialects: [0 /* ArtelA */] }
 ]);
 var russianKeywords = new Lazy(() => [
   { keyword: "\u0430\u0432\u0442\u043E\u0442\u0438\u043F", kind: 2 /* Autotype */, flags: 3154946 /* SingularMasNoun */, dialects: [0 /* ArtelA */] },
@@ -6991,10 +6994,10 @@ var russianKeywords = new Lazy(() => [
   { keyword: "\u0446\u0438\u043A\u043B \u043F\u043E\u043A\u0430", kind: 64 /* LoopWhile */, flags: 3145728 /* AllContexts */, dialects: [1 /* ArtelM */] },
   { keyword: "\u0447\u0442\u0435\u043D\u0438\u0435", kind: 62 /* Get */, flags: 3158018 /* SingularNeuNoun */, dialects: [0 /* ArtelA */] },
   { keyword: "\u044D\u0442\u043E", kind: 18 /* Is */, flags: 3145728 /* AllContexts */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0430\u0431\u0441\u0442\u0440\u0430\u043A\u0442\u043D\u0430\u044F", kind: 42 /* Abstract */, flags: 1058824 /* DeclSingularFemAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0430\u0431\u0441\u0442\u0440\u0430\u043A\u0442\u043D\u043E\u0435", kind: 42 /* Abstract */, flags: 1060872 /* DeclSingularNeuAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0430\u0431\u0441\u0442\u0440\u0430\u043A\u0442\u043D\u044B\u0439", kind: 42 /* Abstract */, flags: 1057800 /* DeclSingularMasAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0430\u0431\u0441\u0442\u0440\u0430\u043A\u0442\u043D\u044B\u0435", kind: 42 /* Abstract */, flags: 1064968 /* DeclPluralAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0430\u0431\u0441\u0442\u0440\u0430\u043A\u0442\u043D\u0430\u044F", kind: 42 /* Abstract */, flags: 3155976 /* SingularFemAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0430\u0431\u0441\u0442\u0440\u0430\u043A\u0442\u043D\u043E\u0435", kind: 42 /* Abstract */, flags: 3158024 /* SingularNeuAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0430\u0431\u0441\u0442\u0440\u0430\u043A\u0442\u043D\u044B\u0439", kind: 42 /* Abstract */, flags: 3154952 /* SingularMasAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0430\u0431\u0441\u0442\u0440\u0430\u043A\u0442\u043D\u044B\u0435", kind: 42 /* Abstract */, flags: 3162120 /* PluralAdjective */, dialects: [0 /* ArtelA */] },
   { keyword: "\u0430\u0441\u0438\u043D\u0445\u0440\u043E\u043D\u043D\u0430\u044F", kind: 44 /* Async */, flags: 3155976 /* SingularFemAdjective */, dialects: [0 /* ArtelA */] },
   { keyword: "\u0430\u0441\u0438\u043D\u0445\u0440\u043E\u043D\u043D\u043E\u0435", kind: 44 /* Async */, flags: 3158024 /* SingularNeuAdjective */, dialects: [0 /* ArtelA */] },
   { keyword: "\u0430\u0441\u0438\u043D\u0445\u0440\u043E\u043D\u043D\u044B\u0439", kind: 44 /* Async */, flags: 3154952 /* SingularMasAdjective */, dialects: [0 /* ArtelA */] },
@@ -7004,23 +7007,23 @@ var russianKeywords = new Lazy(() => [
   { keyword: "\u0431\u0430\u0437\u043E\u0432\u043E\u0435", kind: 21 /* Basic */, flags: 1060872 /* DeclSingularNeuAdjective */, dialects: [0 /* ArtelA */] },
   { keyword: "\u0431\u0430\u0437\u043E\u0432\u044B\u0439", kind: 21 /* Basic */, flags: 1057800 /* DeclSingularMasAdjective */, dialects: [0 /* ArtelA */] },
   { keyword: "\u0431\u0430\u0437\u043E\u0432\u044B\u0435", kind: 21 /* Basic */, flags: 1064968 /* DeclPluralAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0432 \u0442\u0438\u043F\u0435", kind: 55 /* InType */, flags: 1048576 /* Declaration */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0432 \u0438\u0435\u0440\u0430\u0440\u0445\u0438\u0438", kind: 52 /* InHierarchy */, flags: 1048576 /* Declaration */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0432 \u0444\u0430\u0439\u043B\u0435", kind: 53 /* InFile */, flags: 1048576 /* Declaration */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0432 \u043F\u0430\u043A\u0435\u0442\u0435", kind: 54 /* InPackage */, flags: 1048576 /* Declaration */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0432\u0441\u0435\u043E\u0431\u0449\u0430\u044F", kind: 45 /* Static */, flags: 1058824 /* DeclSingularFemAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0432\u0441\u0435\u043E\u0431\u0449\u0435\u0435", kind: 45 /* Static */, flags: 1060872 /* DeclSingularNeuAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0432\u0441\u0435\u043E\u0431\u0449\u0438\u0439", kind: 45 /* Static */, flags: 1057800 /* DeclSingularMasAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0432\u0441\u0435\u043E\u0431\u0449\u0438\u0435", kind: 45 /* Static */, flags: 1064968 /* DeclPluralAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u0430\u044F", kind: 43 /* Override */, flags: 1058824 /* DeclSingularFemAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u043E\u0435", kind: 43 /* Override */, flags: 1060872 /* DeclSingularNeuAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u044B\u0439", kind: 43 /* Override */, flags: 1057800 /* DeclSingularMasAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u044B\u0435", kind: 43 /* Override */, flags: 1064968 /* DeclPluralAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0441\u043A\u0440\u044B\u0442\u043E", kind: 41 /* Hidden */, flags: 1048592 /* DeclAdverb */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0441\u043A\u0440\u044B\u0442\u0430\u044F", kind: 41 /* Hidden */, flags: 1058824 /* DeclSingularFemAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0441\u043A\u0440\u044B\u0442\u043E\u0435", kind: 41 /* Hidden */, flags: 1060872 /* DeclSingularNeuAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0441\u043A\u0440\u044B\u0442\u044B\u0439", kind: 41 /* Hidden */, flags: 1057800 /* DeclSingularMasAdjective */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0441\u043A\u0440\u044B\u0442\u044B\u0435", kind: 41 /* Hidden */, flags: 1064968 /* DeclPluralAdjective */, dialects: [0 /* ArtelA */] }
+  { keyword: "\u0432 \u0442\u0438\u043F\u0435", kind: 55 /* InType */, flags: 3145728 /* AllContexts */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0432 \u0438\u0435\u0440\u0430\u0440\u0445\u0438\u0438", kind: 52 /* InHierarchy */, flags: 3145728 /* AllContexts */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0432 \u0444\u0430\u0439\u043B\u0435", kind: 53 /* InFile */, flags: 3145728 /* AllContexts */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0432 \u043F\u0430\u043A\u0435\u0442\u0435", kind: 54 /* InPackage */, flags: 3145728 /* AllContexts */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0432\u0441\u0435\u043E\u0431\u0449\u0430\u044F", kind: 45 /* Static */, flags: 3155976 /* SingularFemAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0432\u0441\u0435\u043E\u0431\u0449\u0435\u0435", kind: 45 /* Static */, flags: 3158024 /* SingularNeuAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0432\u0441\u0435\u043E\u0431\u0449\u0438\u0439", kind: 45 /* Static */, flags: 3154952 /* SingularMasAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0432\u0441\u0435\u043E\u0431\u0449\u0438\u0435", kind: 45 /* Static */, flags: 3162120 /* PluralAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u0430\u044F", kind: 43 /* Override */, flags: 3155976 /* SingularFemAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u043E\u0435", kind: 43 /* Override */, flags: 3158024 /* SingularNeuAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u044B\u0439", kind: 43 /* Override */, flags: 3154952 /* SingularMasAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u044B\u0435", kind: 43 /* Override */, flags: 3162120 /* PluralAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0441\u043A\u0440\u044B\u0442\u043E", kind: 41 /* Hidden */, flags: 3145744 /* AllAdverb */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0441\u043A\u0440\u044B\u0442\u0430\u044F", kind: 41 /* Hidden */, flags: 3155976 /* SingularFemAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0441\u043A\u0440\u044B\u0442\u043E\u0435", kind: 41 /* Hidden */, flags: 3158024 /* SingularNeuAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0441\u043A\u0440\u044B\u0442\u044B\u0439", kind: 41 /* Hidden */, flags: 3154952 /* SingularMasAdjective */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0441\u043A\u0440\u044B\u0442\u044B\u0435", kind: 41 /* Hidden */, flags: 3162120 /* PluralAdjective */, dialects: [0 /* ArtelA */] }
 ]);
 var keywordsPerLocale = new Lazy(() => [
   {
@@ -10291,6 +10294,7 @@ var TextParser = class {
     this.scanner = new Scanner(text);
     this.sequenceParsers = new Array();
     this.keywords = getOrCreateKeywordDictionary(locale, this.dialect);
+    this.tokenQueue = new Array();
     this.keywordsContextFlags_ = 1048576 /* Declaration */;
     this.lookingAhead = false;
     this.diagnostics = new Array();
@@ -10307,6 +10311,7 @@ var TextParser = class {
       new Range(0, 0)
     );
     this.currentTokenOrKeyword_ = this.currentToken;
+    this.currentTokenOrKeywordContextFlags_ = 1048576 /* Declaration */;
     this.hasCurrentTokenOrKeyword = false;
     this.packageImportDirectiveParser = new PackageImportDirectiveParser(this);
     this.packageMemberDeclarationParser = new PackageMemberDeclarationParser(this);
@@ -10328,6 +10333,12 @@ var TextParser = class {
   getCurrentTokenOrKeyword() {
     if (!this.hasCurrentTokenOrKeyword) {
       this.nextTokenOrKeyword();
+    } else if (this.currentTokenOrKeyword_.kind === 0 /* Token */ && this.currentTokenOrKeyword_.tokenKind === 9 /* Identifier */ && (this.currentTokenOrKeywordContextFlags_ & this.keywordsContextFlags) === 0) {
+      this.tokenQueue.push(this.currentTokenOrKeyword_);
+      this.nextTokenOrKeyword();
+    } else if (this.currentTokenOrKeyword_.kind === 3 /* Keyword */ && (this.currentTokenOrKeyword_.flags & this.keywordsContextFlags) === 0) {
+      this.tokenQueue.push(...this.currentTokenOrKeyword_.tokens);
+      this.nextTokenOrKeyword();
     }
     return this.currentTokenOrKeyword_;
   }
@@ -10466,8 +10477,15 @@ var TextParser = class {
     return void 0;
   }
   lookAhead(callback) {
+    const savedKeywordsContextFlags = this.keywordsContextFlags_;
+    const savedTokenQueueLength = this.tokenQueue.length;
+    if (savedTokenQueueLength > 0) {
+      this.tokenQueue = this.tokenQueue.slice();
+    }
+    const savedTokenQueue = this.tokenQueue;
     const savedCurrentToken = this.currentToken;
     const savedCurrentTokenOrKeyword = this.currentTokenOrKeyword_;
+    const savedCurrentTokenOrKeywordContextFlags = this.currentTokenOrKeywordContextFlags_;
     const savedHasCurrentTokenOrKeyword = this.hasCurrentTokenOrKeyword;
     const savedHasPrecedingLineBreak = this.hasPrecedingLineBreak;
     const savedSkippedTokenOrKeywords = this.skippedTokenOrKeywords;
@@ -10478,8 +10496,10 @@ var TextParser = class {
     const savedLookingAhead = this.lookingAhead;
     this.lookingAhead = true;
     const result = this.scanner.lookAhead(callback);
+    this.keywordsContextFlags_ = savedKeywordsContextFlags;
     this.currentToken = savedCurrentToken;
     this.currentTokenOrKeyword_ = savedCurrentTokenOrKeyword;
+    this.currentTokenOrKeywordContextFlags_ = savedCurrentTokenOrKeywordContextFlags;
     this.hasCurrentTokenOrKeyword = savedHasCurrentTokenOrKeyword;
     this.hasPrecedingLineBreak = savedHasPrecedingLineBreak;
     if (savedSkippedTokenOrKeywordsLength > 0) {
@@ -10487,12 +10507,24 @@ var TextParser = class {
     } else {
       this.skippedTokenOrKeywords.length = 0;
     }
+    if (savedTokenQueueLength > 0) {
+      this.tokenQueue = savedTokenQueue;
+    } else {
+      this.tokenQueue.length = 0;
+    }
     this.lookingAhead = savedLookingAhead;
     return result;
   }
   tryParse(callback) {
+    const savedKeywordsContextFlags = this.keywordsContextFlags_;
+    const savedTokenQueueLength = this.tokenQueue.length;
+    if (savedTokenQueueLength > 0) {
+      this.tokenQueue = this.tokenQueue.slice();
+    }
+    const savedTokenQueue = this.tokenQueue;
     const savedCurrentToken = this.currentToken;
     const savedCurrentTokenOrKeyword = this.currentTokenOrKeyword_;
+    const savedCurrentTokenOrKeywordContextFlags = this.currentTokenOrKeywordContextFlags_;
     const savedHasCurrentTokenOrKeyword = this.hasCurrentTokenOrKeyword;
     const savedHasPrecedingLineBreak = this.hasPrecedingLineBreak;
     const savedDiagnostics = this.diagnostics;
@@ -10513,8 +10545,10 @@ var TextParser = class {
     const savedLookingAhead = this.lookingAhead;
     const result = this.scanner.tryScan(callback);
     if (result === void 0) {
+      this.keywordsContextFlags_ = savedKeywordsContextFlags;
       this.currentToken = savedCurrentToken;
       this.currentTokenOrKeyword_ = savedCurrentTokenOrKeyword;
+      this.currentTokenOrKeywordContextFlags_ = savedCurrentTokenOrKeywordContextFlags;
       this.hasCurrentTokenOrKeyword = savedHasCurrentTokenOrKeyword;
       this.hasPrecedingLineBreak = savedHasPrecedingLineBreak;
       if (savedSkippedTokenOrKeywordsLength > 0) {
@@ -10523,6 +10557,11 @@ var TextParser = class {
         this.skippedTokenOrKeywords.length = 0;
       }
       this.lookingAhead = savedLookingAhead;
+      if (savedTokenQueueLength > 0) {
+        this.tokenQueue = savedTokenQueue;
+      } else {
+        this.tokenQueue.length = 0;
+      }
       if (!this.lookingAhead) {
         if (savedDiagnosticsLength > 0) {
           this.diagnostics = savedDiagnostics;
@@ -10701,22 +10740,19 @@ var TextParser = class {
     return scannerTokenKindToTreeTokenKind(scannerToken.kind);
   }
   parseDetectedToken() {
-    const tokenOrKeyword = this.getCurrentTokenOrKeyword();
-    Debug.assert(this.hasCurrentTokenOrKeyword && tokenOrKeyword.kind === 0 /* Token */);
-    const result = this.tokenWithSkippedTokens(tokenOrKeyword);
+    Debug.assert(this.hasCurrentTokenOrKeyword && this.currentTokenOrKeyword_.kind === 0 /* Token */);
+    const result = this.tokenWithSkippedTokens(this.currentTokenOrKeyword_);
     this.hasCurrentTokenOrKeyword = false;
     return result;
   }
   parseDetectedKeyword() {
-    const tokenOrKeyword = this.getCurrentTokenOrKeyword();
-    Debug.assert(this.hasCurrentTokenOrKeyword && tokenOrKeyword.kind === 3 /* Keyword */);
-    const result = this.keywordWithSkippedTokens(tokenOrKeyword);
+    Debug.assert(this.hasCurrentTokenOrKeyword && this.currentTokenOrKeyword_.kind === 3 /* Keyword */);
+    const result = this.keywordWithSkippedTokens(this.currentTokenOrKeyword_);
     this.hasCurrentTokenOrKeyword = false;
     return result;
   }
   nextTokenOrKeyword() {
     let result;
-    this.hasPrecedingLineBreak = this.hasTrailingLineBreak();
     this.nextToken();
     const keyword = this.tryParseKeyword();
     if (keyword !== void 0) {
@@ -10728,15 +10764,17 @@ var TextParser = class {
       result = token;
     }
     this.hasCurrentTokenOrKeyword = true;
+    this.hasPrecedingLineBreak = this.currentTokenHasLeadingLineBreak();
+    this.currentTokenOrKeywordContextFlags_ = this.keywordsContextFlags_;
     return result;
   }
-  hasTrailingLineBreak() {
+  currentTokenHasLeadingLineBreak() {
     const tokenOrKeyword = this.currentTokenOrKeyword_;
     if (tokenOrKeyword.kind === 0 /* Token */) {
-      return tokenOrKeyword.hasTrailingLineBreak();
+      return tokenOrKeyword.hasLeadingLineBreak();
     } else if (tokenOrKeyword.kind === 3 /* Keyword */) {
       const tokens = tokenOrKeyword.tokens;
-      return tokens.length > 0 && tokens[tokens.length - 1].hasTrailingLineBreak();
+      return tokens.length > 0 && tokens[0].hasLeadingLineBreak();
     } else {
       Debug.never(tokenOrKeyword);
     }
@@ -10782,47 +10820,51 @@ var TextParser = class {
     return result;
   }
   nextToken() {
-    const tokenStart = this.scanner.getToken().startPosition;
-    const leadingTrivia = this.scanLeadingTrivia();
-    const scannerToken = this.scanner.getToken();
-    this.validateScannerToken(scannerToken);
-    this.scanner.nextToken();
-    const trailingTrivia = this.tryScanTrailingTrivia();
-    const tokenEnd = this.scanner.getToken().startPosition;
-    const kind = scannerTokenKindToTreeTokenKind(scannerToken.kind);
     let result;
-    switch (kind) {
-      case 9 /* Identifier */:
-        result = this.createIdentifierToken(
-          scannerToken,
-          leadingTrivia,
-          trailingTrivia,
-          new Range(tokenStart, tokenEnd)
-        );
-        break;
-      case 5 /* TextLiteral */:
-      case 6 /* TextTemplateHead */:
-      case 7 /* TextTemplatePart */:
-      case 8 /* TextTemplateTail */:
-        result = this.createTextOrTextTemplateToken(
-          kind,
-          scannerToken,
-          leadingTrivia,
-          trailingTrivia,
-          new Range(tokenStart, tokenEnd)
-        );
-        break;
-      default:
-        result = new Token(
-          kind,
-          scannerToken.value,
-          leadingTrivia,
-          trailingTrivia,
-          0 /* None */,
-          void 0,
-          new Range(tokenStart, tokenEnd)
-        );
-        break;
+    if (this.tokenQueue.length > 0) {
+      result = this.tokenQueue.shift();
+    } else {
+      const tokenStart = this.scanner.getToken().startPosition;
+      const leadingTrivia = this.scanLeadingTrivia();
+      const scannerToken = this.scanner.getToken();
+      this.validateScannerToken(scannerToken);
+      this.scanner.nextToken();
+      const trailingTrivia = this.tryScanTrailingTrivia();
+      const tokenEnd = this.scanner.getToken().startPosition;
+      const kind = scannerTokenKindToTreeTokenKind(scannerToken.kind);
+      switch (kind) {
+        case 9 /* Identifier */:
+          result = this.createIdentifierToken(
+            scannerToken,
+            leadingTrivia,
+            trailingTrivia,
+            new Range(tokenStart, tokenEnd)
+          );
+          break;
+        case 5 /* TextLiteral */:
+        case 6 /* TextTemplateHead */:
+        case 7 /* TextTemplatePart */:
+        case 8 /* TextTemplateTail */:
+          result = this.createTextOrTextTemplateToken(
+            kind,
+            scannerToken,
+            leadingTrivia,
+            trailingTrivia,
+            new Range(tokenStart, tokenEnd)
+          );
+          break;
+        default:
+          result = new Token(
+            kind,
+            scannerToken.value,
+            leadingTrivia,
+            trailingTrivia,
+            0 /* None */,
+            void 0,
+            new Range(tokenStart, tokenEnd)
+          );
+          break;
+      }
     }
     this.currentToken = result;
     return result;
@@ -10953,9 +10995,10 @@ var TextParser = class {
           trivia = new Trivia(0 /* Whitespace */, scannerToken.value);
           break;
         case 3 /* NewLine */:
-          trivia = new Trivia(1 /* NewLine */, scannerToken.value);
           if (untilNewLine) {
             doneParsingTrivia = true;
+          } else {
+            trivia = new Trivia(1 /* NewLine */, scannerToken.value);
           }
           break;
         case 4 /* SingleLineComment */:
@@ -11837,16 +11880,29 @@ var ExpressionParser = class _ExpressionParser {
     this.indexerArgumentListParser = new ArgumentListParser(this.parser, 24 /* CloseSquareBracket */);
   }
   // isFollowedByStatementBlock = true если по синтаксису сразу после выражения следует блок.
-  // В таком случае не будет разбираться сокращённая форма анонимной функции ({ ... }).
+  // В таком случае не будет разбираться сокращённая форма безымянной функции ({ ... }).
   isStartOfExpression(isFollowedByStatementBlock) {
-    let result = this.isPrefixUnaryOperator();
-    if (!result) {
-      result = this.isStartOfPrimaryExpression(isFollowedByStatementBlock);
-    }
-    return result;
+    return this.parser.lookAhead(() => {
+      this.parser.keywordsContextFlags = 2097152 /* Expression */;
+      if (this.isPrefixUnaryOperator()) {
+        return true;
+      }
+      if (this.parser.isTokenOneOf(_ExpressionParser.primaryExpressionTokens) || this.parser.isKeywordOneOf(_ExpressionParser.primaryExpressionKeywords)) {
+        return true;
+      } else if (this.parser.isToken(46 /* OpenBrace */)) {
+        return !isFollowedByStatementBlock;
+      }
+      this.parser.parseOptionalKeyword(44 /* Async */);
+      const functionKeyword = this.parser.parseOptionalKeyword(16 /* Function */);
+      return functionKeyword !== void 0 && this.parser.isToken(47 /* OpenParenthesis */);
+    });
   }
   parseExpression(isFollowedByStatementBlock) {
-    return this.parseNullCoalescingExpression(isFollowedByStatementBlock);
+    const savedKeywordsContextFlags = this.parser.keywordsContextFlags;
+    this.parser.keywordsContextFlags = 2097152 /* Expression */;
+    const result = this.parseNullCoalescingExpression(isFollowedByStatementBlock);
+    this.parser.keywordsContextFlags = savedKeywordsContextFlags;
+    return result;
   }
   parseNullCoalescingExpression(isFollowedByStatementBlock) {
     const expressionStart = this.parser.tokenOrKeywordStartPosition();
@@ -12203,20 +12259,6 @@ var ExpressionParser = class _ExpressionParser {
       35 /* Creation */
     ];
   }
-  isStartOfPrimaryExpression(isFollowedByStatementBlock) {
-    if (this.parser.isTokenOneOf(_ExpressionParser.primaryExpressionTokens) || this.parser.isKeywordOneOf(_ExpressionParser.primaryExpressionKeywords)) {
-      return true;
-    } else if (this.parser.isToken(46 /* OpenBrace */)) {
-      return !isFollowedByStatementBlock;
-    } else if (this.parser.isKeyword(44 /* Async */) || this.parser.isKeyword(16 /* Function */)) {
-      return this.parser.lookAhead(() => {
-        this.parser.parseOptionalKeyword(44 /* Async */);
-        const functionKeyword = this.parser.parseOptionalKeyword(16 /* Function */);
-        return functionKeyword !== void 0 && this.parser.isToken(47 /* OpenParenthesis */);
-      });
-    }
-    return false;
-  }
   parsePrimaryExpression(isFollowedByStatementBlock) {
     let result = void 0;
     const tokenOrKeyword = this.parser.getCurrentTokenOrKeyword();

package/build/{chunk-I7TWILR4.js → chunk-NNBGH7J7.js}

@@ -10,7 +10,7 @@ import {
   WellKnownDeclarationsLoadError,
   __async,
   createTsInteropInputsForCompilation
-} from "./chunk-E266GANB.js";
+} from "./chunk-K3EBH7V6.js";
 
 // source/executor/Compiler.ts
 var Compiler = class {

package/build/types/tree/BaseNode.d.ts

@@ -59,6 +59,7 @@ export declare class Token<TKind extends TokenKind = TokenKind> extends BaseNode
     constructor(tokenKind: TKind, value: string, leadingTrivia: readonly Trivia[], trailingTrivia: readonly Trivia[], flags: TokenFlags, operatorKind: OperatorKind | undefined, rangeWithTrivia: Range | undefined);
     get rangeWithoutTrivia(): Range;
     getTextWithTrivia(): string;
+    hasLeadingLineBreak(): boolean;
     hasTrailingLineBreak(): boolean;
     getTriviaAt(position: number): TokenTrivia | undefined;
     selectLeadingTrivia(condition: (trivia: Trivia, rangeStart: number, rangeEnd: number) => boolean): TokenTrivia[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artel/artc",
-  "version": "0.6.26013",
+  "version": "0.6.26014",
   "description": "Артель Компилятор | Artel Compiler",
   "author": "Nezaboodka Team <contact@nezaboodka.com>",
   "license": "Apache-2.0",