@artel/artc 0.6.25296 → 0.6.25297

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-ZTJ2IUQN.js";
-import "./chunk-CLTCG3EC.js";
+} from "./chunk-B3ILQ5YL.js";
+import "./chunk-BRNC4VYQ.js";
 import {
   __async
-} from "./chunk-MPZ5LBXG.js";
+} from "./chunk-DUXHWL3M.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "../chunk-CLTCG3EC.js";
+} from "../chunk-BRNC4VYQ.js";
 import {
   AccessKind,
   AccessedFunctionParameter,
@@ -347,7 +347,7 @@ import {
   withoutQuotes,
   withoutTemplateQuotes,
   yieldTask
-} from "../chunk-MPZ5LBXG.js";
+} from "../chunk-DUXHWL3M.js";
 export {
   AccessKind,
   AccessedFunctionParameter,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-ZTJ2IUQN.js";
-import "../chunk-CLTCG3EC.js";
-import "../chunk-MPZ5LBXG.js";
+} from "../chunk-B3ILQ5YL.js";
+import "../chunk-BRNC4VYQ.js";
+import "../chunk-DUXHWL3M.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

@@ -183,7 +183,7 @@ import {
   unwrapParenthesizedExpressions,
   visitChildren,
   yieldTask
-} from "../chunk-MPZ5LBXG.js";
+} from "../chunk-DUXHWL3M.js";
 
 // source/services/CustomRequests.ts
 import * as ls from "vscode-languageserver";
@@ -3577,13 +3577,6 @@ var CompletionService = class {
       const standardTypes = this.analyzer.getLocalizedStandardTypes(role.errorStatement.locale);
       return { targetTypes: [standardTypes.error, standardTypes.text], targetSignaturesParameters: void 0 };
     }
-    if (role.kind === "function-block-expression") {
-      const targetType = semanticContext.getContainingSubprogram()?.getReturnType();
-      if (targetType !== void 0 && !targetType.isNullType) {
-        return { targetTypes: [targetType], targetSignaturesParameters: void 0 };
-      }
-      return { targetTypes: void 0, targetSignaturesParameters: void 0 };
-    }
     if (role.kind === "other") {
       if (role.expressionForTargetType !== void 0) {
         const targetType = this.analyzer.getTargetTypeOfExpression(role.expressionForTargetType);
@@ -5029,12 +5022,6 @@ var ExpressionRole_errorValue = class {
     this.kind = "error-value";
   }
 };
-var ExpressionRole_functionBlockExpression = class {
-  constructor(functionBlock) {
-    this.functionBlock = functionBlock;
-    this.kind = "function-block-expression";
-  }
-};
 var ExpressionRole_other = class {
   constructor(expressionForTargetType) {
     this.expressionForTargetType = expressionForTargetType;
@@ -5158,18 +5145,10 @@ var SyntaxContextFactory = class {
       return { isExpressionContext: { expressionRole: new ExpressionRole_other(void 0) }, isStatementContext: true };
     }
     if (tokenOrKeyword.isToken(46 /* OpenBrace */) && tokenOrKeyword.parent.kind === 98 /* FunctionBlock */) {
-      const block = tokenOrKeyword.parent;
-      if (block.statementList.elements.length === 0) {
-        return {
-          isExpressionContext: { expressionRole: new ExpressionRole_functionBlockExpression(block) },
-          isStatementContext: true
-        };
-      } else {
-        return {
-          isExpressionContext: { expressionRole: new ExpressionRole_other(void 0) },
-          isStatementContext: true
-        };
-      }
+      return {
+        isExpressionContext: { expressionRole: new ExpressionRole_other(void 0) },
+        isStatementContext: true
+      };
     }
     if (tokenOrKeyword.isToken(58 /* Semicolon */) && tokenOrKeyword.parent.kind === 96 /* StatementList */) {
       return { isExpressionContext: { expressionRole: new ExpressionRole_other(void 0) }, isStatementContext: true };
@@ -9570,8 +9549,8 @@ var CompilationController = class extends SxObject2 {
         provideConfiguration: configurationProvider,
         userStandardPackagesUri: this.config.standardPackagesUri,
         builtInStandardPackagesUri: this.config.builtInStandardPackagesUri,
-        enableLogging: this.previousCompilationLoadResult === void 0,
         // Включаем логирование только при первой загрузке.
+        enableLogging: this.config.enableLogging === true && this.previousCompilationLoadResult === void 0,
         additionalPackageContents: this.config.additionalPackageContents
       };
       const currentTransaction = Transaction.current;
@@ -11441,7 +11420,8 @@ var _Workspace = class _Workspace extends SxObject6 {
           standardPackagesUri: config.standardPackagesUri,
           showErrorMessage: config.showErrorMessage,
           builtInStandardPackagesUri: config.builtInStandardPackagesUri,
-          additionalPackageContents: config.additionalPackageContents
+          additionalPackageContents: config.additionalPackageContents,
+          enableLogging: config.enableLogging ?? false
         };
         const workspace = new _Workspace(configInternal);
         return workspace;
@@ -11626,7 +11606,8 @@ var _Workspace = class _Workspace extends SxObject6 {
       showErrorMessage: this.config.showErrorMessage,
       builtInStandardPackagesUri: this.config.builtInStandardPackagesUri,
       additionalPackageContents: this.config.additionalPackageContents,
-      tsInteropInputsCache: this.tsInteropInputsCache
+      tsInteropInputsCache: this.tsInteropInputsCache,
+      enableLogging: this.config.enableLogging
     };
     return new CompilationController(config);
   }
@@ -13329,7 +13310,8 @@ var _LanguageServer = class _LanguageServer {
           this.connection.window.showErrorMessage(message);
         }),
         builtInStandardPackagesUri,
-        additionalPackageContents: this.config.additionalPackageContents
+        additionalPackageContents: this.config.additionalPackageContents,
+        enableLogging: params.initializationOptions?.enableLogging
       };
       this.workspace = yield runTransactional2(() => Workspace.create(config));
       this.workspace.addWorkspaceFolders(workspaceFolderUris);

package/build/{chunk-ZTJ2IUQN.js → chunk-B3ILQ5YL.js}

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "./chunk-CLTCG3EC.js";
+} from "./chunk-BRNC4VYQ.js";
 import {
   ArtelVersion,
   Cached,
@@ -15,7 +15,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-MPZ5LBXG.js";
+} from "./chunk-DUXHWL3M.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";

