@abaplint/core 2.83.15 → 2.83.19

package/build/abaplint.d.ts

@@ -1857,6 +1857,7 @@ declare namespace Expressions {
         MethodDefImporting,
         MethodDefRaising,
         MethodDefReturning,
+        MethodDefExceptions,
         MethodName,
         MethodParamName,
         MethodParamOptional,
@@ -2777,6 +2778,7 @@ export declare interface IMethodDefinition extends Identifier {
     isEventHandler(): boolean;
     getParameters(): IMethodParameters;
     getRaising(): readonly string[];
+    getExceptions(): readonly string[];
 }
 
 declare interface IMethodDefinitions {
@@ -3587,6 +3589,10 @@ declare class MethodDefChanging extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class MethodDefExceptions extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class MethodDefExporting extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -3603,6 +3609,7 @@ declare class MethodDefinition extends Identifier implements IMethodDefinition {
     private readonly abstract;
     private readonly static;
     private readonly raising;
+    private readonly exceptions;
     constructor(node: StatementNode, visibility: Visibility, filename: string, scope: CurrentScope);
     getVisibility(): Visibility;
     isRedefinition(): boolean;
@@ -3611,6 +3618,7 @@ declare class MethodDefinition extends Identifier implements IMethodDefinition {
     isEventHandler(): boolean;
     getParameters(): MethodParameters_2;
     getRaising(): readonly string[];
+    getExceptions(): readonly string[];
 }
 
 declare class MethodDefinitions implements IMethodDefinitions {

package/build/src/abap/2_statements/expressions/index.js

@@ -105,6 +105,7 @@ __exportStar(require("./method_def_exporting"), exports);
 __exportStar(require("./method_def_importing"), exports);
 __exportStar(require("./method_def_raising"), exports);
 __exportStar(require("./method_def_returning"), exports);
+__exportStar(require("./method_def_exceptions"), exports);
 __exportStar(require("./method_name"), exports);
 __exportStar(require("./method_param_name"), exports);
 __exportStar(require("./method_param_optional"), exports);

package/build/src/abap/2_statements/expressions/method_def_exceptions.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MethodDefExceptions = void 0;
+const combi_1 = require("../combi");
+const _1 = require(".");
+class MethodDefExceptions extends combi_1.Expression {
+    getRunnable() {
+        const exceptions = (0, combi_1.seq)("EXCEPTIONS", (0, combi_1.plusPrio)(_1.NamespaceSimpleName));
+        return exceptions;
+    }
+}
+exports.MethodDefExceptions = MethodDefExceptions;
+//# sourceMappingURL=method_def_exceptions.js.map

package/build/src/abap/2_statements/statements/method_def.js

@@ -6,10 +6,9 @@ const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
 class MethodDef {
     getMatcher() {
-        const exceptions = (0, combi_1.seq)("EXCEPTIONS", (0, combi_1.plusPrio)(expressions_1.NamespaceSimpleName));
         const def = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.seq)("DEFAULT", (0, combi_1.altPrio)("FAIL", "IGNORE")));
-        const parameters = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("FINAL", def, expressions_1.Abstract)), (0, combi_1.optPrio)(expressions_1.MethodDefImporting), (0, combi_1.optPrio)(expressions_1.MethodDefExporting), (0, combi_1.optPrio)(expressions_1.MethodDefChanging), (0, combi_1.optPrio)(expressions_1.MethodDefReturning), (0, combi_1.optPrio)((0, combi_1.altPrio)(expressions_1.MethodDefRaising, exceptions)));
-        const testing = (0, combi_1.seq)((0, combi_1.optPrio)(expressions_1.Abstract), "FOR TESTING", (0, combi_1.optPrio)((0, combi_1.altPrio)(expressions_1.MethodDefRaising, exceptions)));
+        const parameters = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("FINAL", def, expressions_1.Abstract)), (0, combi_1.optPrio)(expressions_1.MethodDefImporting), (0, combi_1.optPrio)(expressions_1.MethodDefExporting), (0, combi_1.optPrio)(expressions_1.MethodDefChanging), (0, combi_1.optPrio)(expressions_1.MethodDefReturning), (0, combi_1.optPrio)((0, combi_1.altPrio)(expressions_1.MethodDefRaising, expressions_1.MethodDefExceptions)));
+        const testing = (0, combi_1.seq)((0, combi_1.optPrio)(expressions_1.Abstract), "FOR TESTING", (0, combi_1.optPrio)((0, combi_1.altPrio)(expressions_1.MethodDefRaising, expressions_1.MethodDefExceptions)));
         // todo, this is only from version something
         const tableFunction = (0, combi_1.seq)("FOR TABLE FUNCTION", (0, combi_1.regex)(/^\w+?$/));
         // todo, this is only from version something

package/build/src/abap/2_statements/statements/selectoption.js

