@artel/artc 0.9.26038-pre-release → 0.9.26040-pre-release

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-NRZEWWTT.js";
-import "./chunk-3I4SQIYG.js";
+} from "./chunk-PZ3Z6CQ2.js";
+import "./chunk-R3HOGWRU.js";
 import {
   __async
-} from "./chunk-62UH22KS.js";
+} from "./chunk-L4KESOHQ.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "../chunk-3I4SQIYG.js";
+} from "../chunk-R3HOGWRU.js";
 import {
   AccessKind,
   AccessedFunction_entity,
@@ -311,7 +311,7 @@ import {
   withoutQuotes,
   withoutTemplateQuotes,
   yieldTask
-} from "../chunk-62UH22KS.js";
+} from "../chunk-L4KESOHQ.js";
 export {
   AccessKind,
   AccessedFunction_entity,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-NRZEWWTT.js";
-import "../chunk-3I4SQIYG.js";
-import "../chunk-62UH22KS.js";
+} from "../chunk-PZ3Z6CQ2.js";
+import "../chunk-R3HOGWRU.js";
+import "../chunk-L4KESOHQ.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

@@ -3,6 +3,7 @@ import {
   AccessedFunction_typeMember,
   AccessorEntity,
   Analyzer3 as Analyzer,
+  ArtelSourceAndConfigurationFileExtensionSet,
   Cached,
   CancelledError,
   CompilationLoader,
@@ -141,7 +142,7 @@ import {
   traverseTreeAsync,
   traverseTreeAsync2,
   yieldTask
-} from "../chunk-62UH22KS.js";
+} from "../chunk-L4KESOHQ.js";
 
 // source/services/common/Types.ts
 import * as ls from "vscode-languageserver";
@@ -8152,7 +8153,8 @@ var supportedSemanticTokens = [
   4 /* PackageFunction */,
   5 /* NestedFunction */,
   6 /* Method */,
-  7 /* Operator */
+  7 /* Operator */,
+  8 /* KeywordControl */
 ];
 var supportedSemanticTokenModifiers = [
   1 /* Const */,
@@ -17955,6 +17957,13 @@ var SemanticTokensServiceM = class {
               new SemanticToken(name.rangeWithoutTrivia, 6 /* Method */, new SemanticTokenModifiers().makeDeclaration().setCapitalized(this.isCapitalizedName(name.value)))
             );
           }
+          if (isKeyword2(node, 1011 /* End */) && this.isEndKeywordEndingStatement(node)) {
+            result.push(new SemanticToken(
+              node.rangeWithoutTrivia,
+              8 /* KeywordControl */,
+              new SemanticTokenModifiers()
+            ));
+          }
           return void 0;
         }
       );
@@ -17976,6 +17985,25 @@ var SemanticTokensServiceM = class {
         Debug.never(entity);
     }
   }
