@abaplint/cli 2.108.8 → 2.108.9

package/build/cli.js

@@ -51592,7 +51592,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.108.8";
+        return "2.108.9";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -54457,7 +54457,7 @@ If sy-dbcnt is checked after database statements, it is considered okay.
 If IS ASSIGNED is checked after assigning, it is considered okay.
 
 FIND statement with MATCH COUNT is considered okay if subrc is not checked`,
-            tags: [_irule_1.RuleTag.SingleFile],
+            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Quickfix],
             pseudoComment: "EC CI_SUBRC",
             pragma: "##SUBRC_OK",
         };
@@ -69284,7 +69284,9 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SelectSingleFullKey = exports.SelectSingleFullKeyConf = void 0;
 const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.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 __1 = __webpack_require__(/*! .. */ "./node_modules/@abaplint/core/build/src/index.js");
+const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
 class SelectSingleFullKeyConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -69305,7 +69307,7 @@ class SelectSingleFullKey {
 
 If the statement contains a JOIN it is not checked`,
             pseudoComment: "EC CI_NOORDER",
-            tags: [],
+            tags: [_irule_1.RuleTag.Quickfix],
         };
     }
     initialize(reg) {
@@ -69326,6 +69328,12 @@ If the statement contains a JOIN it is not checked`,
     setConfig(conf) {
         this.conf = conf;
     }
+    buildFix(file, statement) {
+        return {
+            description: `Add "#EC CI_NOORDER`,
+            edit: edit_helper_1.EditHelper.insertAt(file, statement.getLastToken().getStart(), ` "#EC CI_NOORDER`),
+        };
+    }
     run(obj) {
         var _a, _b;
         if (!(obj instanceof __1.ABAPObject)) {
@@ -69387,7 +69395,8 @@ If the statement contains a JOIN it is not checked`,
                     }
                 }
                 if (set.size > 0) {
-                    issues.push(issue_1.Issue.atStatement(file, s, message, this.getMetadata().key, this.getConfig().severity));
+                    const fix = this.buildFix(file, s);
+                    issues.push(issue_1.Issue.atStatement(file, s, message, this.getMetadata().key, this.getConfig().severity, undefined, [fix]));
                 }
             }
         }
@@ -71852,7 +71861,13 @@ const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
 const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
+const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 class UnnecessaryReturnConf extends _basic_rule_config_1.BasicRuleConfig {
+    constructor() {
+        super(...arguments);
+        /** Allow empty METHODs + FORMs + FUNCTION-MODULEs */
+        this.allowEmpty = false;
+    }
 }
 exports.UnnecessaryReturnConf = UnnecessaryReturnConf;
 class UnnecessaryReturn extends _abap_rule_1.ABAPRule {
@@ -71896,15 +71911,29 @@ ENDFORM.`,
         }
         const message = "Unnecessary RETURN";
         const statements = file.getStatements();
+        let statementCounter = 0;
         for (let i = 0; i < statements.length; i++) {
             const node = statements[i];
-            if (!(node.get() instanceof Statements.EndMethod
-                || node.get() instanceof Statements.EndForm
-                || node.get() instanceof Statements.EndFunction)) {
+            const nodeType = node.get();
+            if ((nodeType instanceof Statements.MethodImplementation
+                || nodeType instanceof Statements.Form
+                || nodeType instanceof Statements.FunctionModule)) {
+                statementCounter = 0;
+                continue;
+            }
+            if (!(nodeType instanceof _statement_1.Comment)) {
+                statementCounter++;
+            }
+            if (!(nodeType instanceof Statements.EndMethod
+                || nodeType instanceof Statements.EndForm
+                || nodeType instanceof Statements.EndFunction)) {
                 continue;
             }
             const prev = statements[i - 1];
             if (prev && prev.get() instanceof Statements.Return) {
+                if (this.conf.allowEmpty === true && statementCounter === 2) {
+                    continue;
+                }
                 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));
             }
@@ -74946,6 +74975,8 @@ exports.validate = function (xmlData, options) {
             return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' doesn't have proper closing.", getLineNumberForPosition(xmlData, i));
           } else if (attrStr.trim().length > 0) {
             return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' can't have attributes or invalid starting.", getLineNumberForPosition(xmlData, tagStartPos));
+          } else if (tags.length === 0) {
+            return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' has not been opened.", getLineNumberForPosition(xmlData, tagStartPos));
           } else {
             const otg = tags.pop();
             if (tagName !== otg.tagName) {
@@ -76233,10 +76264,18 @@ const parseXml = function(xmlData) {
           let tagContent = "";
           //self-closing tag
           if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){
+            if(tagName[tagName.length - 1] === "/"){ //remove trailing '/'
+              tagName = tagName.substr(0, tagName.length - 1);
+              jPath = jPath.substr(0, jPath.length - 1);
+              tagExp = tagName;
+            }else{
+              tagExp = tagExp.substr(0, tagExp.length - 1);
+            }
             i = result.closeIndex;
           }
           //unpaired tag
           else if(this.options.unpairedTags.indexOf(tagName) !== -1){
+            
             i = result.closeIndex;
           }
           //normal tag

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.108.8",
+    "version": "2.108.9",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.108.8",
+        "@abaplint/core": "^2.108.9",
         "@types/chai": "^4.3.16",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",