@abaplint/core 2.91.15 → 2.91.16

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.16";
     }
     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],
         };
     }
@@ -63,6 +67,13 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
     }
     //////////////////
     walk(r, file) {
+        var _a, _b, _c, _d, _e, _f;
+        if (this.reg.getConfig().getVersion() !== version_1.Version.v702) {
+            if (r.findFirstExpression(Expressions.InlineData)) {
+                return undefined;
+            }
+        }
+        let previous = undefined;
         for (const c of r.getChildren()) {
             if (c instanceof nodes_1.StatementNode && c.get() instanceof _statement_1.Comment) {
                 continue;
@@ -79,8 +90,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 +149,7 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
                     return found;
                 }
             }
+            previous = c;
         }
         return undefined;
     }

package/package.json

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