@abaplint/core 2.107.0 → 2.107.1

package/build/src/registry.js

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

package/build/src/rules/7bit_ascii.js

@@ -23,6 +23,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) {

package/build/src/rules/align_type_expressions.js

@@ -1,17 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AlignTypeExpressions = exports.AlignTypeExpressionsConf = void 0;
-const issue_1 = require("../issue");
 const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
+const objects_1 = require("../objects");
+const ddic_1 = require("../ddic");
 const _irule_1 = require("./_irule");
-const Structures = require("../abap/3_structures/structures");
-const Statements = require("../abap/2_statements/statements");
+const issue_1 = require("../issue");
+const position_1 = require("../position");
 const Expressions = require("../abap/2_statements/expressions");
-/*
-import {EditHelper, IEdit} from "../edit_helper";
-*/
+const Statements = require("../abap/2_statements/statements");
+const Structures = require("../abap/3_structures/structures");
+const edit_helper_1 = require("../edit_helper");
 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 {
@@ -27,9 +33,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,
@@ -62,16 +70,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);
@@ -98,14 +135,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;
     }
@@ -113,6 +143,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);
@@ -124,14 +157,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/core",
-    "version": "2.107.0",
+    "version": "2.107.1",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",