+  isEndKeywordEndingStatement(node) {
+    const parent = node.parent;
+    switch (parent.kind) {
+      case 1098 /* StatementBlock */:
+        return true;
+      case 1035 /* FunctionBlock */:
+      case 1061 /* MethodDeclaration */:
+      case 1062 /* MethodTranslation */:
+      case 1077 /* PackageImportDirective */:
+      case 1125 /* TranslationsDeclaration */:
+      case 1130 /* TypeMemberDeclarationBlock */:
+      case 1138 /* TypeTranslationDeclaration */:
+        return false;
+      default:
+        Debug.typeIsAssignableTo();
+        Debug.typeIsAssignableTo();
+        return false;
+    }
+  }
   isCapitalizedName(name) {
     let firstChar;
     if (typeof name === "string") {
@@ -18663,6 +18691,10 @@ var _LanguageServer = class _LanguageServer {
     this.disposables.push(disposable);
     disposable = this.connection.onCodeActionResolve((params, token) => this.withTaskController(token, (taskController) => this.onCodeActionResolve(params, taskController)));
     this.disposables.push(disposable);
+    disposable = this.connection.workspace.onDidDeleteFiles((params) => this.onDidDeleteFiles(params));
+    this.disposables.push(disposable);
+    disposable = this.connection.workspace.onDidRenameFiles((params) => this.onDidRenameFiles(params));
+    this.disposables.push(disposable);
     disposable = this.connection.onRequest(customRequests.getLocalesAvailableForTranslation, (params, token) => this.withTaskController(token, (_taskController) => __async(this, null, function* () {
       return void 0;
     })));
@@ -18775,6 +18807,7 @@ var _LanguageServer = class _LanguageServer {
       this.definitionServiceM = new DefinitionServiceM(this.sourceGenerationService);
       this.isInitialized = true;
       Logger.info(`\u0418\u043D\u0438\u0446\u0438\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u044F \u0441\u0435\u0440\u0432\u0438\u0441\u043E\u0432 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u0430 \u0437\u0430 ${Math.round(performance.now() - initializeStartTime)} \u043C\u0441.`);
+      const artelAndConfigurationFilesGlob = `**/*{${Array.from(ArtelSourceAndConfigurationFileExtensionSet).join(",")}}`;
       return {
         capabilities: {
           textDocumentSync: {
@@ -18786,6 +18819,22 @@ var _LanguageServer = class _LanguageServer {
             workspaceFolders: {
               supported: true,
               changeNotifications: true
+            },
+            fileOperations: {
+              didDelete: {
+                filters: [{
+                  pattern: {
+                    glob: artelAndConfigurationFilesGlob
+                  }
+                }]
+              },
+              didRename: {
+                filters: [{
+                  pattern: {
+                    glob: artelAndConfigurationFilesGlob
+                  }
+                }]
+              }
             }
           },
           definitionProvider: true,
@@ -19750,11 +19799,11 @@ ${e}`);
   convertSemanticTokenKind(kind) {
     switch (kind) {
       case 0 /* FunctionBlockLiteralParameter */:
-        return "keyword.art";
+        return "keywordNotControl";
       case 1 /* SpecialVariable */:
-        return "keyword.art";
+        return "keywordNotControl";
       case 2 /* SpecialMethod */:
-        return "keyword.art";
+        return "keywordNotControl";
       case 3 /* Variant */:
         return ls3.SemanticTokenTypes.enumMember;
       case 4 /* PackageFunction */:
@@ -19765,6 +19814,8 @@ ${e}`);
         return ls3.SemanticTokenTypes.method;
       case 7 /* Operator */:
         return ls3.SemanticTokenTypes.operator;
+      case 8 /* KeywordControl */:
+        return "keyword.control";
       default:
         Debug.never(kind);
     }
@@ -19957,6 +20008,43 @@ ${e}`);
         Debug.never(kind);
     }
   }
+  onDidDeleteFiles(params) {
+    return __async(this, null, function* () {
+      for (const fileDelete of params.files) {
+        const uri = this.convertVscodeUriToUri(URI.parse(fileDelete.uri));
+        if (isSourceOrConfigurationFileName(uri)) {
+          yield this.clearDiagnostics(uri);
+        }
+      }
+    });
+  }
+  onDidRenameFiles(params) {
+    return __async(this, null, function* () {
+      for (const fileRename of params.files) {
+        const uri = this.convertVscodeUriToUri(URI.parse(fileRename.oldUri));
+        if (isSourceOrConfigurationFileName(uri)) {
+          yield this.clearDiagnostics(uri);
+        }
+      }
+    });
+  }
+  clearDiagnostics(uri) {
+    return __async(this, null, function* () {
+      if (this.workspaceDiagnosticsPartialResultToken !== void 0) {
+        const report = {
+          kind: "full",
+          uri: this.convertUriToVscodeUri(uri).toString(),
+          items: [],
+          version: null
+        };
+        yield this.connection.sendProgress(
+          ls3.WorkspaceDiagnosticRequest.type,
+          this.workspaceDiagnosticsPartialResultToken,
+          { items: [report] }
+        );
+      }
+    });
+  }
   onRawPackageConfigurationsChanged(configurations) {
     return __async(this, null, function* () {
       for (const configuration of configurations) {

package/build/{chunk-62UH22KS.js → chunk-L4KESOHQ.js}

@@ -780,7 +780,7 @@ var UniqueWithComparatorQuery = class extends Query {
 };
 
 // source/common/Constants.ts
-var ArtelVersion = true ? "0.9.26038-pre-release" : "";
+var ArtelVersion = true ? "0.9.26040-pre-release" : "";
 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");
@@ -3789,8 +3789,10 @@ var russianKeywords2 = new Lazy(() => [
   { keyword: "\u0443\u043A", kind: 1027 /* Pointer */ },
   { keyword: "\u0431\u0430\u0437\u0430", kind: 1002 /* Base */ },
   { keyword: "\u0432\u043E\u0437\u0432\u0440\u0430\u0442", kind: 1028 /* Return */ },
-  { keyword: "\u0432\u0441\u0451", kind: 1011 /* End */ },
+  { keyword: "\u043A\u0431", kind: 1011 /* End */ },
+  // конец блока
   { keyword: "\u0432\u0441\u0435", kind: 1011 /* End */ },
+  { keyword: "\u0432\u0441\u0451", kind: 1011 /* End */ },
   { keyword: "\u0432\u044B\u0434\u0430\u0447\u0430", kind: 1037 /* Yield */ },
   { keyword: "\u0434\u0430", kind: 1036 /* Yes */ },
   { keyword: "\u0435\u0441\u043B\u0438", kind: 1018 /* If */ },

package/build/{chunk-NRZEWWTT.js → chunk-PZ3Z6CQ2.js}

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "./chunk-3I4SQIYG.js";
+} from "./chunk-R3HOGWRU.js";
 import {
   ArtelVersion,
   Cached,
@@ -16,7 +16,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-62UH22KS.js";
+} from "./chunk-L4KESOHQ.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";

package/build/{chunk-3I4SQIYG.js → chunk-R3HOGWRU.js}

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

package/build/types/services/LanguageServer.d.ts

@@ -106,6 +106,9 @@ export declare class LanguageServer {
     private onCodeActionResolve;
     private convertCodeAction;
     private convertCodeActionKind;
+    private onDidDeleteFiles;
+    private onDidRenameFiles;
+    private clearDiagnostics;
     private onRawPackageConfigurationsChanged;
     private convertSourceFileRange;
     private getSourceFileContext;

package/build/types/services/common/semantic-tokens/Types.d.ts

@@ -21,9 +21,10 @@ export declare const enum SemanticTokenKind {
     PackageFunction = 4,
     NestedFunction = 5,
     Method = 6,
-    Operator = 7
+    Operator = 7,
+    KeywordControl = 8
 }
-export declare const supportedSemanticTokens: readonly [SemanticTokenKind.FunctionBlockLiteralParameter, SemanticTokenKind.SpecialVariable, SemanticTokenKind.SpecialMethod, SemanticTokenKind.Variant, SemanticTokenKind.PackageFunction, SemanticTokenKind.NestedFunction, SemanticTokenKind.Method, SemanticTokenKind.Operator];
+export declare const supportedSemanticTokens: readonly [SemanticTokenKind.FunctionBlockLiteralParameter, SemanticTokenKind.SpecialVariable, SemanticTokenKind.SpecialMethod, SemanticTokenKind.Variant, SemanticTokenKind.PackageFunction, SemanticTokenKind.NestedFunction, SemanticTokenKind.Method, SemanticTokenKind.Operator, SemanticTokenKind.KeywordControl];
 export declare const enum SemanticTokenModifierFlag {
     Const = 1,
     Declaration = 2,

package/build/types/services/m/SemanticTokensService.d.ts

@@ -7,5 +7,6 @@ export declare class SemanticTokensServiceM {
     getSemanticTokensInRange(analyzer: Analyzer, sourceFile: SourceFileM, range: Range, taskController: TaskController): Promise<SemanticToken[]>;
     private rangesOverlap;
     private getSemanticTokenKindForNamedFunctionEntity;
+    private isEndKeywordEndingStatement;
     private isCapitalizedName;
 }

package/build/types/tree/m/Nodes.d.ts

@@ -15,6 +15,8 @@ export type Identifier = Token<TokenKind.Identifier>;
 export type IdentifierParent = NodesWithChild<Identifier>;
 export type IdentifierListElement = Identifier | Comma;
 export type ObjectKeyword = Keyword<KeywordKind.Object>;
+export type EndKeyword = Keyword<KeywordKind.End>;
+export type EndKeywordParent = NodesWithChild<EndKeyword>;
 export declare class SourceFile extends BaseNode {
     readonly kind = NodeKind.SourceFile;
     readonly children: readonly [
@@ -62,16 +64,16 @@ export declare class PackageImportDirective extends BaseNode {
         Token<TokenKind.OpenBrace> | undefined,
         PackageImportList,
         Token<TokenKind.CloseBrace> | undefined,
-        Keyword<KeywordKind.End> | undefined
+        EndKeyword | undefined
     ];
     get parent(): PackageImportDirectiveList;
     get importKeyword(): Keyword<KeywordKind.Import>;
     get openBraceToken(): Token<TokenKind.OpenBrace> | undefined;
     get packageImportList(): PackageImportList;
     get closeBraceToken(): Token<TokenKind.CloseBrace> | undefined;
-    get endKeyword(): Keyword<KeywordKind.End> | undefined;
+    get endKeyword(): EndKeyword | undefined;
     protected get thisAsNode(): Node;
-    constructor(importKeyword: Keyword<KeywordKind.Import>, openBraceToken: Token<TokenKind.OpenBrace> | undefined, packageImportList: PackageImportList, closeBraceToken: Token<TokenKind.CloseBrace> | undefined, endKeyword: Keyword<KeywordKind.End> | undefined, rangeWithTrivia: Range | undefined);
+    constructor(importKeyword: Keyword<KeywordKind.Import>, openBraceToken: Token<TokenKind.OpenBrace> | undefined, packageImportList: PackageImportList, closeBraceToken: Token<TokenKind.CloseBrace> | undefined, endKeyword: EndKeyword | undefined, rangeWithTrivia: Range | undefined);
 }
 export type PackageImportListElement = PackageImport | Semicolon;
 export declare class PackageImportList extends BaseNode {
@@ -500,15 +502,15 @@ export declare class TypeMemberDeclarationBlock extends BaseNode {
         Token<TokenKind.OpenBrace> | undefined,
         TypeMemberDeclarationList,
         Token<TokenKind.CloseBrace> | undefined,
-        Keyword<KeywordKind.End> | undefined
+        EndKeyword | undefined
     ];
     get parent(): TypeMemberDeclarationBlockParent;
     get openBraceToken(): Token<TokenKind.OpenBrace> | undefined;
     get memberList(): TypeMemberDeclarationList;
     get closeBraceToken(): Token<TokenKind.CloseBrace> | undefined;
-    get endKeyword(): Keyword<KeywordKind.End> | undefined;
+    get endKeyword(): EndKeyword | undefined;
     protected get thisAsNode(): Node;
-    constructor(openBraceToken: Token<TokenKind.OpenBrace> | undefined, memberList: TypeMemberDeclarationList, closeBraceToken: Token<TokenKind.CloseBrace> | undefined, endKeyword: Keyword<KeywordKind.End> | undefined, rangeWithTrivia: Range | undefined);
+    constructor(openBraceToken: Token<TokenKind.OpenBrace> | undefined, memberList: TypeMemberDeclarationList, closeBraceToken: Token<TokenKind.CloseBrace> | undefined, endKeyword: EndKeyword | undefined, rangeWithTrivia: Range | undefined);
 }
 export type TypeMemberDeclarationListElement = TypeMemberDeclaration | Semicolon;
 export declare class TypeMemberDeclarationList extends BaseNode {
@@ -1101,15 +1103,15 @@ export declare class StatementBlock extends BaseNode {
         Token<TokenKind.OpenBrace> | undefined,
         StatementList,
         Token<TokenKind.CloseBrace> | undefined,
-        Keyword<KeywordKind.End> | undefined
+        EndKeyword | undefined
     ];
     get parent(): StatementBlockParent;
     get openBraceToken(): Token<TokenKind.OpenBrace> | undefined;
     get statementList(): StatementList;
     get closeBraceToken(): Token<TokenKind.CloseBrace> | undefined;
-    get endKeyword(): Keyword<KeywordKind.End> | undefined;
+    get endKeyword(): EndKeyword | undefined;
     protected get thisAsNode(): Node;
-    constructor(openBraceToken: Token<TokenKind.OpenBrace> | undefined, statementList: StatementList, closeBraceToken: Token<TokenKind.CloseBrace> | undefined, endKeyword: Keyword<KeywordKind.End> | undefined, rangeWithTrivia: Range | undefined);
+    constructor(openBraceToken: Token<TokenKind.OpenBrace> | undefined, statementList: StatementList, closeBraceToken: Token<TokenKind.CloseBrace> | undefined, endKeyword: EndKeyword | undefined, rangeWithTrivia: Range | undefined);
 }
 export type FunctionBlockParent = PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | PackageFunctionDeclaration | FieldGetterDeclaration | FieldSetterDeclaration | IndexedElementGetterDeclaration | IndexedElementSetterDeclaration | MethodDeclaration | NestedFunctionDeclaration | FunctionLiteral | FunctionBlockLiteral | TextTranslationFunctionDeclaration | StaticMethodDeclaration | StaticFieldGetterDeclaration | StaticFieldSetterDeclaration;
 export declare class FunctionBlock extends BaseNode {
@@ -1118,15 +1120,15 @@ export declare class FunctionBlock extends BaseNode {
         Token<TokenKind.OpenBrace> | undefined,
         StatementList,
         Token<TokenKind.CloseBrace> | undefined,
-        Keyword<KeywordKind.End> | undefined
+        EndKeyword | undefined
     ];
     get parent(): FunctionBlockParent;
     get openBraceToken(): Token<TokenKind.OpenBrace> | undefined;
     get statementList(): StatementList;
     get closeBraceToken(): Token<TokenKind.CloseBrace> | undefined;
-    get endKeyword(): Keyword<KeywordKind.End> | undefined;
+    get endKeyword(): EndKeyword | undefined;
     protected get thisAsNode(): Node;
-    constructor(openBraceToken: Token<TokenKind.OpenBrace> | undefined, statementList: StatementList, closeBraceToken: Token<TokenKind.CloseBrace> | undefined, endKeyword: Keyword<KeywordKind.End> | undefined, rangeWithTrivia: Range | undefined);
+    constructor(openBraceToken: Token<TokenKind.OpenBrace> | undefined, statementList: StatementList, closeBraceToken: Token<TokenKind.CloseBrace> | undefined, endKeyword: EndKeyword | undefined, rangeWithTrivia: Range | undefined);
 }
 export type StatementParent = StatementList | PackageStatement;
 export declare class BreakLoopStatement extends BaseNode {
@@ -1704,7 +1706,7 @@ export declare class TranslationsDeclaration extends BaseNode {
         Token<TokenKind.OpenBrace> | undefined,
         TopLevelTranslationList,
         Token<TokenKind.CloseBrace> | undefined,
-        Keyword<KeywordKind.End> | undefined
+        EndKeyword | undefined
     ];
     get parent(): PackageMemberDeclarationList;
     get tagList(): TagList;
@@ -1712,9 +1714,9 @@ export declare class TranslationsDeclaration extends BaseNode {
     get openBraceToken(): Token<TokenKind.OpenBrace> | undefined;
     get translationList(): TopLevelTranslationList;
     get closeBraceToken(): Token<TokenKind.CloseBrace> | undefined;
-    get endKeyword(): Keyword<KeywordKind.End> | undefined;
+    get endKeyword(): EndKeyword | undefined;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, translationsKeyword: Keyword<KeywordKind.Translations>, openBraceToken: Token<TokenKind.OpenBrace> | undefined, translationList: TopLevelTranslationList, closeBraceToken: Token<TokenKind.CloseBrace> | undefined, endKeyword: Keyword<KeywordKind.End> | undefined, rangeWithTrivia: Range | undefined);
+    constructor(tagList: TagList, translationsKeyword: Keyword<KeywordKind.Translations>, openBraceToken: Token<TokenKind.OpenBrace> | undefined, translationList: TopLevelTranslationList, closeBraceToken: Token<TokenKind.CloseBrace> | undefined, endKeyword: EndKeyword | undefined, rangeWithTrivia: Range | undefined);
 }
 export type TopLevelTranslationListElement = TranslationDeclaration | Semicolon;
 export declare class TopLevelTranslationList extends BaseNode {
@@ -1739,7 +1741,7 @@ export declare class TypeTranslationDeclaration extends BaseNode {
         Token<TokenKind.OpenBrace> | undefined,
         TypeMemberTranslationList | undefined,
         Token<TokenKind.CloseBrace> | undefined,
-        Keyword<KeywordKind.End> | undefined
+        EndKeyword | undefined
     ];
     get parent(): TopLevelTranslationList;
     get typeKeyword(): Keyword<KeywordKind.Type>;
@@ -1751,9 +1753,9 @@ export declare class TypeTranslationDeclaration extends BaseNode {
     get openBraceToken(): Token<TokenKind.OpenBrace> | undefined;
     get memberList(): TypeMemberTranslationList | undefined;
     get closeBraceToken(): Token<TokenKind.CloseBrace> | undefined;
-    get endKeyword(): Keyword<KeywordKind.End> | undefined;
+    get endKeyword(): EndKeyword | undefined;
     protected get thisAsNode(): Node;
-    constructor(typeKeyword: Keyword<KeywordKind.Type>, sourceName: Identifier, sourceTypeParameterClause: TranslationTypeParameterClause | undefined, rightArrowToken: Token<TokenKind.RightArrow>, translatedName: Identifier, translatedTypeParameterClause: TranslationTypeParameterClause | undefined, openBraceToken: Token<TokenKind.OpenBrace> | undefined, memberList: TypeMemberTranslationList | undefined, closeBraceToken: Token<TokenKind.CloseBrace> | undefined, endKeyword: Keyword<KeywordKind.End> | undefined, rangeWithTrivia: Range | undefined);
+    constructor(typeKeyword: Keyword<KeywordKind.Type>, sourceName: Identifier, sourceTypeParameterClause: TranslationTypeParameterClause | undefined, rightArrowToken: Token<TokenKind.RightArrow>, translatedName: Identifier, translatedTypeParameterClause: TranslationTypeParameterClause | undefined, openBraceToken: Token<TokenKind.OpenBrace> | undefined, memberList: TypeMemberTranslationList | undefined, closeBraceToken: Token<TokenKind.CloseBrace> | undefined, endKeyword: EndKeyword | undefined, rangeWithTrivia: Range | undefined);
 }
 export declare class FunctionTypeTranslationDeclaration extends BaseNode {
     readonly kind = NodeKind.FunctionTypeTranslationDeclaration;

package/package.json

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