@abaplint/cli 2.101.35 → 2.102.0

package/build/cli.js

@@ -48465,7 +48465,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.101.35";
+        return "2.102.0";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -51649,7 +51649,7 @@ class CloudTypes {
             key: "cloud_types",
             title: "Check cloud types",
             shortDescription: `Checks that the package does not contain any object types unsupported in cloud ABAP.`,
-            tags: [_irule_1.RuleTag.SingleFile],
+            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Syntax],
         };
     }
     getDescription(objectType) {
@@ -57147,6 +57147,7 @@ class FunctionModuleRecommendationsConf extends _basic_rule_config_1.BasicRuleCo
          */
         this.recommendations = [
             { name: "CALCULATE_HASH_FOR_RAW", replace: "use CL_ABAP_HMAC or CL_ABAP_MESSAGE_DIGEST" },
+            { name: "CCU_TIMESTAMP_DIFFERENCE", replace: "use CL_ABAP_TSTMP" },
             { name: "ECATT_CONV_XSTRING_TO_STRING", replace: "use CL_BINARY_CONVERT" },
             { name: "F4_FILENAME", replace: "use CL_GUI_FRONTEND_SERVICES" },
             { name: "FUNCTION_EXISTS", replace: "surround with try-catch CX_SY_DYN_CALL_ILLEGAL_METHOD instead" },
@@ -58691,6 +58692,7 @@ __exportStar(__webpack_require__(/*! ./pragma_style */ "./node_modules/@abaplint
 __exportStar(__webpack_require__(/*! ./prefer_corresponding */ "./node_modules/@abaplint/core/build/src/rules/prefer_corresponding.js"), exports);
 __exportStar(__webpack_require__(/*! ./prefer_inline */ "./node_modules/@abaplint/core/build/src/rules/prefer_inline.js"), exports);
 __exportStar(__webpack_require__(/*! ./prefer_is_not */ "./node_modules/@abaplint/core/build/src/rules/prefer_is_not.js"), exports);
+__exportStar(__webpack_require__(/*! ./prefer_pragmas */ "./node_modules/@abaplint/core/build/src/rules/prefer_pragmas.js"), exports);
 __exportStar(__webpack_require__(/*! ./prefer_raise_exception_new */ "./node_modules/@abaplint/core/build/src/rules/prefer_raise_exception_new.js"), exports);
 __exportStar(__webpack_require__(/*! ./prefer_returning_to_exporting */ "./node_modules/@abaplint/core/build/src/rules/prefer_returning_to_exporting.js"), exports);
 __exportStar(__webpack_require__(/*! ./prefer_xsdbool */ "./node_modules/@abaplint/core/build/src/rules/prefer_xsdbool.js"), exports);
@@ -63778,6 +63780,91 @@ exports.PreferIsNot = PreferIsNot;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/rules/prefer_pragmas.js":
+/*!***********************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/rules/prefer_pragmas.js ***!
+  \***********************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.PreferPragmas = exports.PreferPragmasConf = void 0;
+const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
+const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@abaplint/core/build/src/rules/_abap_rule.js");
+const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
+const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
+const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
+class PreferPragmasConf extends _basic_rule_config_1.BasicRuleConfig {
+    constructor() {
+        super(...arguments);
+        this.check = [
+            {
+                pseudo: "#EC CI_SUBRC",
+                pragma: "SUBRC_OK",
+            },
+            {
+                pseudo: "#EC NEEDED",
+                pragma: "NEEDED",
+            },
+            {
+                pseudo: "#EC NOTEXT",
+                pragma: "NO_TEXT",
+            },
+            {
+                pseudo: "#EC NO_HANDLER",
+                pragma: "NO_HANDLER",
+            },
+        ];
+    }
+}
+exports.PreferPragmasConf = PreferPragmasConf;
+class PreferPragmas extends _abap_rule_1.ABAPRule {
+    constructor() {
+        super(...arguments);
+        this.conf = new PreferPragmasConf();
+    }
+    getMetadata() {
+        return {
+            key: "prefer_pragmas",
+            title: "prefer pragmas over pseudo comments ",
+            shortDescription: `prefer pragmas over pseudo comments `,
+            extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#prefer-pragmas-to-pseudo-comments`,
+            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Styleguide],
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    runParsed(file) {
+        const issues = [];
+        const config = this.getConfig();
+        for (const statement of file.getStatements()) {
+            if (!(statement.get() instanceof _statement_1.Comment)) {
+                continue;
+            }
+            const concat = statement.concatTokens().toUpperCase();
+            if (concat.includes("#EC") === false) {
+                continue;
+            }
+            for (const check of config.check) {
+                if (concat.includes(check.pseudo.toUpperCase())) {
+                    const message = `Prefer pragma ${check.pragma}`;
+                    issues.push(issue_1.Issue.atStatement(file, statement, message, this.getMetadata().key, this.getConfig().severity));
+                }
+            }
+        }
+        return issues;
+    }
+}
+exports.PreferPragmas = PreferPragmas;
+//# sourceMappingURL=prefer_pragmas.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/rules/prefer_raise_exception_new.js":
 /*!***********************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/rules/prefer_raise_exception_new.js ***!
@@ -67241,7 +67328,9 @@ class UnnecessaryPragma extends _abap_rule_1.ABAPRule {
 
 * NO_TEXT without texts
 
-* SUBRC_OK where sy-subrc is checked`,
+* SUBRC_OK where sy-subrc is checked
+
+NO_HANDLER inside macros are not checked`,
             tags: [_irule_1.RuleTag.SingleFile],
             badExample: `TRY.
     ...
@@ -67372,6 +67461,7 @@ ENDIF.`,
         }
         if (next
             && next.get() instanceof _statement_1.Comment
+            && !(statement.get() instanceof _statement_1.MacroContent)
             && next.concatTokens().toUpperCase().includes("#EC NO_HANDLER")) {
             return true;
         }
@@ -67402,7 +67492,6 @@ const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/
 class UnnecessaryReturnConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.UnnecessaryReturnConf = UnnecessaryReturnConf;
-// todo: make this rule more intelligent, eg RETURN. ENDTRY. ENDMETHOD.
 class UnnecessaryReturn extends _abap_rule_1.ABAPRule {
     constructor() {
         super(...arguments);
@@ -67436,17 +67525,27 @@ ENDFORM.`,
         if (structure === undefined) {
             return [];
         }
+        const message = "Unnecessary RETURN";
         const statements = file.getStatements();
-        for (let i = 0; i < statements.length - 1; i++) {
+        for (let i = 0; i < statements.length; i++) {
             const node = statements[i];
-            const next = statements[i + 1];
-            if (node.get() instanceof Statements.Return
-                && (next.get() instanceof Statements.EndMethod
-                    || next.get() instanceof Statements.EndForm
-                    || next.get() instanceof Statements.EndFunction)) {
-                const message = "Unnecessary RETURN";
-                const fix = edit_helper_1.EditHelper.deleteStatement(file, node);
-                issues.push(issue_1.Issue.atStatement(file, node, message, this.getMetadata().key, this.getConfig().severity, fix));
+            if (!(node.get() instanceof Statements.EndMethod
+                || node.get() instanceof Statements.EndForm
+                || node.get() instanceof Statements.EndFunction)) {
+                continue;
+            }
+            const prev = statements[i - 1];
+            if (prev && prev.get() instanceof Statements.Return) {
+                const fix = edit_helper_1.EditHelper.deleteStatement(file, prev);
+                issues.push(issue_1.Issue.atStatement(file, prev, message, this.getMetadata().key, this.getConfig().severity, fix));
+            }
+            const prevprev = statements[i - 2];
+            if (prev && prevprev
+                && prevprev.get() instanceof Statements.Return
+                && (prev.get() instanceof Statements.EndIf
+                    || prev.get() instanceof Statements.EndTry)) {
+                const fix = edit_helper_1.EditHelper.deleteStatement(file, prevprev);
+                issues.push(issue_1.Issue.atStatement(file, prevprev, message, this.getMetadata().key, this.getConfig().severity, fix));
             }
         }
         return issues;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.101.35",
+    "version": "2.102.0",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,12 +38,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.101.35",
+        "@abaplint/core": "^2.102.0",
         "@types/chai": "^4.3.5",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.2",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^20.4.1",
+        "@types/node": "^20.4.2",
         "@types/progress": "^2.0.5",
         "chai": "^4.3.7",
         "chalk": "^5.3.0",