@abaplint/core 2.101.19 → 2.101.21

package/build/src/abap/5_syntax/_builtin.js

@@ -1105,7 +1105,7 @@ BuiltIn.methods = [
         },
         optional: {
             "case": new basic_1.CharacterType(1),
-            "sep": basic_1.IntegerType.get(),
+            "sep": new basic_1.CLikeType(),
             "min": basic_1.IntegerType.get(),
         },
         return: basic_1.StringType.get(),

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -1062,7 +1062,7 @@ ${indentation}CATCH ${className} INTO ${targetName}.`;
         bar->if_t100_dyn_msg~msgv4 = 'abc'.
         RAISE EXCEPTION bar.
         */
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (!(node.get() instanceof Statements.Raise)) {
             return undefined;
         }
@@ -1086,20 +1086,45 @@ ${indentation}CATCH ${className} INTO ${targetName}.`;
             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)) + "'";
+            if (s.findDirectExpression(Expressions.MessageClass)) {
+                id = "'" + ((_b = (_a = s.findDirectExpression(Expressions.MessageClass)) === null || _a === void 0 ? void 0 : _a.concatTokens()) === null || _b === void 0 ? void 0 : _b.toUpperCase()) + "'";
+            }
+            else {
+                id = (_c = s.findExpressionAfterToken("ID")) === null || _c === void 0 ? void 0 : _c.concatTokens();
+            }
+            if (s.findDirectExpression(Expressions.MessageTypeAndNumber)) {
+                number = "'" + ((_d = s.findDirectExpression(Expressions.MessageTypeAndNumber)) === null || _d === void 0 ? void 0 : _d.concatTokens().substring(1)) + "'";
+            }
+            else {
+                number = (_e = s.findExpressionAfterToken("NUMBER")) === null || _e === void 0 ? void 0 : _e.concatTokens();
+            }
             startToken = node.getFirstToken();
         }
