@abaplint/cli 2.107.0 → 2.107.1

package/build/cli.js

@@ -51462,7 +51462,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.107.0";
+        return "2.107.1";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -51784,6 +51784,8 @@ https://help.sap.com/doc/abapdocu_750_index_htm/7.50/en-US/abencharacter_set_gui
 
 Checkes files with extensions ".abap" and ".asddls"`,
             tags: [_irule_1.RuleTag.SingleFile],
+            badExample: `WRITE '뽑'.`,
+            goodExample: `WRITE cl_abap_conv_in_ce=>uccp( 'BF51' ).`,
         };
     }
     initialize(_reg) {
@@ -52490,17 +52492,23 @@ exports.AlignParameters = AlignParameters;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AlignTypeExpressions = exports.AlignTypeExpressionsConf = 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 objects_1 = __webpack_require__(/*! ../objects */ "./node_modules/@abaplint/core/build/src/objects/index.js");
+const ddic_1 = __webpack_require__(/*! ../ddic */ "./node_modules/@abaplint/core/build/src/ddic.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
-const Structures = __webpack_require__(/*! ../abap/3_structures/structures */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/index.js");
-const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
+const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
+const position_1 = __webpack_require__(/*! ../position */ "./node_modules/@abaplint/core/build/src/position.js");
 const Expressions = __webpack_require__(/*! ../abap/2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
-/*
-import {EditHelper, IEdit} from "../edit_helper";
-*/
+const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
+const Structures = __webpack_require__(/*! ../abap/3_structures/structures */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/index.js");
+const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
 class AlignTypeExpressionsConf extends _basic_rule_config_1.BasicRuleConfig {
+    constructor() {
+        super(...arguments);
+        /** Ignore global exception classes */
+        this.ignoreExceptions = true;
+    }
 }
 exports.AlignTypeExpressionsConf = AlignTypeExpressionsConf;
 class AlignTypeExpressions extends _abap_rule_1.ABAPRule {
@@ -52516,9 +52524,11 @@ class AlignTypeExpressions extends _abap_rule_1.ABAPRule {
             extendedInformation: `
 Currently works for METHODS + BEGIN OF
 
+If BEGIN OF has an INCLUDE TYPE its ignored
+
 Also note that clean ABAP does not recommend aligning TYPE clauses:
 https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#dont-align-type-clauses`,
-            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Whitespace],
+            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Whitespace, _irule_1.RuleTag.Quickfix],
             badExample: `
 TYPES: BEGIN OF foo,
          bar TYPE i,
@@ -52551,16 +52561,45 @@ ENDINTERFACE.`,
     setConfig(conf) {
         this.conf = conf;
     }
-    runParsed(file) {
+    runParsed(file, obj) {
         const issues = [];
         const stru = file.getStructure();
         if (stru === undefined) {
             return issues; // parser error
         }
+        const ddic = new ddic_1.DDIC(this.reg);
+        if (obj instanceof objects_1.Class) {
+            const definition = obj.getClassDefinition();
+            if (definition === undefined) {
+                return [];
+            }
+            else if (this.conf.ignoreExceptions && ddic.isException(definition, obj)) {
+                return [];
+            }
+        }
         issues.push(...this.checkTypes(stru, file));
         issues.push(...this.checkMethods(stru, file));
         return issues;
     }
+    check(fields, column, file) {
+        const issues = [];
+        for (const f of fields) {
+            if (f.after.getCol() === column) {
+                continue;
+            }
+            let fix = undefined;
+            if (f.after.getCol() < column) {
+                fix = edit_helper_1.EditHelper.insertAt(file, f.after, " ".repeat(column - f.after.getCol()));
+            }
+            else {
+                fix = edit_helper_1.EditHelper.deleteRange(file, new position_1.Position(f.after.getRow(), column), f.after);
+            }
+            const message = `Align TYPE expressions to column ${column}`;
+            const issue = issue_1.Issue.atPosition(file, f.after, message, this.getMetadata().key, this.conf.severity, fix);
+            issues.push(issue);
+        }
+        return issues;
+    }
     checkMethods(stru, file) {
         const issues = [];
         const methods = stru.findAllStatements(Statements.MethodDef);
@@ -52587,14 +52626,7 @@ ENDINTERFACE.`,
                 });
                 column = Math.max(column, name.getLastToken().getEnd().getCol() + 1);
             }
-            for (const f of fields) {
-                if (f.after.getCol() !== column) {
-                    //          const fix = this.buildFix(f.name, column);
-                    const message = `Align TYPE expressions to column ${column}`;
-                    const issue = issue_1.Issue.atPosition(file, f.after, message, this.getMetadata().key, this.conf.severity);
-                    issues.push(issue);
-                }
-            }
+            issues.push(...this.check(fields, column, file));
         }
         return issues;
     }
@@ -52602,6 +52634,9 @@ ENDINTERFACE.`,
         const issues = [];
         const types = stru.findAllStructuresRecursive(Structures.Types);
         for (const t of types) {
+            if (t.findDirectStatement(Statements.IncludeType)) {
+                continue;
+            }
             const fields = [];
             let column = 0;
             const st = t.findDirectStatements(Statements.Type);
@@ -52613,14 +52648,7 @@ ENDINTERFACE.`,
                 });
                 column = Math.max(column, name.getFirstToken().getEnd().getCol() + 1);
             }
-            for (const f of fields) {
-                if (f.after.getCol() !== column) {
-                    //          const fix = this.buildFix(f.name, column);
-                    const message = `Align TYPE expressions to column ${column}`;
-                    const issue = issue_1.Issue.atPosition(file, f.after, message, this.getMetadata().key, this.conf.severity);
-                    issues.push(issue);
-                }
-            }
+            issues.push(...this.check(fields, column, file));
         }
         return issues;
     }

package/package.json

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