@abaplint/core 2.120.74 → 2.120.75

package/build/src/rules/final_newline.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FinalNewline = exports.FinalNewlineConf = void 0;
+const issue_1 = require("../issue");
+const position_1 = require("../position");
+const _basic_rule_config_1 = require("./_basic_rule_config");
+const edit_helper_1 = require("../edit_helper");
+const _irule_1 = require("./_irule");
+const objects_1 = require("../objects");
+class FinalNewlineConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.FinalNewlineConf = FinalNewlineConf;
+class FinalNewline {
+    constructor() {
+        this.conf = new FinalNewlineConf();
+    }
+    getMetadata() {
+        return {
+            key: "final_newline",
+            title: "Final newline",
+            shortDescription: `Checks that ABAP and XML files end with exactly one newline`,
+            extendedInformation: `abapGit serializes every file with exactly one newline at the end. A file without it,
+or with empty lines at the end, is changed again on the next pull and shows up in every diff.
+
+Empty files and files containing only line breaks are not checked. A carriage return before the
+newline is ignored, see rule line_break_style. SMIM and W3MI files and XSLT sources are not checked.`,
+            tags: [_irule_1.RuleTag.Whitespace, _irule_1.RuleTag.Quickfix, _irule_1.RuleTag.SingleFile],
+            badExample: `WRITE 'hello'.`,
+            goodExample: `WRITE 'hello'.\n`,
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    initialize(_reg) {
+        return this;
+    }
+    run(obj) {
+        const issues = [];
+        if (obj instanceof objects_1.MIMEObject || obj instanceof objects_1.WebMIME) {
+            return issues;
+        }
+        for (const file of obj.getFiles()) {
+            const filename = file.getFilename();
+            if ((filename.endsWith(".abap") || filename.endsWith(".xml")) && !filename.endsWith(".xslt.source.xml")) {
+                const issue = this.checkFile(file);
+                if (issue) {
+                    issues.push(issue);
+                }
+            }
+        }
+        return issues;
+    }
+    checkFile(file) {
+        const rows = file.getRawRows();
+        const last = rows[rows.length - 1];
+        if (last !== "") {
+            const end = new position_1.Position(rows.length, last.length + 1);
+            const fix = edit_helper_1.EditHelper.insertAt(file, end, "\n");
+            return issue_1.Issue.atPosition(file, end, "Add newline at end of file", this.getMetadata().key, this.conf.severity, fix);
+        }
+        let row = rows.length - 2;
+        while (row >= 0 && (rows[row] === "" || rows[row] === "\r")) {
+            row--;
+        }
+        if (row < 0 || row === rows.length - 2) {
+            return undefined;
+        }
+        const start = new position_1.Position(row + 2, 1);
+        const fix = edit_helper_1.EditHelper.deleteRange(file, start, new position_1.Position(rows.length, 1));
+        return issue_1.Issue.atPosition(file, start, "Remove empty lines at end of file", this.getMetadata().key, this.conf.severity, fix);
+    }
+}
+exports.FinalNewline = FinalNewline;
+//# sourceMappingURL=final_newline.js.map

package/build/src/rules/forbidden_identifier.js

@@ -20,6 +20,7 @@ class ForbiddenIdentifier extends _abap_rule_1.ABAPRule {
     constructor() {
         super(...arguments);
         this.conf = new ForbiddenIdentifierConf();
+        this.checks = [];
     }
     getMetadata() {
         return {
@@ -39,9 +40,10 @@ https://github.com/abaplint/transpiler/blob/bda94b8b56e2b7f2f87be2168f12361aa530
         if (this.conf.check === undefined) {
             this.conf.check = [];
         }
+        this.checks = this.conf.check.map(c => new RegExp(c, "i"));
     }
     runParsed(file) {
-        if (this.conf.check.length === 0) {
+        if (this.checks.length === 0) {
             return [];
         }
         let ret = [];
@@ -68,8 +70,7 @@ https://github.com/abaplint/transpiler/blob/bda94b8b56e2b7f2f87be2168f12361aa530
     check(token, file) {
         const str = token.getStr();
         const ret = [];
-        for (const c of this.conf.check) {
-            const reg = new RegExp(c, "i");
+        for (const reg of this.checks) {
             if (reg.exec(str)) {
                 const message = "Identifer \"" + str + "\" not allowed";
                 ret.push(issue_1.Issue.atToken(file, token, message, this.getMetadata().key, this.conf.severity));

package/build/src/rules/forbidden_void_type.js

@@ -22,6 +22,7 @@ exports.ForbiddenVoidTypeConf = ForbiddenVoidTypeConf;
 class ForbiddenVoidType {
     constructor() {
         this.conf = new ForbiddenVoidTypeConf();
+        this.checks = [];
     }
     getMetadata() {
         return {
@@ -41,13 +42,14 @@ DATS, TIMS, DATUM, FLAG, INT4, NUMC3, NUMC4, SAP_BOOL, TEXT25, TEXT80, X255, XFE
         if (this.conf.check === undefined) {
             this.conf.check = [];
         }
+        this.checks = this.conf.check.map(c => new RegExp(c, "i"));
     }
     initialize(reg) {
         this.reg = reg;
         return this;
     }
     run(obj) {
-        if (!(obj instanceof _abap_object_1.ABAPObject) || this.conf.check.length === 0) {
+        if (!(obj instanceof _abap_object_1.ABAPObject) || this.checks.length === 0) {
             return [];
         }
         return this.traverse(new syntax_1.SyntaxLogic(this.reg, obj).run().spaghetti.getTop());
@@ -90,14 +92,7 @@ DATS, TIMS, DATUM, FLAG, INT4, NUMC3, NUMC4, SAP_BOOL, TEXT25, TEXT80, X255, XFE
         if (name === undefined) {
             return false;
         }
-        for (const c of this.conf.check) {
-            const reg = new RegExp(c, "i");
-            const match = reg.test(name);
-            if (match === true) {
-                return true;
-            }
-        }
-        return false;
+        return this.checks.some(reg => reg.test(name));
     }
 }
 exports.ForbiddenVoidType = ForbiddenVoidType;

package/build/src/rules/index.js

@@ -16,6 +16,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./7bit_ascii"), exports);
 __exportStar(require("./abapdoc"), exports);
+__exportStar(require("./abapdoc_html_tag"), exports);
+__exportStar(require("./abapdoc_leading_at"), exports);
+__exportStar(require("./abapdoc_parameter_names"), exports);
 __exportStar(require("./add_test_attributes"), exports);
 __exportStar(require("./aff_and_xml"), exports);
 __exportStar(require("./align_parameters"), exports);
@@ -38,6 +41,7 @@ __exportStar(require("./cds_naming"), exports);
 __exportStar(require("./cds_parser_error"), exports);
 __exportStar(require("./chain_mainly_declarations"), exports);
 __exportStar(require("./change_if_to_case"), exports);
+__exportStar(require("./changing_sorted_line"), exports);
 __exportStar(require("./check_abstract"), exports);
 __exportStar(require("./check_comments"), exports);
 __exportStar(require("./check_ddic"), exports);
@@ -60,6 +64,7 @@ __exportStar(require("./cyclomatic_complexity"), exports);
 __exportStar(require("./dangerous_statement"), exports);
 __exportStar(require("./db_operation_in_loop"), exports);
 __exportStar(require("./definitions_top"), exports);
+__exportStar(require("./delete_index_in_loop"), exports);
 __exportStar(require("./description_empty"), exports);
 __exportStar(require("./double_space"), exports);
 __exportStar(require("./downport"), exports);
@@ -73,6 +78,7 @@ __exportStar(require("./else_after_all_returns"), exports);
 __exportStar(require("./exit_or_check"), exports);
 __exportStar(require("./expand_macros"), exports);
 __exportStar(require("./exporting"), exports);
+__exportStar(require("./final_newline"), exports);
 __exportStar(require("./fm_global_parameters_obsolete"), exports);
 __exportStar(require("./forbidden_identifier"), exports);
 __exportStar(require("./forbidden_pseudo_and_pragma"), exports);
@@ -96,6 +102,7 @@ __exportStar(require("./in_statement_indentation"), exports);
 __exportStar(require("./indentation"), exports);
 __exportStar(require("./index_completely_contained"), exports);
 __exportStar(require("./inline_data_old_versions"), exports);
+__exportStar(require("./inline_packed_computation"), exports);
 __exportStar(require("./intf_referencing_clas"), exports);
 __exportStar(require("./invalid_table_index"), exports);
 __exportStar(require("./keep_single_parameter_on_one_line"), exports);
@@ -147,6 +154,7 @@ __exportStar(require("./parser_missing_space"), exports);
 __exportStar(require("./pragma_style"), exports);
 __exportStar(require("./prefer_corresponding"), exports);
 __exportStar(require("./prefer_inline"), exports);
+__exportStar(require("./prefer_inline_cast"), exports);
 __exportStar(require("./prefer_insert_into_table"), exports);
 __exportStar(require("./prefer_is_not"), exports);
 __exportStar(require("./prefer_pragmas"), exports);
@@ -159,6 +167,7 @@ __exportStar(require("./prefer_xsdbool"), exports);
 __exportStar(require("./preferred_compare_operator"), exports);
 __exportStar(require("./preferred_parameter_ignored"), exports);
 __exportStar(require("./prefix_is_current_class"), exports);
+__exportStar(require("./range_row_values"), exports);
 __exportStar(require("./reduce_procedural_code"), exports);
 __exportStar(require("./reduce_string_templates"), exports);
 __exportStar(require("./redundant_conversion"), exports);
@@ -175,6 +184,7 @@ __exportStar(require("./short_case"), exports);
 __exportStar(require("./sicf_consistency"), exports);
 __exportStar(require("./slow_parameter_passing"), exports);
 __exportStar(require("./smim_consistency"), exports);
+__exportStar(require("./sort_empty_key"), exports);
 __exportStar(require("./space_before_colon"), exports);
 __exportStar(require("./space_before_dot"), exports);
 __exportStar(require("./sql_escape_host_variables"), exports);
@@ -182,6 +192,7 @@ __exportStar(require("./sql_value_conversion"), exports);
 __exportStar(require("./start_at_tab"), exports);
 __exportStar(require("./static_call_via_instance"), exports);
 __exportStar(require("./strict_sql"), exports);
+__exportStar(require("./subrc_after_assign"), exports);
 __exportStar(require("./superclass_final"), exports);
 __exportStar(require("./superfluous_value"), exports);
 __exportStar(require("./sy_modification"), exports);

package/build/src/rules/inline_packed_computation.js

@@ -0,0 +1,220 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InlinePackedComputation = exports.InlinePackedComputationConf = void 0;
+const Expressions = __importStar(require("../abap/2_statements/expressions"));
+const Statements = __importStar(require("../abap/2_statements/statements"));
+const _reference_1 = require("../abap/5_syntax/_reference");
+const constant_1 = require("../abap/5_syntax/expressions/constant");
+const syntax_1 = require("../abap/5_syntax/syntax");
+const nodes_1 = require("../abap/nodes");
+const types_1 = require("../abap/types");
+const _typed_identifier_1 = require("../abap/types/_typed_identifier");
+const basic_1 = require("../abap/types/basic");
+const issue_1 = require("../issue");
+const _abap_object_1 = require("../objects/_abap_object");
+const _basic_rule_config_1 = require("./_basic_rule_config");
+class InlinePackedComputationConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.InlinePackedComputationConf = InlinePackedComputationConf;
+class InlinePackedComputation {
+    constructor() {
+        this.conf = new InlinePackedComputationConf();
+    }
+    getMetadata() {
+        return {
+            key: "inline_packed_computation",
+            title: "Inline declaration from a packed computation",
+            shortDescription: `Finds inline declarations whose value is an arithmetic expression with calculation type p`,
+            extendedInformation: `The result of a computation with calculation type p has no length and number of decimals
+that a declaration could take over, so DATA( ) or FINAL( ) gets the type p LENGTH 8 DECIMALS 0 and the
+syntax check warns "For the result of a computation with type P, the type P(8,0) is used here implicitly".
+Decimals of the operands are lost, and so are digits beyond the length.
+
+Reported when at least one operand is packed and all other operands are of type i, int8 or p. Operands
+of other types, generic or unknown types, and the operator ** are not reported.
+
+Declare the variable with the operands' type, or name the type with CONV.`,
+            tags: [],
+            badExample: `DATA a TYPE p LENGTH 8 DECIMALS 2.
+DATA b TYPE p LENGTH 8 DECIMALS 2.
+DATA(diff) = a - b.`,
+            goodExample: `DATA a TYPE p LENGTH 8 DECIMALS 2.
+DATA b TYPE p LENGTH 8 DECIMALS 2.
+DATA diff LIKE a.
+diff = a - b.`,
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    initialize(reg) {
+        this.reg = reg;
+        return this;
+    }
+    run(obj) {
+        var _a, _b;
+        if (!(obj instanceof _abap_object_1.ABAPObject)) {
+            return [];
+        }
+        const syntax = new syntax_1.SyntaxLogic(this.reg, obj).run();
+        if (syntax.issues.length > 0) {
+            return [];
+        }
+        const issues = [];
+        for (const file of obj.getABAPFiles()) {
+            for (const statement of file.getStatements()) {
+                if (!(statement.get() instanceof Statements.Move)) {
+                    continue;
+                }
+                const inline = (_a = statement.findDirectExpression(Expressions.Target)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.InlineData);
+                const name = (_b = inline === null || inline === void 0 ? void 0 : inline.findDirectExpression(Expressions.TargetField)) === null || _b === void 0 ? void 0 : _b.getFirstToken();
+                const source = statement.findDirectExpression(Expressions.Source);
+                if (name === undefined
+                    || source === undefined
+                    || source.findDirectExpression(Expressions.ArithOperator) === undefined) {
+                    continue;
+                }
+                const scope = syntax.spaghetti.lookupPosition(name.getStart(), file.getFilename());
+                if (scope === undefined) {
+                    continue;
+                }
+                const operands = this.operandTypes(source, scope);
+                if (operands === undefined || operands.some(t => t instanceof basic_1.PackedType) === false) {
+                    continue;
+                }
+                const message = `"${name.getStr()}" gets type p LENGTH 8 DECIMALS 0 from this packed computation, ` +
+                    `declare it with the operands' type or use CONV`;
+                issues.push(issue_1.Issue.atToken(file, name, message, this.getMetadata().key, this.conf.severity));
+            }
+        }
+        return issues;
+    }
+    /** The types of the operands of an arithmetic expression, undefined when an operand is not of type
+     *  i, int8 or p, or is not known */
+    operandTypes(source, scope) {
+        const ret = [];
+        for (const child of source.getChildren()) {
+            let found = undefined;
+            if (child instanceof nodes_1.TokenNode) {
+                // parentheses and a sign, anything else is a constructor expression or a string operator
+                if (["(", ")", "+", "-"].includes(child.getFirstToken().getStr()) === false) {
+                    return undefined;
+                }
+                continue;
+            }
+            else if (child.get() instanceof Expressions.ArithOperator) {
+                if (["+", "-", "*", "/", "DIV", "MOD"].includes(child.concatTokens().toUpperCase()) === false) {
+                    return undefined;
+                }
+                continue;
+            }
+            else if (child.get() instanceof Expressions.Source) {
+                const nested = this.operandTypes(child, scope);
+                if (nested === undefined) {
+                    return undefined;
+                }
+                ret.push(...nested);
+                continue;
+            }
+            else if (child.get() instanceof Expressions.FieldChain) {
+                found = this.fieldChainType(child, scope);
+            }
+            else if (child.get() instanceof Expressions.MethodCallChain) {
+                found = this.methodCallType(child, scope);
+            }
+            else if (child.get() instanceof Expressions.Constant) {
+                found = constant_1.Constant.runSyntax(child);
+            }
+            if (found === undefined
+                || found.isGeneric()
+                || !(found instanceof basic_1.PackedType || found instanceof basic_1.IntegerType || found instanceof basic_1.Integer8Type)) {
+                return undefined;
+            }
+            ret.push(found);
+        }
+        return ret;
+    }
+    methodCallType(chain, scope) {
+        var _a, _b, _c;
+        const last = chain.getLastChild();
+        if (!(last instanceof nodes_1.ExpressionNode) || !(last.get() instanceof Expressions.MethodCall)) {
+            return undefined;
+        }
+        const name = (_a = last.findDirectExpression(Expressions.MethodName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+        if (name === undefined) {
+            return undefined;
+        }
+        const method = (_b = scope.getData().references.find(reference => reference.referenceType === _reference_1.ReferenceType.MethodReference
+            && reference.position.getStart().equals(name.getStart()))) === null || _b === void 0 ? void 0 : _b.resolved;
+        if (!(method instanceof types_1.MethodDefinition)) {
+            return undefined;
+        }
+        return (_c = method.getParameters().getReturning()) === null || _c === void 0 ? void 0 : _c.getType();
+    }
+    fieldChainType(fieldChain, scope) {
+        var _a;
+        const operand = (_a = scope.getData().references.find(reference => reference.referenceType === _reference_1.ReferenceType.DataReadReference
+            && reference.position.getStart().equals(fieldChain.getFirstToken().getStart()))) === null || _a === void 0 ? void 0 : _a.resolved;
+        if (!(operand instanceof _typed_identifier_1.TypedIdentifier)) {
+            return undefined;
+        }
+        let type = operand.getType();
+        for (const child of fieldChain.getChildren()) {
+            if (!(child instanceof nodes_1.ExpressionNode)
+                || child.get() instanceof Expressions.SourceField) {
+                continue;
+            }
+            else if (child.get() instanceof Expressions.ComponentName) {
+                if (type instanceof basic_1.TableType) {
+                    type = type.getRowType();
+                }
+                if (!(type instanceof basic_1.StructureType)) {
+                    return undefined;
+                }
+                type = type.getComponentByName(child.concatTokens());
+            }
+            else {
+                return undefined;
+            }
+        }
+        return type;
+    }
+}
+exports.InlinePackedComputation = InlinePackedComputation;
+//# sourceMappingURL=inline_packed_computation.js.map

package/build/src/rules/intf_referencing_clas.js

@@ -20,6 +20,7 @@ exports.IntfReferencingClasConf = IntfReferencingClasConf;
 class IntfReferencingClas {
     constructor() {
         this.conf = new IntfReferencingClasConf();
+        this.allow = [];
     }
     getMetadata() {
         return {
@@ -40,6 +41,7 @@ class IntfReferencingClas {
     }
     setConfig(conf) {
         this.conf = conf;
+        this.allow = (this.conf.allow || []).map(reg => new RegExp(reg, "i"));
     }
     initialize(reg) {
         this.reg = reg;
@@ -65,7 +67,7 @@ class IntfReferencingClas {
                 if (found && ddic.isException(found.getClassDefinition(), found)) {
                     continue;
                 }
-                else if (this.getConfig().allow.some(reg => new RegExp(reg, "i").test(r.extra.ooName))) {
+                else if (this.allow.some(reg => reg.test(r.extra.ooName))) {
                     continue;
                 }
                 ret.push(issue_1.Issue.atIdentifier(r.position, message + r.extra.ooName, this.getMetadata().key, this.conf.severity));

package/build/src/rules/line_only_punc.js

@@ -57,7 +57,7 @@ https://docs.abapopenchecks.org/checks/16/`,
             }
         }
         const rows = file.getRawRows();
-        const reg = new RegExp("^\\)?\\. *(\\\".*)?$");
+        const reg = /^\)?\. *(".*)?$/;
         for (let i = 0; i < rows.length; i++) {
             if (reg.exec(rows[i].trim())) {
                 const column = rows[i].indexOf(")") >= 0 ? rows[i].indexOf(")") + 1 : rows[i].indexOf(".") + 1;

package/build/src/rules/local_class_naming.js

@@ -23,6 +23,7 @@ class LocalClassNaming extends _abap_rule_1.ABAPRule {
     constructor() {
         super(...arguments);
         this.conf = new LocalClassNamingConf();
+        this.regex = this.compile();
     }
     getMetadata() {
         return {
@@ -46,6 +47,15 @@ ENDCLASS.`,
     }
     setConfig(conf) {
         this.conf = conf;
+        this.regex = this.compile();
+    }
+    compile() {
+        return {
+            local: new RegExp(this.conf.local, "i"),
+            exception: new RegExp(this.conf.exception, "i"),
+            test: new RegExp(this.conf.test, "i"),
+            ignorePatterns: name_validator_1.NameValidator.compileIgnorePatterns(this.conf),
+        };
     }
     runParsed(file, obj) {
         const issues = [];
@@ -59,20 +69,23 @@ ENDCLASS.`,
             }
             const className = classDef.name;
             let expected;
+            let regex;
             if (classDef.isForTesting) {
                 expected = this.conf.test;
+                regex = this.regex.test;
             }
             else if (ddic.isException(classDef, obj)) {
                 expected = this.conf.exception;
+                regex = this.regex.exception;
             }
             else {
                 expected = this.conf.local;
+                regex = this.regex.local;
             }
             if (expected === undefined || expected.length === 0) {
                 continue;
             }
-            const regex = new RegExp(expected, "i");
-            if (name_validator_1.NameValidator.violatesRule(className, regex, this.conf)) {
+            if (name_validator_1.NameValidator.violatesRule(className, regex, this.conf, this.regex.ignorePatterns)) {
                 issues.push(issue_1.Issue.atIdentifier(classDef.identifier, this.getDescription(expected, className), this.getMetadata().key, this.conf.severity));
             }
         }

package/build/src/rules/local_variable_names.js

@@ -58,6 +58,7 @@ class LocalVariableNames extends _abap_rule_1.ABAPRule {
     constructor() {
         super(...arguments);
         this.conf = new LocalVariableNamesConf();
+        this.regex = this.compile();
     }
     getMetadata() {
         return {
@@ -85,6 +86,15 @@ ENDFORM.`,
     }
     setConfig(conf) {
         this.conf = conf;
+        this.regex = this.compile();
+    }
+    compile() {
+        return {
+            expectedData: new RegExp(this.conf.expectedData, "i"),
+            expectedConstant: new RegExp(this.conf.expectedConstant, "i"),
+            expectedFS: new RegExp(this.conf.expectedFS, "i"),
+            ignorePatterns: name_validator_1.NameValidator.compileIgnorePatterns(this.conf),
+        };
     }
     runParsed(file) {
         const ret = [];
@@ -118,7 +128,7 @@ ENDFORM.`,
             const found = dat.findFirstExpression(Expressions.DefinitionName);
             if (found) {
                 const token = found.getFirstToken();
-                ret = ret.concat(this.checkName(token, file, this.conf.expectedData));
+                ret = ret.concat(this.checkName(token, file, this.conf.expectedData, this.regex.expectedData));
             }
         }
         // inline data
@@ -126,7 +136,7 @@ ENDFORM.`,
             const found = dat.findFirstExpression(Expressions.TargetField);
             if (found) {
                 const token = found.getFirstToken();
-                ret = ret.concat(this.checkName(token, file, this.conf.expectedData));
+                ret = ret.concat(this.checkName(token, file, this.conf.expectedData, this.regex.expectedData));
             }
         }
         // data structures, data begin of, first level
@@ -137,14 +147,14 @@ ENDFORM.`,
             const found = stat === null || stat === void 0 ? void 0 : stat.findFirstExpression(Expressions.DefinitionName);
             if (found) {
                 const token = found.getFirstToken();
-                ret = ret.concat(this.checkName(token, file, this.conf.expectedData));
+                ret = ret.concat(this.checkName(token, file, this.conf.expectedData, this.regex.expectedData));
             }
         }
         for (const fieldsymbol of structure.findAllStatements(Statements.FieldSymbol)) {
             const found = fieldsymbol.findFirstExpression(Expressions.FieldSymbol);
             if (found) {
                 const token = found.getFirstToken();
-                ret = ret.concat(this.checkName(token, file, this.conf.expectedFS));
+                ret = ret.concat(this.checkName(token, file, this.conf.expectedFS, this.regex.expectedFS));
             }
         }
         // inline field symbols
@@ -152,7 +162,7 @@ ENDFORM.`,
             const found = fieldsymbol.findFirstExpression(Expressions.TargetFieldSymbol);
             if (found) {
                 const token = found.getFirstToken();
-                ret = ret.concat(this.checkName(token, file, this.conf.expectedFS));
+                ret = ret.concat(this.checkName(token, file, this.conf.expectedFS, this.regex.expectedFS));
             }
         }
         const constants = structure.findAllStatements(Statements.Constant);
@@ -164,16 +174,15 @@ ENDFORM.`,
             const found = constant.findFirstExpression(Expressions.DefinitionName);
             if (found) {
                 const token = found.getFirstToken();
-                ret = ret.concat(this.checkName(token, file, this.conf.expectedConstant));
+                ret = ret.concat(this.checkName(token, file, this.conf.expectedConstant, this.regex.expectedConstant));
             }
         }
         return ret;
     }
-    checkName(token, file, expected) {
+    checkName(token, file, expected, regex) {
         const ret = [];
-        const regex = new RegExp(expected, "i");
         const name = token.getStr();
-        if (name_validator_1.NameValidator.violatesRule(name, regex, this.conf)) {
+        if (name_validator_1.NameValidator.violatesRule(name, regex, this.conf, this.regex.ignorePatterns)) {
             const message = this.getDescription(expected, name);
             const issue = issue_1.Issue.atToken(file, token, message, this.getMetadata().key, this.conf.severity);
             ret.push(issue);

package/build/src/rules/macro_naming.js

@@ -53,6 +53,7 @@ class MacroNaming extends _abap_rule_1.ABAPRule {
     constructor() {
         super(...arguments);
         this.conf = new MacroNamingConf();
+        this.regex = new RegExp(this.conf.pattern, "i");
     }
     getMetadata() {
         return {
@@ -72,10 +73,10 @@ END-OF-DEFINITION.`,
     }
     setConfig(conf) {
         this.conf = conf;
+        this.regex = new RegExp(this.conf.pattern, "i");
     }
     runParsed(file, obj) {
         const issues = [];
-        const testRegex = new RegExp(this.conf.pattern, "i");
         if (obj instanceof objects_1.TypePool) {
             return [];
         }
@@ -88,7 +89,7 @@ END-OF-DEFINITION.`,
                 continue;
             }
             const token = expr.getFirstToken();
-            if (testRegex.exec(token.getStr())) {
+            if (this.regex.exec(token.getStr())) {
                 continue;
             }
             else {