@abaplint/core 2.91.15 → 2.91.18

package/build/abaplint.d.ts

@@ -1475,6 +1475,7 @@ declare class Domain extends AbstractObject {
     private parsedType;
     getType(): string;
     getDescription(): string | undefined;
+    getConversionExit(): string | undefined;
     getAllowedNaming(): {
         maxLength: number;
         allowNamespace: boolean;

package/build/src/objects/domain.js

@@ -13,6 +13,10 @@ class Domain extends _abstract_object_1.AbstractObject {
         var _a;
         return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.description;
     }
+    getConversionExit() {
+        var _a;
+        return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.conversionExit;
+    }
     getAllowedNaming() {
         return {
             maxLength: 30,
@@ -62,6 +66,7 @@ class Domain extends _abstract_object_1.AbstractObject {
             description: dd01v === null || dd01v === void 0 ? void 0 : dd01v.DDTEXT,
             datatype: dd01v === null || dd01v === void 0 ? void 0 : dd01v.DATATYPE,
             length: dd01v === null || dd01v === void 0 ? void 0 : dd01v.LENG,
+            conversionExit: dd01v === null || dd01v === void 0 ? void 0 : dd01v.CONVEXIT,
             decimals: dd01v === null || dd01v === void 0 ? void 0 : dd01v.DECIMALS,
             values: values,
         };

package/build/src/registry.js

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

package/build/src/rules/definitions_top.js

@@ -4,12 +4,14 @@ exports.DefinitionsTop = exports.DefinitionsTopConf = void 0;
 const issue_1 = require("../issue");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
 const Statements = require("../abap/2_statements/statements");
+const Expressions = require("../abap/2_statements/expressions");
 const Structures = require("../abap/3_structures/structures");
 const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const _irule_1 = require("./_irule");
 const edit_helper_1 = require("../edit_helper");
 const nodes_1 = require("../abap/nodes");
+const version_1 = require("../version");
 class DefinitionsTopConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.DefinitionsTopConf = DefinitionsTopConf;
@@ -28,7 +30,9 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
             key: "definitions_top",
             title: "Place definitions in top of routine",
             shortDescription: `Checks that definitions are placed at the beginning of METHODs and FORMs.`,
-            extendedInformation: `https://docs.abapopenchecks.org/checks/17/`,
+            extendedInformation: `If the routine has inline definitions then no issues are reported
+
+https://docs.abapopenchecks.org/checks/17/`,
             tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Quickfix],
         };
     }
@@ -48,12 +52,21 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
         if (structure === undefined) {
             return [];
         }
+        const containsUnknown = file.getStatements().some(s => s.get() instanceof _statement_1.Unknown);
+        if (containsUnknown === true) {
+            return [];
+        }
         const routines = structure.findAllStructures(Structures.Form).concat(structure.findAllStructures(Structures.Method));
         for (const r of routines) {
             // one fix per routine
             this.fixed = false;
             this.mode = DEFINITION;
             this.moveTo = (_a = r.getFirstStatement()) === null || _a === void 0 ? void 0 : _a.getLastToken().getEnd();
+            if (this.reg.getConfig().getVersion() !== version_1.Version.v702) {
+                if (r.findFirstExpression(Expressions.InlineData)) {
+                    continue;
+                }
+            }
             const found = this.walk(r, file);
             if (found) {
                 issues.push(found);
@@ -63,6 +76,8 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
     }
     //////////////////
     walk(r, file) {
+        var _a, _b, _c, _d, _e, _f;
+        let previous = undefined;
         for (const c of r.getChildren()) {
             if (c instanceof nodes_1.StatementNode && c.get() instanceof _statement_1.Comment) {
                 continue;
@@ -79,8 +94,24 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
                     || c.get() instanceof Structures.Constants
                     || c.get() instanceof Structures.Statics)) {
                 if (this.mode === AFTER) {
+                    // These are chained structured statements
+                    let fix = undefined;
+                    if (((_b = (_a = c.getLastChild()) === null || _a === void 0 ? void 0 : _a.getLastChild()) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr()) === "."
+                        && !(previous instanceof nodes_1.StructureNode)
+                        && this.moveTo) {
+                        // this is not perfect, but will work for now
+                        const start = (_d = (_c = c.getFirstChild()) === null || _c === void 0 ? void 0 : _c.getFirstChild()) === null || _d === void 0 ? void 0 : _d.getFirstToken().getStart();
+                        const end = (_f = (_e = c.getLastChild()) === null || _e === void 0 ? void 0 : _e.getLastChild()) === null || _f === void 0 ? void 0 : _f.getLastToken().getEnd();
+                        if (start && end) {
+                            let concat = c.concatTokens();
+                            concat = concat.replace(/,/g, ".\n");
+                            const fix1 = edit_helper_1.EditHelper.deleteRange(file, start, end);
+                            const fix2 = edit_helper_1.EditHelper.insertAt(file, this.moveTo, "\n" + concat);
+                            fix = edit_helper_1.EditHelper.merge(fix1, fix2);
+                        }
+                    }
                     // no quick fixes for these, its difficult?
-                    return issue_1.Issue.atStatement(file, c.getFirstStatement(), this.getMessage(), this.getMetadata().key, this.conf.severity);
+                    return issue_1.Issue.atStatement(file, c.getFirstStatement(), this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
                 }
                 else {
                     this.moveTo = c.getLastToken().getEnd();
@@ -122,6 +153,7 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
                     return found;
                 }
             }
+            previous = c;
         }
         return undefined;
     }

package/build/src/rules/downport.js

@@ -1342,7 +1342,7 @@ ${indentation}    output = ${topTarget}.`;
         return undefined;
     }
     outlineValue(node, lowFile, highSyntax) {
-        var _a;
+        var _a, _b, _c;
         const allSources = node.findAllExpressionsRecursive(Expressions.Source);
         for (const s of allSources) {
             const firstToken = s.getFirstToken();
@@ -1421,6 +1421,36 @@ ${indentation}    output = ${topTarget}.`;
                 }
                 previous = b;
             }