package/build/{chunk-CLTCG3EC.js → chunk-BRNC4VYQ.js}

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

package/build/{chunk-MPZ5LBXG.js → chunk-DUXHWL3M.js}

@@ -764,7 +764,7 @@ var UniqueWithComparatorQuery = class extends Query {
 };
 
 // source/common/Constants.ts
-var ArtelVersion = true ? "0.6.25296" : "";
+var ArtelVersion = true ? "0.6.25297" : "";
 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");
@@ -6975,8 +6975,8 @@ var russianKeywords = new Lazy(() => [
   { keyword: "\u0441\u043E\u0437\u0434\u0430\u043D\u0438\u0435", kind: 32 /* Creation */, flags: 12290 /* SingularNeuNoun */, dialects: [0 /* ArtelA */] },
   { keyword: "\u0441\u0441\u044B\u043B\u043A\u0430", kind: 55 /* Reference */, flags: 0 /* None */, dialects: [0 /* ArtelA */] },
   { keyword: "\u0442\u0438\u043F", kind: 17 /* Type */, flags: 9218 /* SingularMasNoun */, dialects: [0 /* ArtelA */, 1 /* ArtelM */] },
-  { keyword: "\u0443\u043D\u0438\u0447\u0442\u043E\u0436\u0438\u0442\u044C", kind: 47 /* Dispose */, flags: 0 /* None */, dialects: [0 /* ArtelA */] },
-  { keyword: "\u0443\u043D\u0438\u0447\u0442\u043E\u0436\u0435\u043D\u0438\u0435", kind: 48 /* Destruction */, flags: 12290 /* SingularNeuNoun */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0440\u0430\u0437\u0440\u0443\u0448\u0438\u0442\u044C", kind: 47 /* Dispose */, flags: 0 /* None */, dialects: [0 /* ArtelA */] },
+  { keyword: "\u0440\u0430\u0437\u0440\u0443\u0448\u0435\u043D\u0438\u0435", kind: 48 /* Destruction */, flags: 12290 /* SingularNeuNoun */, dialects: [0 /* ArtelA */] },
   { keyword: "\u0443\u0441\u043B", kind: 31 /* Cond */, flags: 0 /* None */, dialects: [1 /* ArtelM */] },
   { keyword: "\u0443\u0441\u043B\u043E\u0432\u043D\u043E", kind: 31 /* Cond */, flags: 0 /* None */, dialects: [0 /* ArtelA */] },
   { keyword: "\u0444\u0443\u043D\u043A\u0446\u0438\u044F", kind: 13 /* Function */, flags: 10242 /* SingularFemNoun */, dialects: [0 /* ArtelA */] },
@@ -9769,7 +9769,7 @@ var StructuredType2 = class {
     return this.entity.isAbstract();
   }
   equals(other, considerLocale = false) {
-    return this === other || other.kind === "structured" && (considerLocale ? this.entity === other.entity : this.entity.getOriginalEntity() === other.entity.getOriginalEntity()) && this.substitutions.equals(other.getSubstitutions());
+    return this === other || other.kind === "structured" && (considerLocale ? this.entity === other.entity : this.entity.getOriginalEntity() === other.entity.getOriginalEntity()) && this.substitutions.equals(other.getSubstitutions(), considerLocale);
   }
   getEntity() {
     return this.entity;
@@ -10355,7 +10355,7 @@ var UnresolvedType2 = class {
   get debuggerDisplay() {
     return this.toString();
   }
-  equals(other) {
+  equals(other, _considerLocale = false) {
     return other.kind === "unresolved";
   }
   getSubstitutions() {
@@ -33491,9 +33491,11 @@ var Resolver6 = class {
       }
     }
     const calleeType = this.analyzer.type.ofExpression(callee);
-    const essentialCalleeType = unaliasType(this.analyzer.excludeNullFromType(calleeType));
+    const calleeTypeWithoutNull = this.analyzer.excludeNullFromType(calleeType);
+    const essentialCalleeType = unaliasType(calleeTypeWithoutNull);
     if (essentialCalleeType.kind === "function") {
-      return this.resolveObjectFunctionCallExpression(essentialCalleeType);
+      const isOriginalCalleeTypeNullable = !calleeTypeWithoutNull.equals(calleeType);
+      return this.resolveObjectFunctionCallExpression(essentialCalleeType, isOriginalCalleeTypeNullable);
     }
     if (calleeType.kind !== "unresolved" && this.diagnostics !== void 0) {
       let nodeForDiagnostic = callee;
@@ -33634,7 +33636,13 @@ var Resolver6 = class {
       resolved.singleNotSuitableSubstitutedCandidate
     );
   }
-  resolveObjectFunctionCallExpression(type) {
+  resolveObjectFunctionCallExpression(type, isOriginalCalleeTypeNullable) {
+    if (isOriginalCalleeTypeNullable) {
+      this.diagnostics?.addDiagnostic(this.analyzer.createDiagnostic(
+        2102 /* ExpressionCanBeNull */,
+        this.node.expression
+      ));
+    }
     const signature = new FunctionTypeMatcherSignature2(this.analyzer, type);
     const args = this.node.argumentList.arguments.map((a) => new SourceArgument(this.analyzer, a)).toArray();
     const matcher_ = new ArgumentToParameterMatcher(this.analyzer, signature, args, this.diagnostics, this.node.argumentList);
@@ -33898,7 +33906,14 @@ var Resolver7 = class {
   }
   resolve() {
     let receiverType = this.analyzer.type.ofExpression(this.node.expression);
-    receiverType = this.analyzer.excludeNullFromType(receiverType);
+    const receiverTypeWithoutNull = this.analyzer.excludeNullFromType(receiverType);
+    if (!receiverTypeWithoutNull.equals(receiverType)) {
+      this.diagnostics?.addDiagnostic(this.analyzer.createDiagnostic(
+        2102 /* ExpressionCanBeNull */,
+        this.node.expression
+      ));
+      receiverType = receiverTypeWithoutNull;
+    }
     if (receiverType.kind === "unresolved") {
       return new Meaning_unresolved4();
     }
@@ -34421,7 +34436,14 @@ var Resolver8 = class {
   }
   resolve() {
     let receiverType = this.analyzer.type.ofExpression(this.node.expression);
-    receiverType = this.analyzer.excludeNullFromType(receiverType);
+    const receiverTypeWithoutNull = this.analyzer.excludeNullFromType(receiverType);
+    if (!receiverTypeWithoutNull.equals(receiverType)) {
+      this.diagnostics?.addDiagnostic(this.analyzer.createDiagnostic(
+        2102 /* ExpressionCanBeNull */,
+        this.node.expression
+      ));
+      receiverType = receiverTypeWithoutNull;
+    }
     if (receiverType.kind === "unresolved") {
       return new Meaning_unresolved6();
     }
@@ -34783,7 +34805,14 @@ var FirstStageResolver3 = class {
     }
   }
   resolveInstanceMemberAccessMeaning(type) {
-    type = this.analyzer.excludeNullFromType(type);
+    const typeWithoutNull = this.analyzer.excludeNullFromType(type);
+    if (!typeWithoutNull.equals(type)) {
+      this.diagnostics?.addDiagnostic(this.analyzer.createDiagnostic(
+        2102 /* ExpressionCanBeNull */,
+        this.receiver
+      ));
+      type = typeWithoutNull;
+    }
     if (type.kind === "unresolved") {
       return new Meaning_unresolved7();
     }
@@ -50499,10 +50528,6 @@ var SourceFileAnalyzer = class {
   checkDereferenceExpression(node) {
     const meaning = this.analyzer.resolveDereferenceExpression(node);
     if (meaning.kind === "resolved") {
-      const receiverType = this.analyzer.type.ofExpression(node.expression);
-      if (this.analyzer.canTypeBeNull(receiverType)) {
-        this.addDiagnostic(this.analyzer.createDiagnostic(2102 /* ExpressionCanBeNull */, node.expression));
-      }
       const entity = meaning.operator.getEntity();
       if (this.isReceiverBaseAutoVariableAccess(node.expression) && TypeMemberEntity.isAbstract(entity)) {
         this.addDiagnostic(this.analyzer.createDiagnostic(
@@ -50515,10 +50540,6 @@ var SourceFileAnalyzer = class {
   checkIndexedAccessExpression(node) {
     const meaning = this.analyzer.resolveIndexedAccessExpression(node);
     if (meaning.kind !== "unresolved") {
-      const receiverType = this.analyzer.type.ofExpression(node.expression);
-      if (this.analyzer.canTypeBeNull(receiverType)) {
-        this.addDiagnostic(this.analyzer.createDiagnostic(2102 /* ExpressionCanBeNull */, node.expression));
-      }
       const entity = meaning.singleIndexer?.getEntity();
       if (entity !== void 0 && this.isReceiverBaseAutoVariableAccess(node.expression) && TypeMemberEntity.isAbstract(entity)) {
         const range = new Range(
@@ -50552,12 +50573,6 @@ var SourceFileAnalyzer = class {
         ));
       }
     }
-    if (meaning.kind === "object-function-call") {
-      const calleeType = this.analyzer.type.ofExpression(node.expression);
-      if (this.analyzer.canTypeBeNull(calleeType)) {
-        this.addDiagnostic(this.analyzer.createDiagnostic(2102 /* ExpressionCanBeNull */, node.expression));
-      }
-    }
   }
   addNotTranslatedTextsDiagnostics(translationPackage, diagnosticLocation) {
     const notTranslatedEntities = this.collectNotTranslatedTexts(translationPackage);
@@ -51248,12 +51263,6 @@ var SourceFileAnalyzer = class {
       default:
         Debug.never(meaning);
     }
-    if (meaning.kind === "instance-field-access" || meaning.kind === "instance-method-access" || meaning.kind === "operator-access") {
-      const receiverType = this.analyzer.type.ofExpression(node.expression);
-      if (this.analyzer.canTypeBeNull(receiverType)) {
-        this.addDiagnostic(this.analyzer.createDiagnostic(2102 /* ExpressionCanBeNull */, node.expression));
-      }
-    }
   }
   checkExpressionTypeIsAssignableToTargetType(node, targetType, diagnosticCode = 2032 /* Type0IsNotAssignableToType1 */) {
     if (targetType === void 0) {

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

@@ -127,6 +127,7 @@ export interface ArtelServerInitializationOptions {
     workspaceFoldersOverride?: ls.WorkspaceFolder[];
     localeOverride?: string;
     standardPackagesUri?: ls.URI;
+    enableLogging?: boolean;
 }
 export declare class ClientCancellationToken implements CancellationToken {
     private readonly token;

package/build/types/services/workspace/CompilationController.d.ts

@@ -65,6 +65,7 @@ export interface CompilationControllerConfig {
     readonly builtInStandardPackagesUri?: Uri;
     readonly additionalPackageContents?: readonly PackageContent[];
     readonly tsInteropInputsCache?: TsInteropInputsCache;
+    readonly enableLogging?: boolean;
 }
 export declare enum CompilationControllerState {
     Created = 0,

package/build/types/services/workspace/Workspace.d.ts

@@ -60,4 +60,5 @@ export interface WorkspaceConfig {
     readonly showErrorMessage?: (message: string) => Promise<void>;
     readonly builtInStandardPackagesUri?: Uri;
     readonly additionalPackageContents?: readonly PackageContent[];
+    readonly enableLogging?: boolean;
 }

package/build/types/types/UnresolvedType.d.ts

@@ -8,7 +8,7 @@ export declare class UnresolvedType implements IType {
     get isNullType(): boolean;
     get debuggerDisplay(): string;
     constructor(analyzer: Analyzer);
-    equals(other: Type): boolean;
+    equals(other: Type, _considerLocale?: boolean): boolean;
     getSubstitutions(): Substitutions;
     applySubstitutions(_substitutions: Substitutions): Type;
     getEntity(): TypeEntity | undefined;

package/package.json

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