@abaplint/core 2.115.17 → 2.115.18

package/build/abaplint.d.ts

@@ -4430,7 +4430,9 @@ export declare class MemoryFile extends AbstractFile {
 declare class Message {
     private readonly number;
     private readonly message;
-    constructor(number: string, message: string);
+    private readonly className;
+    constructor(number: string, message: string, className: string);
+    getMessageClass(): string;
     getNumber(): string;
     getMessage(): string;
     getPlaceholderCount(): number;
@@ -4441,13 +4443,14 @@ declare class Message_2 implements IStatement {
 }
 
 declare class MessageClass extends AbstractObject {
-    private parsedMessages;
+    private xml;
     getType(): string;
     getDescription(): string | undefined;
     getAllowedNaming(): {
         maxLength: number;
         allowNamespace: boolean;
     };
+    getParsed(): parsedMessageClass | undefined;
     setDirty(): void;
     getMessages(): readonly Message[];
     getByNumber(num: string): Message | undefined;
@@ -5118,6 +5121,7 @@ declare namespace Objects {
         KnowledgeTransferDocument,
         LockObject,
         MaintenanceAndTransportObject,
+        parsedMessageClass,
         MessageClass,
         MessagingChannel,
         MIMEObject,
@@ -5359,6 +5363,12 @@ declare type ParsedDataDefinition = {
     tree: ExpressionNode | undefined;
 };
 
+declare type parsedMessageClass = {
+    topName: string | undefined;
+    description: string | undefined;
+    parsedMessages: Message[] | undefined;
+};
+
 declare type ParsedMetadataExtension = {
     tree: ExpressionNode | undefined;
 };

package/build/src/abap/5_syntax/statements/assign.js

@@ -10,8 +10,9 @@ const _type_utils_1 = require("../_type_utils");
 const _syntax_input_1 = require("../_syntax_input");
 class Assign {
     runSyntax(node, input) {
-        var _a, _b;
+        var _a;
         const assignSource = node.findDirectExpression(Expressions.AssignSource);
+        const isComponent = ((_a = assignSource === null || assignSource === void 0 ? void 0 : assignSource.getFirstChild()) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase()) === "COMPONENT";
         const sources = (assignSource === null || assignSource === void 0 ? void 0 : assignSource.findDirectExpressionsMulti([Expressions.Source, Expressions.SimpleSource3])) || [];
         const theSource = sources[sources.length - 1];
         let sourceType = undefined;
@@ -29,10 +30,10 @@ class Assign {
             sourceType = basic_1.VoidType.get("Dynamic");
         }
         else {
-            sourceType = source_1.Source.runSyntax(theSource, input, undefined, false, true);
+            sourceType = source_1.Source.runSyntax(theSource, input, undefined, false, isComponent === false);
         }
         if ((assignSource === null || assignSource === void 0 ? void 0 : assignSource.getChildren().length) === 5
-            && ((_a = assignSource === null || assignSource === void 0 ? void 0 : assignSource.getFirstChild()) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase()) === "COMPONENT") {
+            && isComponent) {
             const componentSource = sources[sources.length - 2];
             const componentType = source_1.Source.runSyntax(componentSource, input);
             if (new _type_utils_1.TypeUtils(input.scope).isAssignable(componentType, new basic_1.CharacterType(30)) === false) {
@@ -49,7 +50,7 @@ class Assign {
         }
         const target = node.findDirectExpression(Expressions.FSTarget);
         if (target) {
-            if (((_b = assignSource === null || assignSource === void 0 ? void 0 : assignSource.getFirstChild()) === null || _b === void 0 ? void 0 : _b.concatTokens().toUpperCase()) === "COMPONENT") {
+            if (isComponent) {
                 fstarget_1.FSTarget.runSyntax(target, input, basic_1.AnyType.get());
             }
             else {

package/build/src/abap/types/message.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Message = void 0;
 class Message {
-    constructor(number, message) {
+    constructor(number, message, className) {
         this.number = number;
         if (this.number === undefined) {
             this.number = "";
@@ -11,6 +11,13 @@ class Message {
         if (this.message === undefined) {
             this.message = "";
         }
+        this.className = className;
+        if (this.className === undefined) {
+            this.className = "";
+        }
+    }
+    getMessageClass() {
+        return this.className;
     }
     getNumber() {
         return this.number;

package/build/src/objects/message_class.js

@@ -7,15 +7,15 @@ const xml_utils_1 = require("../xml_utils");
 class MessageClass extends _abstract_object_1.AbstractObject {
     constructor() {
         super(...arguments);
-        this.parsedMessages = undefined;
+        this.xml = undefined;
     }
     getType() {
         return "MSAG";
     }
     getDescription() {
+        var _a;
         this.parseXML();
-        // todo
-        return undefined;
+        return (_a = this.xml) === null || _a === void 0 ? void 0 : _a.description;
     }
     getAllowedNaming() {
         return {
@@ -23,13 +23,18 @@ class MessageClass extends _abstract_object_1.AbstractObject {
             allowNamespace: true,
         };
     }
+    getParsed() {
+        this.parseXML();
+        return this.xml;
+    }
     setDirty() {
-        this.parsedMessages = undefined;
+        this.xml = undefined;
         super.setDirty();
     }
     getMessages() {
+        var _a;
         this.parseXML();
-        const msg = this.parsedMessages;
+        const msg = (_a = this.xml) === null || _a === void 0 ? void 0 : _a.parsedMessages;
         return msg ? msg : [];
     }
     getByNumber(num) {
@@ -44,21 +49,27 @@ class MessageClass extends _abstract_object_1.AbstractObject {
     }
     /////////////////////////////////
     parseXML() {
-        var _a, _b;
-        if (this.parsedMessages !== undefined) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        if (this.xml !== undefined) {
             return;
         }
-        this.parsedMessages = [];
+        this.xml = {
+            topName: undefined,
+            description: undefined,
+            parsedMessages: [],
+        };
         const parsed = super.parseRaw2();
         if (parsed === undefined) {
             return;
         }
-        const t100 = (_b = (_a = parsed === null || parsed === void 0 ? void 0 : parsed.abapGit) === null || _a === void 0 ? void 0 : _a["asx:abap"]["asx:values"]) === null || _b === void 0 ? void 0 : _b.T100;
+        this.xml.topName = (_c = (_b = (_a = parsed === null || parsed === void 0 ? void 0 : parsed.abapGit) === null || _a === void 0 ? void 0 : _a["asx:abap"]["asx:values"]) === null || _b === void 0 ? void 0 : _b.T100A) === null || _c === void 0 ? void 0 : _c.ARBGB;
+        this.xml.description = (_f = (_e = (_d = parsed === null || parsed === void 0 ? void 0 : parsed.abapGit) === null || _d === void 0 ? void 0 : _d["asx:abap"]["asx:values"]) === null || _e === void 0 ? void 0 : _e.T100A) === null || _f === void 0 ? void 0 : _f.STEXT;
+        const t100 = (_h = (_g = parsed === null || parsed === void 0 ? void 0 : parsed.abapGit) === null || _g === void 0 ? void 0 : _g["asx:abap"]["asx:values"]) === null || _h === void 0 ? void 0 : _h.T100;
         if (t100 === undefined) {
             return;
         }
         for (const msg of (0, xml_utils_1.xmlToArray)(t100.T100)) {
-            this.parsedMessages.push(new message_1.Message(msg.MSGNR, (0, xml_utils_1.unescape)(msg.TEXT)));
+            this.xml.parsedMessages.push(new message_1.Message(msg.MSGNR, (0, xml_utils_1.unescape)(msg.TEXT), msg.ARBGB));
         }
     }
 }

package/build/src/registry.js

@@ -74,7 +74,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.115.17";
+        return "2.115.18";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/msag_consistency.js

@@ -38,6 +38,7 @@ class MSAGConsistency {
         return this;
     }
     run(obj) {
+        var _a, _b;
         const issues = [];
         if (!(obj instanceof objects_1.MessageClass)) {
             return [];
@@ -86,6 +87,18 @@ class MSAGConsistency {
                     }
                 }
             }
+            if (message.getMessageClass() !== obj.getName()) {
+                const text = `Message class "${message.getMessageClass()}" does not match filename "${obj.getName()}" for message ${message.getNumber()}`;
+                const position = new position_1.Position(1, 1);
+                const issue = issue_1.Issue.atPosition(obj.getFiles()[0], position, text, this.getMetadata().key, this.conf.severity);
+                issues.push(issue);
+            }
+        }
+        if (((_a = obj.getParsed()) === null || _a === void 0 ? void 0 : _a.topName) !== obj.getName()) {
+            const text = `Message class name "${(_b = obj.getParsed()) === null || _b === void 0 ? void 0 : _b.topName}" does not match filename "${obj.getName()}"`;
+            const position = new position_1.Position(1, 1);
+            const issue = issue_1.Issue.atPosition(obj.getFiles()[0], position, text, this.getMetadata().key, this.conf.severity);
+            issues.push(issue);
         }
         return issues;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.115.17",
+    "version": "2.115.18",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",