+            if (body === "" && ((_b = valueBody === null || valueBody === void 0 ? void 0 : valueBody.getLastChild()) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr().toUpperCase()) === "OPTIONAL") {
+                const fieldChain = valueBody.findFirstExpression(Expressions.FieldChain);
+                const rowName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
+                let tableExpression = undefined;
+                let tabName = "";
+                let after = "";
+                for (const c of (fieldChain === null || fieldChain === void 0 ? void 0 : fieldChain.getChildren()) || []) {
+                    if (c.get() instanceof Expressions.TableExpression && c instanceof nodes_1.ExpressionNode) {
+                        tableExpression = c;
+                    }
+                    else if (tableExpression === undefined) {
+                        tabName += c.concatTokens();
+                    }
+                    else {
+                        after += c.concatTokens();
+                    }
+                }
+                let condition = "";
+                if ((tableExpression === null || tableExpression === void 0 ? void 0 : tableExpression.getChildren().length) === 3) {
+                    condition = "INDEX " + ((_c = tableExpression === null || tableExpression === void 0 ? void 0 : tableExpression.findDirectExpression(Expressions.Source)) === null || _c === void 0 ? void 0 : _c.concatTokens());
+                }
+                else {
+                    condition = "WITH KEY " + (tableExpression === null || tableExpression === void 0 ? void 0 : tableExpression.concatTokens().replace("[ ", "").replace(" ]", ""));
+                }
+                body +=
+                    indentation + `READ TABLE ${tabName} INTO DATA(${rowName}) ${condition}.\n` +
+                        indentation + `IF sy-subrc = 0.\n` +
+                        indentation + `  ${uniqueName} = ${rowName}${after}.\n` +
+                        indentation + `ENDIF.\n`;
+            }
             if (end !== "") {
                 indentation = indentation.substring(2);
                 body += indentation + end;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.91.15",
+    "version": "2.91.18",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,7 +48,7 @@
         "@microsoft/api-extractor": "^7.28.6",
         "@types/chai": "^4.3.1",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^18.6.1",
+        "@types/node": "^18.6.2",
         "chai": "^4.3.6",
         "eslint": "^8.20.0",
         "mocha": "^10.0.0",