@abaplint/core 2.108.0 → 2.108.2

package/build/src/abap/1_lexer/lexer_stream.js

@@ -14,6 +14,7 @@ class LexerStream {
             this.row = this.row + 1;
         }
         if (this.offset === this.raw.length) {
+            this.col = this.col - 1;
             return false;
         }
         this.col = this.col + 1;

package/build/src/registry.js

@@ -65,7 +65,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.108.0";
+        return "2.108.2";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/align_pseudo_comments.js

@@ -6,6 +6,8 @@ const _basic_rule_config_1 = require("./_basic_rule_config");
 const _irule_1 = require("./_irule");
 const issue_1 = require("../issue");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
+const position_1 = require("../position");
+const edit_helper_1 = require("../edit_helper");
 class AlignPseudoCommentsConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.AlignPseudoCommentsConf = AlignPseudoCommentsConf;
@@ -19,7 +21,7 @@ class AlignPseudoComments extends _abap_rule_1.ABAPRule {
             key: "align_pseudo_comments",
             title: "Align pseudo comments",
             shortDescription: `Align code inspector pseudo comments in statements`,
-            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Whitespace],
+            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Whitespace, _irule_1.RuleTag.Quickfix],
             badExample: `WRITE 'sdf'. "#EC sdf`,
             goodExample: `WRITE 'sdf'.                                                "#EC sdf`,
         };
@@ -46,16 +48,22 @@ class AlignPseudoComments extends _abap_rule_1.ABAPRule {
             else if (previousEnd === undefined) {
                 continue;
             }
-            else if (commentLength > 10) {
-                const expectedColumn = 72 - commentLength + 1;
-                if (previousEnd.getCol() < expectedColumn && firstCommentToken.getStart().getCol() !== expectedColumn) {
-                    const message = "Align pseudo comment to column " + expectedColumn;
-                    issues.push(issue_1.Issue.atStatement(file, statement, message, this.getMetadata().key, this.conf.severity));
-                }
+            let expectedColumn = 61;
+            if (commentLength > 10) {
+                expectedColumn = 72 - commentLength;
             }
-            else if (previousEnd.getCol() < 62 && firstCommentToken.getStart().getCol() !== 62) {
-                const message = "Align pseudo comment to column 62";
-                issues.push(issue_1.Issue.atStatement(file, statement, message, this.getMetadata().key, this.conf.severity));
+            const col = firstCommentToken.getStart().getCol();
+            if (previousEnd.getCol() < expectedColumn && col !== expectedColumn) {
+                let fix = undefined;
+                if (col < expectedColumn) {
+                    fix = edit_helper_1.EditHelper.insertAt(file, firstCommentToken.getStart(), " ".repeat(expectedColumn - col));
+                }
+                else {
+                    const from = new position_1.Position(firstCommentToken.getStart().getRow(), expectedColumn);
+                    fix = edit_helper_1.EditHelper.deleteRange(file, from, firstCommentToken.getStart());
+                }
+                const message = "Align pseudo comment to column " + expectedColumn;
+                issues.push(issue_1.Issue.atStatement(file, statement, message, this.getMetadata().key, this.conf.severity, fix));
             }
         }
         return issues;

package/build/src/rules/empty_structure.js

@@ -12,6 +12,8 @@ class EmptyStructureConf extends _basic_rule_config_1.BasicRuleConfig {
         super(...arguments);
         /** Checks for empty LOOP blocks */
         this.loop = true;
+        /** Allow empty LOOP if subrc is checked after the loop */
+        this.loopAllowIfSubrc = true;
         /** Checks for empty IF blocks */
         this.if = true;
         /** Checks for empty WHILE blocks */
@@ -44,6 +46,14 @@ class EmptyStructure extends _abap_rule_1.ABAPRule {
             shortDescription: `Checks that the code does not contain empty blocks.`,
             extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#no-empty-if-branches`,
             tags: [_irule_1.RuleTag.Styleguide, _irule_1.RuleTag.SingleFile],
+            badExample: `IF foo = bar.
+ENDIF.
+
+DO 2 TIMES.
+ENDDO.`,
+            goodExample: `LOOP AT itab WHERE qty = 0 OR date > sy-datum.
+ENDLOOP.
+result = xsdbool( sy-subrc = 0 ).`,
         };
     }
     getDescription(name) {
@@ -61,15 +71,13 @@ class EmptyStructure extends _abap_rule_1.ABAPRule {
         if (stru === undefined) {
             return [];
         }
-        for (const statement of file.getStatements()) {
+        const statements = file.getStatements();
+        for (const statement of statements) {
             if (statement.get() instanceof _statement_1.Unknown) {
                 return []; // contains parser errors
             }
         }
         const candidates = [];
-        if (this.getConfig().loop === true) {
-            candidates.push(...stru.findAllStructuresRecursive(Structures.Loop));
-        }
         if (this.getConfig().while === true) {
             candidates.push(...stru.findAllStructuresRecursive(Structures.While));
         }
@@ -105,6 +113,22 @@ class EmptyStructure extends _abap_rule_1.ABAPRule {
                 }
             }
         }
+        if (this.getConfig().loop === true) {
+            const loops = stru.findAllStructuresRecursive(Structures.Loop);
+            for (const loop of loops) {
+                if (loop.getChildren().length === 2) {
+                    const endloopStatement = loop.getLastChild();
+                    const endloopIndex = statements.findIndex((s) => s === endloopStatement);
+                    const afterEndloop = statements[endloopIndex + 1];
+                    if (afterEndloop !== undefined && afterEndloop.concatTokens().toUpperCase().includes("SY-SUBRC")) {
+                        continue;
+                    }
+                    const token = loop.getFirstToken();
+                    const issue = issue_1.Issue.atToken(file, token, this.getDescription(loop.get().constructor.name), this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
+                }
+            }
+        }
         if (this.getConfig().if === true) {
             const tries = stru.findAllStructuresRecursive(Structures.If)
                 .concat(stru.findAllStructuresRecursive(Structures.Else))

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.108.0",
+    "version": "2.108.2",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,10 +50,10 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.43.2",
+        "@microsoft/api-extractor": "^7.43.3",
         "@types/chai": "^4.3.16",
         "@types/mocha": "^10.0.6",
-        "@types/node": "^20.12.10",
+        "@types/node": "^20.12.11",
         "chai": "^4.4.1",
         "eslint": "^8.57.0",
         "mocha": "^10.4.0",