@@ -9,7 +9,7 @@ class SelectOption {
         const sourc = (0, combi_1.alt)(expressions_1.Constant, expressions_1.FieldChain);
         const to = (0, combi_1.seq)("TO", sourc);
         const def = (0, combi_1.seq)("DEFAULT", sourc, (0, combi_1.opt)(to));
-        const option = (0, combi_1.seq)("OPTION", expressions_1.Field);
+        const option = (0, combi_1.seq)("OPTION", (0, combi_1.alt)("CP", expressions_1.Field));
         const sign = (0, combi_1.seq)("SIGN", expressions_1.Field);
         const memory = (0, combi_1.seq)("MEMORY ID", expressions_1.SimpleSource1);
         const match = (0, combi_1.seq)("MATCHCODE OBJECT", expressions_1.Field);

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

@@ -9,7 +9,7 @@ const _reference_1 = require("../5_syntax/_reference");
 class MethodDefinition extends _identifier_1.Identifier {
     // todo: final flag
     constructor(node, visibility, filename, scope) {
-        var _a;
+        var _a, _b;
         if (!(node.get() instanceof statements_1.MethodDef)) {
             throw new Error("MethodDefinition, expected MethodDef as part of input node");
         }
@@ -58,6 +58,12 @@ class MethodDefinition extends _identifier_1.Identifier {
                 scope.addReference(token, clas, _reference_1.ReferenceType.ObjectOrientedUnknownReference, filename, { ooName: name.toUpperCase(), ooType: "CLAS" });
             }
         }
+        this.exceptions = [];
+        for (const r of ((_b = node.findDirectExpression(Expressions.MethodDefExceptions)) === null || _b === void 0 ? void 0 : _b.findAllExpressions(Expressions.NamespaceSimpleName)) || []) {
+            const token = r.getFirstToken();
+            const name = token.getStr();
+            this.exceptions.push(name);
+        }
         this.visibility = visibility;
         this.parameters = new method_parameters_1.MethodParameters(node, this.filename, scope);
     }
@@ -82,6 +88,9 @@ class MethodDefinition extends _identifier_1.Identifier {
     getRaising() {
         return this.raising;
     }
+    getExceptions() {
+        return this.exceptions;
+    }
 }
 exports.MethodDefinition = MethodDefinition;
 //# sourceMappingURL=method_definition.js.map

package/build/src/registry.js

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

package/build/src/rules/align_parameters.js

@@ -190,6 +190,18 @@ foo = VALUE #(
                     right: children[2],
                 });
             }
+            const ex = raise.findDirectExpression(Expressions.ParameterListExceptions);
+            for (const e of (ex === null || ex === void 0 ? void 0 : ex.getChildren()) || []) {
+                const children = e.getChildren();
+                if (children.length < 3) {
+                    continue; // unexpected
+                }
+                parameters.push({
+                    left: children[0],
+                    eq: children[1].getFirstToken().getStart(),
+                    right: children[2],
+                });
+            }
             if (parameters.length > 0) {
                 candidates.push({ parameters });
             }

package/build/src/rules/downport.js

@@ -55,6 +55,7 @@ Current rules:
 * SELECT/INSERT/MODIFY/DELETE/UPDATE "," in field list removed, "@" in source/targets removed
 * PARTIALLY IMPLEMENTED removed, it can be quick fixed via rule implement_methods
 * RAISE EXCEPTION ... MESSAGE
+* APPEND expression is outlined
 
 Only one transformation is applied to a statement at a time, so multiple steps might be required to do the full downport.`,
             tags: [_irule_1.RuleTag.Experimental, _irule_1.RuleTag.Downport, _irule_1.RuleTag.Quickfix],
@@ -223,6 +224,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.replaceAppendExpression(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         // todo, add more rules here
         return undefined;
     }
@@ -364,6 +369,28 @@ ${indentation}`);
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         return issue_1.Issue.atToken(lowFile, inlineData.getFirstToken(), "Outline SELECT @DATA", this.getMetadata().key, this.conf.severity, fix);
     }
+    replaceAppendExpression(high, lowFile, highSyntax) {
+        if (!(high.get() instanceof Statements.Append)) {
+            return undefined;
+        }
+        const children = high.getChildren();
+        if (children[1].get() instanceof Expressions.Source) {
+            const source = children[1];
+            const target = high.findDirectExpression(Expressions.Target);
+            if (target === undefined) {
+                return undefined;
+            }
+            const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+            const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+            const firstToken = high.getFirstToken();
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), `DATA ${uniqueName} LIKE LINE OF ${target === null || target === void 0 ? void 0 : target.concatTokens()}.
+${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
+            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, source.getFirstToken().getStart(), source.getLastToken().getEnd(), uniqueName);
+            const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+            return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Outline APPEND source expression", this.getMetadata().key, this.conf.severity, fix);
+        }
+        return undefined;
+    }
     replaceTableExpression(node, lowFile, highSyntax) {
         var _a;
         for (const fieldChain of node.findAllExpressionsRecursive(Expressions.FieldChain)) {

package/build/src/rules/use_class_based_exceptions.js

@@ -5,6 +5,7 @@ const _basic_rule_config_1 = require("./_basic_rule_config");
 const _abap_rule_1 = require("./_abap_rule");
 const _irule_1 = require("./_irule");
 const Statements = require("../abap/2_statements/statements");
+const Expressions = require("../abap/2_statements/expressions");
 const issue_1 = require("../issue");
 class UseClassBasedExceptionsConf extends _basic_rule_config_1.BasicRuleConfig {
 }
@@ -36,7 +37,7 @@ class UseClassBasedExceptions extends _abap_rule_1.ABAPRule {
         var _a;
         const issues = [];
         for (const s of ((_a = file.getStructure()) === null || _a === void 0 ? void 0 : _a.findAllStatements(Statements.MethodDef)) || []) {
-            if (s.findDirectTokenByText("EXCEPTIONS")) {
+            if (s.findDirectExpression(Expressions.MethodDefExceptions)) {
                 issues.push(issue_1.Issue.atStatement(file, s, this.getMessage(), this.getMetadata().key));
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.83.15",
+    "version": "2.83.19",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,9 +48,9 @@
         "@microsoft/api-extractor": "^7.19.3",
         "@types/chai": "^4.3.0",
         "@types/mocha": "^9.0.0",
-        "@types/node": "^17.0.5",
+        "@types/node": "^17.0.8",
         "chai": "^4.3.4",
-        "eslint": "^8.5.0",
+        "eslint": "^8.6.0",
         "mocha": "^9.1.3",
         "c8": "^7.11.0",
         "source-map-support": "^0.5.21",