-        const className = ((_c = node.findDirectExpression(Expressions.ClassName)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "ERROR";
+        const withs = ((_f = node.findDirectExpression(Expressions.RaiseWith)) === null || _f === void 0 ? void 0 : _f.findDirectExpressions(Expressions.Source)) || [];
+        const className = ((_g = node.findDirectExpression(Expressions.ClassName)) === null || _g === void 0 ? void 0 : _g.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}.`;
+        let abap = `DATA ${uniqueName1} LIKE if_t100_message=>t100key.
+${indentation}${uniqueName1}-msgid = ${id}.
+${indentation}${uniqueName1}-msgno = ${number}.\n`;
+        if (withs.length > 0) {
+            abap += `${indentation}${uniqueName1}-attr1 = 'IF_T100_DYN_MSG~MSGV1'.
+${indentation}${uniqueName1}-attr2 = 'IF_T100_DYN_MSG~MSGV2'.
+${indentation}${uniqueName1}-attr3 = 'IF_T100_DYN_MSG~MSGV3'.
+${indentation}${uniqueName1}-attr4 = 'IF_T100_DYN_MSG~MSGV4'.\n`;
+        }
+        abap += `${indentation}DATA ${uniqueName2} TYPE REF TO ${className}.
+${indentation}CREATE OBJECT ${uniqueName2} EXPORTING textid = ${uniqueName1}.\n`;
+        if (withs.length > 0) {
+            abap += `${indentation}${uniqueName2}->if_t100_dyn_msg~msgty = 'E'.\n`;
+        }
+        let count = 1;
+        for (const w of withs) {
+            abap += `${indentation}${uniqueName2}->if_t100_dyn_msg~msgv${count} = ${w.concatTokens()}.\n`;
+            count++;
+        }
+        abap += `${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);
     }
@@ -1569,50 +1594,36 @@ ${indentation}${uniqueName}`;
     }
     // must be very simple string templates, like "|{ ls_line-no ALPHA = IN }|"
     stringTemplateAlpha(low, high, lowFile, highSyntax) {
-        var _a, _b, _c;
+        var _a, _b;
         if (!(low.get() instanceof _statement_1.Unknown)) {
             return undefined;
         }
         else if (!(high.get() instanceof Statements.Move)) {
             return undefined;
         }
-        const topSource = high.findDirectExpression(Expressions.Source);
-        if (topSource === undefined || topSource.getChildren().length !== 1) {
-            return undefined;
-        }
-        let top = true;
-        let child = topSource.getFirstChild();
-        if (!(child.get() instanceof Expressions.StringTemplate)) {
-            child = child.findFirstExpression(Expressions.StringTemplate);
-            top = false;
-        }
-        if (child === undefined || !(child.get() instanceof Expressions.StringTemplate)) {
-            return undefined;
-        }
-        const templateTokens = child.getChildren();
-        if (templateTokens.length !== 3
-            || templateTokens[0].getFirstToken().getStr() !== "|{"
-            || templateTokens[2].getFirstToken().getStr() !== "}|") {
-            return undefined;
-        }
-        const templateSource = child.findDirectExpression(Expressions.StringTemplateSource);
-        const formatting = (_a = templateSource === null || templateSource === void 0 ? void 0 : templateSource.findDirectExpression(Expressions.StringTemplateFormatting)) === null || _a === void 0 ? void 0 : _a.concatTokens();
-        let functionName = "";
-        switch (formatting) {
-            case "ALPHA = IN":
-                functionName = "CONVERSION_EXIT_ALPHA_INPUT";
-                break;
-            case "ALPHA = OUT":
-                functionName = "CONVERSION_EXIT_ALPHA_OUTPUT";
-                break;
-            default:
+        for (const child of high.findAllExpressionsRecursive(Expressions.StringTemplate)) {
+            const templateTokens = child.getChildren();
+            if (templateTokens.length !== 3
+                || templateTokens[0].getFirstToken().getStr() !== "|{"
+                || templateTokens[2].getFirstToken().getStr() !== "}|") {
                 return undefined;
-        }
-        const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
-        const source = (_b = templateSource === null || templateSource === void 0 ? void 0 : templateSource.findDirectExpression(Expressions.Source)) === null || _b === void 0 ? void 0 : _b.concatTokens();
-        const topTarget = (_c = high.findDirectExpression(Expressions.Target)) === null || _c === void 0 ? void 0 : _c.concatTokens();
-        const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
-        if (top === false) {
+            }
+            const templateSource = child.findDirectExpression(Expressions.StringTemplateSource);
+            const formatting = (_a = templateSource === null || templateSource === void 0 ? void 0 : templateSource.findDirectExpression(Expressions.StringTemplateFormatting)) === null || _a === void 0 ? void 0 : _a.concatTokens();
+            let functionName = "";
+            switch (formatting) {
+                case "ALPHA = IN":
+                    functionName = "CONVERSION_EXIT_ALPHA_INPUT";
+                    break;
+                case "ALPHA = OUT":
+                    functionName = "CONVERSION_EXIT_ALPHA_OUTPUT";
+                    break;
+                default:
+                    return undefined;
+            }
+            const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+            const source = (_b = templateSource === null || templateSource === void 0 ? void 0 : templateSource.findDirectExpression(Expressions.Source)) === null || _b === void 0 ? void 0 : _b.concatTokens();
+            const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const code = `DATA ${uniqueName} TYPE string.
 ${indentation}CALL FUNCTION '${functionName}'
 ${indentation}  EXPORTING
@@ -1624,15 +1635,7 @@ ${indentation}    output = ${uniqueName}.\n`;
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
             return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport ALPHA", this.getMetadata().key, this.conf.severity, fix);
         }
-        else {
-            const code = `CALL FUNCTION '${functionName}'
-${indentation}  EXPORTING
-${indentation}    input  = ${source}
-${indentation}  IMPORTING
-${indentation}    output = ${topTarget}.`;
-            const fix = edit_helper_1.EditHelper.replaceRange(lowFile, high.getFirstToken().getStart(), high.getLastToken().getEnd(), code);
-            return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport ALPHA", this.getMetadata().key, this.conf.severity, fix);
-        }
+        return undefined;
     }
     outlineLoopInput(low, high, lowFile, highSyntax) {
         if (!(low.get() instanceof _statement_1.Unknown)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.101.19",
+    "version": "2.101.21",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,14 +50,14 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.35.3",
+        "@microsoft/api-extractor": "^7.35.4",
         "@types/chai": "^4.3.5",
         "@types/mocha": "^10.0.1",
         "@types/node": "^20.3.1",
         "chai": "^4.3.7",
-        "eslint": "^8.42.0",
+        "eslint": "^8.43.0",
         "mocha": "^10.2.0",
-        "c8": "^7.14.0",
+        "c8": "^8.0.0",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^1.2.0",
         "typescript": "^5.1.3"