@abaplint/cli 2.120.62 → 2.120.64

package/build/cli.js

@@ -27548,6 +27548,7 @@ class TypeUtils {
             || type instanceof basic_1.StringType
             || type instanceof basic_1.CLikeType
             || type instanceof basic_1.CSequenceType
+            || type instanceof basic_1.DataType
             || this.isCharLikeField(type);
     }
     isCharLike(type) {
@@ -28798,6 +28799,7 @@ class BasicTypes {
     }
     parseType(node, qualifiedName) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _l;
         const typeName = node.findFirstExpression(Expressions.TypeName);
         let text = (_a = node.findFirstExpression(Expressions.Type)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
         if (text === undefined) {
@@ -28948,6 +28950,9 @@ class BasicTypes {
                         length = parseInt(int.concatTokens(), 10);
                     }
                 }
+                else if (node.get() instanceof Statements.Parameter) {
+                    length = (_l = this.findParameterLength(node)) !== null && _l !== void 0 ? _l : length;
+                }
                 found = new Types.CharacterType(length, { qualifiedName: qualifiedName }); // fallback
                 if (this.isOccurs(node)) {
                     found = new Types.TableType(found, { withHeader: concat.includes(" WITH HEADER LINE"), keyType: Types.TableKeyType.default }, qualifiedName);
@@ -29317,11 +29322,43 @@ class BasicTypes {
         throw new Error("findValue, unexpected");
     }
     findDecimals(node) {
-        var _a, _b;
+        var _a, _b, _c;
         const dec = (_b = (_a = node.findDirectExpression(Expressions.Decimals)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Integer)) === null || _b === void 0 ? void 0 : _b.concatTokens();
         if (dec) {
             return parseInt(dec, 10);
         }
+        if (node.get() instanceof Statements.Parameter) {
+            // PARAMETERS spells it seq("DECIMALS", Source) instead of the Decimals expression
+            const source = (_c = this.findParameterAddition(node, "DECIMALS")) === null || _c === void 0 ? void 0 : _c.concatTokens();
+            if (source && /^\d+$/.test(source)) {
+                return parseInt(source, 10);
+            }
+        }
+        return undefined;
+    }
+    // PARAMETERS spells it seq("LENGTH", Constant) instead of the Length expression
+    findParameterLength(node) {
+        const constant = this.findParameterAddition(node, "LENGTH");
+        if (constant === undefined) {
+            return undefined;
+        }
+        const length = this.parseInt(constant.concatTokens());
+        return length === undefined || isNaN(length) ? undefined : length;
+    }
+    // finds the expression following a direct keyword token, "VISIBLE LENGTH" is not "LENGTH"
+    findParameterAddition(node, keyword) {
+        var _a;
+        const children = node.getChildren();
+        for (let i = 0; i < children.length - 1; i++) {
+            const child = children[i];
+            const next = children[i + 1];
+            if (child instanceof nodes_1.ExpressionNode
+                || child.getFirstToken().getStr().toUpperCase() !== keyword
+                || ((_a = children[i - 1]) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr().toUpperCase()) === "VISIBLE") {
+                continue;
+            }
+            return next instanceof nodes_1.ExpressionNode ? next : undefined;
+        }
         return undefined;
     }
     findLength(node) {
@@ -29342,6 +29379,9 @@ class BasicTypes {
             }
         }
         if (val === undefined) {
+            if (node.get() instanceof Statements.Parameter) {
+                return this.findParameterLength(node);
+            }
             return undefined;
         }
         const intExpr = val.findFirstExpression(Expressions.Integer);
@@ -56498,7 +56538,7 @@ class DDIC {
                     return new Types.PackedType(length, 0, { qualifiedName: qualifiedName });
                 }
                 else {
-                    return new Types.PackedType(8, 0, { qualifiedName: qualifiedName });
+                    return new Types.PackedType(8, decimals !== null && decimals !== void 0 ? decimals : 0, { qualifiedName: qualifiedName });
                 }
             case "C":
                 if (length) {
@@ -68934,11 +68974,17 @@ class Table extends _abstract_object_1.AbstractObject {
         }
         const ret = [];
         for (const p of this.parsedData.fields) {
-            if (p.KEYFLAG === "X" && p.FIELDNAME === ".INCLUDE") {
-                const lookup = new ddic_1.DDIC(reg).lookupTableOrView(p.PRECFIELD).type;
+            if (p.KEYFLAG === "X" && (p.FIELDNAME === ".INCLUDE" || p.FIELDNAME.startsWith(".INCLU-"))) {
+                let lookup = new ddic_1.DDIC(reg).lookupTableOrView(p.PRECFIELD).type;
+                if (lookup instanceof _typed_identifier_1.TypedIdentifier) {
+                    lookup = lookup.getType();
+                }
+                // same naming as in parseType(), "--AP" are .APPENDS and get no suffix
+                const postfix = p.FIELDNAME.startsWith(".INCLU-") && p.FIELDNAME !== ".INCLU--AP"
+                    ? p.FIELDNAME.substring(".INCLU-".length) : "";
                 if (lookup instanceof Types.StructureType) {
                     for (const c of lookup.getComponents()) {
-                        ret.push(c.name);
+                        ret.push(c.name + postfix);
                     }
                 }
             }
@@ -70763,7 +70809,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.62";
+        return "2.120.64";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -81259,6 +81305,178 @@ exports.EasyToFindMessages = EasyToFindMessages;
 
 /***/ },
 
+/***/ "../core/build/src/rules/else_after_all_returns.js"
+/*!*********************************************************!*\
+  !*** ../core/build/src/rules/else_after_all_returns.js ***!
+  \*********************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ElseAfterAllReturns = exports.ElseAfterAllReturnsConf = void 0;
+const issue_1 = __webpack_require__(/*! ../issue */ "../core/build/src/issue.js");
+const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "../core/build/src/rules/_abap_rule.js");
+const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "../core/build/src/rules/_basic_rule_config.js");
+const _irule_1 = __webpack_require__(/*! ./_irule */ "../core/build/src/rules/_irule.js");
+const Statements = __importStar(__webpack_require__(/*! ../abap/2_statements/statements */ "../core/build/src/abap/2_statements/statements/index.js"));
+const Structures = __importStar(__webpack_require__(/*! ../abap/3_structures/structures */ "../core/build/src/abap/3_structures/structures/index.js"));
+const Expressions = __importStar(__webpack_require__(/*! ../abap/2_statements/expressions */ "../core/build/src/abap/2_statements/expressions/index.js"));
+const nodes_1 = __webpack_require__(/*! ../abap/nodes */ "../core/build/src/abap/nodes/index.js");
+const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "../core/build/src/edit_helper.js");
+const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "../core/build/src/abap/2_statements/statements/_statement.js");
+class ElseAfterAllReturnsConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.ElseAfterAllReturnsConf = ElseAfterAllReturnsConf;
+class ElseAfterAllReturns extends _abap_rule_1.ABAPRule {
+    constructor() {
+        super(...arguments);
+        this.conf = new ElseAfterAllReturnsConf();
+    }
+    getMetadata() {
+        return {
+            key: "else_after_all_returns",
+            title: "Else after all returns",
+            shortDescription: `Finds ELSE branches that are redundant because all prior branches exit unconditionally.`,
+            extendedInformation: `When every branch preceding ELSE ends with RETURN, EXIT, or CONTINUE (or a non-resumable RAISE / LEAVE), ` +
+                `the ELSE keyword adds no logical value and can be removed by de-indenting its body.`,
+            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Styleguide, _irule_1.RuleTag.Quickfix],
+            badExample: `IF x = 1.\n  RETURN.\nELSE.\n  WRITE 'hello'.\nENDIF.`,
+            goodExample: `IF x = 1.\n  RETURN.\nENDIF.\nWRITE 'hello'.`,
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    runParsed(file, _obj) {
+        const issues = [];
+        const structure = file.getStructure();
+        if (structure === undefined) {
+            return [];
+        }
+        for (const ifNode of structure.findAllStructures(Structures.If)) {
+            const elseNode = ifNode.findDirectStructure(Structures.Else);
+            if (elseNode === undefined) {
+                continue;
+            }
+            if (this.allBranchesExit(ifNode)) {
+                const elseStatement = elseNode.findFirstStatement(Statements.Else);
+                const endifStatement = ifNode.findDirectStatement(Statements.EndIf);
+                if (elseStatement === undefined || endifStatement === undefined) {
+                    continue;
+                }
+                const fix = edit_helper_1.EditHelper.merge(edit_helper_1.EditHelper.replaceRange(file, elseStatement.getFirstToken().getStart(), elseStatement.getLastToken().getEnd(), "ENDIF."), edit_helper_1.EditHelper.deleteStatement(file, endifStatement));
+                // eslint-disable-next-line max-len
+                issues.push(issue_1.Issue.atStatement(file, elseStatement, "Redundant ELSE: all prior branches exit unconditionally", this.getMetadata().key, this.conf.severity, fix));
+            }
+        }
+        return issues;
+    }
+    // Returns true if every branch before the ELSE ends with an unconditional exit.
+    allBranchesExit(ifNode) {
+        // Main IF body
+        const mainBody = ifNode.findDirectStructure(Structures.Body);
+        if (!this.bodyEndsWithExit(mainBody)) {
+            return false;
+        }
+        // Each ELSEIF body
+        for (const elseifNode of ifNode.findDirectStructures(Structures.ElseIf)) {
+            const elseifBody = elseifNode.findDirectStructure(Structures.Body);
+            if (!this.bodyEndsWithExit(elseifBody)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    bodyEndsWithExit(body) {
+        if (body === undefined) {
+            return false;
+        }
+        const last = this.lastNonCommentStatement(body);
+        if (last === undefined) {
+            return false;
+        }
+        return this.isExit(last);
+    }
+    collectStatements(node) {
+        const result = [];
+        for (const child of node.getChildren()) {
+            if (child instanceof nodes_1.StatementNode) {
+                result.push(child);
+            }
+            else if (child instanceof nodes_1.StructureNode) {
+                result.push(...this.collectStatements(child));
+            }
+        }
+        return result;
+    }
+    lastNonCommentStatement(node) {
+        const all = this.collectStatements(node);
+        for (let i = all.length - 1; i >= 0; i--) {
+            if (!(all[i].get() instanceof _statement_1.Comment)) {
+                return all[i];
+            }
+        }
+        return undefined;
+    }
+    isExit(node) {
+        const s = node.get();
+        if (s instanceof Statements.Return
+            || s instanceof Statements.Exit
+            || s instanceof Statements.Continue) {
+            return true;
+        }
+        if (s instanceof Statements.Raise) {
+            return !node.concatTokens().toUpperCase().includes("RESUMABLE");
+        }
+        if (s instanceof Statements.Leave) {
+            const tokens = node.concatTokens().toUpperCase();
+            return !tokens.includes("LIST-PROCESSING") && node.findFirstExpression(Expressions.AndReturn) === undefined;
+        }
+        return false;
+    }
+}
+exports.ElseAfterAllReturns = ElseAfterAllReturns;
+//# sourceMappingURL=else_after_all_returns.js.map
+
+/***/ },
+
 /***/ "../core/build/src/rules/empty_event.js"
 /*!**********************************************!*\
   !*** ../core/build/src/rules/empty_event.js ***!
@@ -85080,6 +85298,7 @@ __exportStar(__webpack_require__(/*! ./empty_event */ "../core/build/src/rules/e
 __exportStar(__webpack_require__(/*! ./empty_line_in_statement */ "../core/build/src/rules/empty_line_in_statement.js"), exports);
 __exportStar(__webpack_require__(/*! ./empty_statement */ "../core/build/src/rules/empty_statement.js"), exports);
 __exportStar(__webpack_require__(/*! ./empty_structure */ "../core/build/src/rules/empty_structure.js"), exports);
+__exportStar(__webpack_require__(/*! ./else_after_all_returns */ "../core/build/src/rules/else_after_all_returns.js"), exports);
 __exportStar(__webpack_require__(/*! ./exit_or_check */ "../core/build/src/rules/exit_or_check.js"), exports);
 __exportStar(__webpack_require__(/*! ./expand_macros */ "../core/build/src/rules/expand_macros.js"), exports);
 __exportStar(__webpack_require__(/*! ./exporting */ "../core/build/src/rules/exporting.js"), exports);
@@ -101874,6 +102093,8 @@ class XMLConsistencyConf extends _basic_rule_config_1.BasicRuleConfig {
         this.textAndTranslationLengthSeverity = severity_1.Severity.Error;
         /** Problem severity for data element(DTEL) field checks */
         this.dataElementSeverity = severity_1.Severity.Error;
+        /** Problem severity for transparent table checks */
+        this.transparentTableSeverity = severity_1.Severity.Error;
     }
 }
 exports.XMLConsistencyConf = XMLConsistencyConf;
@@ -102161,11 +102382,11 @@ class XMLConsistency {
         if (obj.getTableCategory() === Objects.TableCategory.Transparent) {
             if (!((_c = obj.getDeliveryClass()) === null || _c === void 0 ? void 0 : _c.trim())) {
                 const message = `Transparent table must have delivery class(CONTFLAG in DD02V) set`;
-                issues.push(issue_1.Issue.atRow(file, 1, message, this.getMetadata().key, this.conf.severity));
+                issues.push(issue_1.Issue.atRow(file, 1, message, this.getMetadata().key, this.conf.transparentTableSeverity));
             }
             if (!((_d = obj.getSizeCategory()) === null || _d === void 0 ? void 0 : _d.trim())) {
                 const message = `Transparent table must have size category(TABKAT in DD09L) set`;
-                issues.push(issue_1.Issue.atRow(file, 1, message, this.getMetadata().key, this.conf.severity));
+                issues.push(issue_1.Issue.atRow(file, 1, message, this.getMetadata().key, this.conf.transparentTableSeverity));
             }
         }
         return issues;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.120.62",
+    "version": "2.120.64",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -39,7 +39,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.120.62",
+        "@abaplint/core": "^2.120.64",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",