@abaplint/core 2.89.7 → 2.89.8

package/build/src/registry.js

@@ -68,7 +68,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.89.7";
+        return "2.89.8";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/downport.js

@@ -690,36 +690,46 @@ ${indentation}CATCH ${className} INTO ${targetName}.`;
         bar->if_t100_dyn_msg~msgv4 = 'abc'.
         RAISE EXCEPTION bar.
         */
-        var _a;
-        if (node.get() instanceof Statements.Raise) {
-            const startToken = node.findDirectTokenByText("ID");
-            if (startToken === undefined) {
-                return undefined;
-            }
+        var _a, _b, _c;
+        if (!(node.get() instanceof Statements.Raise)) {
+            return undefined;
+        }
+        let id = undefined;
+        let number = undefined;
+        let startToken = node.findDirectTokenByText("ID");
+        if (startToken) {
             const sources = node.findDirectExpressions(Expressions.Source);
-            const id = sources[0].concatTokens();
+            id = sources[0].concatTokens();
             const numberExpression = node.findExpressionAfterToken("NUMBER");
             if (numberExpression === undefined) {
                 throw "downport raiseException, could not find number";
             }
-            let number = numberExpression.concatTokens();
+            number = numberExpression.concatTokens();
             if (numberExpression.get() instanceof Expressions.MessageNumber) {
                 number = "'" + number + "'";
             }
-            const className = ((_a = node.findDirectExpression(Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "ERROR";
-            const uniqueName1 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
-            const uniqueName2 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
-            const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
-            const abap = `DATA ${uniqueName1} LIKE if_t100_message=>t100key.
-${indentation}${uniqueName1}-msgid = ${id}.
+        }
+        else {
+            const s = node.findDirectExpression(Expressions.MessageSource);
+            if (s === undefined) {
+                return undefined;
+            }
+            id = "'" + ((_a = s.findDirectExpression(Expressions.MessageClass)) === null || _a === void 0 ? void 0 : _a.concatTokens()) + "'";
+            number = "'" + ((_b = s.findDirectExpression(Expressions.MessageTypeAndNumber)) === null || _b === void 0 ? void 0 : _b.concatTokens().substring(1)) + "'";
+            startToken = node.getFirstToken();
+        }
+        const className = ((_c = node.findDirectExpression(Expressions.ClassName)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "ERROR";
+        const uniqueName1 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const uniqueName2 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+        const abap = `DATA ${uniqueName1} LIKE if_t100_message=>t100key.
+${indentation}${uniqueName1}-msgid = ${id === null || id === void 0 ? void 0 : id.toUpperCase()}.
 ${indentation}${uniqueName1}-msgno = ${number}.
 ${indentation}DATA ${uniqueName2} TYPE REF TO ${className}.
 ${indentation}CREATE OBJECT ${uniqueName2} EXPORTING textid = ${uniqueName1}.
 ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
-            const fix = edit_helper_1.EditHelper.replaceRange(lowFile, node.getStart(), node.getEnd(), abap);
-            return issue_1.Issue.atToken(lowFile, startToken, "Downport RAISE MESSAGE", this.getMetadata().key, this.conf.severity, fix);
-        }
-        return undefined;
+        const fix = edit_helper_1.EditHelper.replaceRange(lowFile, node.getStart(), node.getEnd(), abap);
+        return issue_1.Issue.atToken(lowFile, startToken, "Downport RAISE MESSAGE", this.getMetadata().key, this.conf.severity, fix);
     }
     emptyKey(node, lowFile) {
         for (let i of node.findAllExpressions(Expressions.TypeTable)) {

package/package.json

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