@abaplint/core 2.82.12 → 2.82.16

package/build/abaplint.d.ts

@@ -879,10 +879,7 @@ declare class ConcatenatedConstant extends Expression {
 
 declare class ConceptsOfPackage extends AbstractObject {
     getType(): string;
-    getAllowedNaming(): {
-        maxLength: number;
-        allowNamespace: boolean;
-    };
+    getAllowedNaming(): IAllowedNaming;
     getDescription(): string | undefined;
 }
 
@@ -2347,12 +2344,15 @@ declare interface IAliases {
     getAll(): readonly Alias[];
 }
 
+declare interface IAllowedNaming {
+    maxLength: number;
+    allowNamespace: boolean;
+    customRegex?: RegExp;
+}
+
 declare interface IArtifact {
     getType(): string;
-    getAllowedNaming(): {
-        maxLength: number;
-        allowNamespace: boolean;
-    };
+    getAllowedNaming(): IAllowedNaming;
 }
 
 declare interface IAttributes {
@@ -3150,7 +3150,7 @@ export declare class Issue {
     static atRow(file: IFile, row: number, message: string, key: string, severity?: Severity): Issue;
     static atStatement(file: IFile, statement: StatementNode, message: string, key: string, severity?: Severity, fix?: IEdit): Issue;
     static atPosition(file: IFile, start: Position, message: string, key: string, severity?: Severity, fix?: IEdit): Issue;
-    static atRowRange(file: IFile, row: number, startCol: number, endCol: number, message: string, key: string, severity?: Severity): Issue;
+    static atRowRange(file: IFile, row: number, startCol: number, endCol: number, message: string, key: string, severity?: Severity, fix?: IEdit): Issue;
     static atRange(file: IFile, start: Position, end: Position, message: string, key: string, severity?: Severity, fix?: IEdit): Issue;
     static atToken(file: IFile, token: Token, message: string, key: string, severity?: Severity, fix?: IEdit): Issue;
     static atIdentifier(identifier: Identifier, message: string, key: string, severity?: Severity, fix?: IEdit): Issue;
@@ -3608,10 +3608,7 @@ declare class Multiply implements IStatement {
 
 declare class Namespace extends AbstractObject {
     getType(): string;
-    getAllowedNaming(): {
-        maxLength: number;
-        allowNamespace: boolean;
-    };
+    getAllowedNaming(): IAllowedNaming;
     getDescription(): string | undefined;
 }
 
@@ -5911,10 +5908,7 @@ declare class WebDynproComponentConfiguration extends AbstractObject {
 
 declare class WebMIME extends AbstractObject {
     getType(): string;
-    getAllowedNaming(): {
-        maxLength: number;
-        allowNamespace: boolean;
-    };
+    getAllowedNaming(): IAllowedNaming;
     getDescription(): string | undefined;
 }
 

package/build/src/abap/5_syntax/statements/get_badi.js

@@ -7,7 +7,7 @@ const target_1 = require("../expressions/target");
 const dynamic_1 = require("../expressions/dynamic");
 class GetBadi {
     runSyntax(node, scope, filename) {
-        for (const s of node.findDirectExpressions(Expressions.Source)) {
+        for (const s of node.findAllExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
         for (const t of node.findDirectExpressions(Expressions.Target)) {

package/build/src/abap/5_syntax/structures/type_enum.js

@@ -11,7 +11,7 @@ const enum_type_1 = require("../../types/basic/enum_type");
 class TypeEnum {
     runSyntax(node, scope, filename) {
         var _a;
-        const values = [];
+        let values = [];
         const types = [];
         if (!(node.get() instanceof Structures.TypeEnum)) {
             throw new Error("TypeEnum, unexpected type");
@@ -61,6 +61,7 @@ class TypeEnum {
                     type: r.getType(),
                 });
             }
+            values = [];
             const id = new _typed_identifier_1.TypedIdentifier(stru.getFirstToken(), filename, new basic_1.StructureType(components), ["enum" /* Enum */]);
             values.push(id);
         }

package/build/src/issue.js

@@ -48,7 +48,7 @@ class Issue {
             severity,
         });
     }
-    static atRowRange(file, row, startCol, endCol, message, key, severity) {
+    static atRowRange(file, row, startCol, endCol, message, key, severity, fix) {
         const start = new position_1.Position(row, startCol);
         const end = new position_1.Position(row, endCol);
         severity = severity !== null && severity !== void 0 ? severity : severity_1.Severity.Error;
@@ -58,6 +58,7 @@ class Issue {
             key,
             start,
             end,
+            fix,
             severity,
         });
     }

package/build/src/objects/concepts_of_package.js

@@ -10,6 +10,7 @@ class ConceptsOfPackage extends _abstract_object_1.AbstractObject {
         return {
             maxLength: 30,
             allowNamespace: true,
+            customRegex: new RegExp(/^(\/[A-Z_\d]{3,8}\/)?[A-Z_-\d<> ]+$/i),
         };
     }
     getDescription() {

package/build/src/objects/namespace.js

@@ -10,6 +10,7 @@ class Namespace extends _abstract_object_1.AbstractObject {
         return {
             maxLength: 10,
             allowNamespace: true,
+            customRegex: new RegExp(/^\/[A-Z_\d]{3,8}\/$/i),
         };
     }
     getDescription() {

package/build/src/objects/web_mime.js

@@ -10,6 +10,7 @@ class WebMIME extends _abstract_object_1.AbstractObject {
         return {
             maxLength: 40,
             allowNamespace: true,
+            customRegex: new RegExp(/^[A-Z_-\d/<> ]+$/i),
         };
     }
     getDescription() {

package/build/src/registry.js

@@ -68,7 +68,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.82.12";
+        return "2.82.16";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/allowed_object_naming.js

@@ -30,19 +30,20 @@ class AllowedObjectNaming {
     }
     run(obj) {
         const allowed = obj.getAllowedNaming();
+        const name = obj.getName();
         let message = "";
-        if (obj.getName().length > allowed.maxLength) {
+        if (name.length > allowed.maxLength) {
             message = "Name exceeds max length";
         }
-        else if (allowed.allowNamespace === false && obj.getName().indexOf("/") >= 0) {
+        else if (allowed.allowNamespace === false && name.indexOf("/") >= 0) {
             message = "Namespace not allowed for object type";
         }
-        else if (obj.getType() === "NSPC") {
-            if (obj.getName().match(/^\/[A-Z_\d]{3,8}\/$/i) === null) {
+        else if (allowed.customRegex !== undefined) {
+            if (name.match(allowed.customRegex) === null) {
                 message = "Name not allowed";
             }
         }
-        else if (obj.getName().match(/^(\/[A-Z_\d]{3,8}\/)?[A-Z_-\d<> ]+$/i) === null) {
+        else if (name.match(/^(\/[A-Z_\d]{3,8}\/)?[A-Z_\d<> ]+$/i) === null) {
             message = "Name not allowed";
         }
         if (message.length > 0) {

package/build/src/rules/implement_methods.js

@@ -4,6 +4,7 @@ exports.ImplementMethods = exports.ImplementMethodsConf = 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 Statements = require("../abap/2_statements/statements");
 const Expressions = require("../abap/2_statements/expressions");
 const _irule_1 = require("./_irule");
@@ -22,6 +23,7 @@ class ImplementMethods extends _abap_rule_1.ABAPRule {
             key: "implement_methods",
             title: "Implement methods",
             shortDescription: `Checks for abstract methods and methods from interfaces which need implementing.`,
+            extendedInformation: `INCLUDE programs are only checked in connection with their main programs.`,
             tags: [_irule_1.RuleTag.Syntax, _irule_1.RuleTag.Quickfix],
         };
     }
@@ -36,6 +38,9 @@ class ImplementMethods extends _abap_rule_1.ABAPRule {
         if (file.getStructure() === undefined) {
             return [];
         }
+        else if (obj instanceof objects_1.Program && obj.isInclude() === true) {
+            return [];
+        }
         this.obj = obj;
         for (const classDefinition of file.getInfo().listClassDefinitions()) {
             const classImplementation = this.lookupImplementationInObject(classDefinition.name, obj);

package/build/src/rules/obsolete_statement.js

@@ -63,6 +63,8 @@ class ObsoleteStatementConf extends _basic_rule_config_1.BasicRuleConfig {
         this.callTransformation = true;
         /** Check for POSIX REGEX usage */
         this.regex = true;
+        /** Check for OCCURENCES vs OCCURRENCES usage */
+        this.occurences = true;
     }
 }
 exports.ObsoleteStatementConf = ObsoleteStatementConf;
@@ -113,7 +115,9 @@ SORT BY FS: https://help.sap.com/doc/abapdocu_752_index_htm/7.52/en-US/abapsort_
 
 CALL TRANSFORMATION OBJECTS: https://help.sap.com/doc/abapdocu_752_index_htm/7.52/en-US/abapcall_transformation_objects.htm
 
-POSIX REGEX: https://help.sap.com/doc/abapdocu_755_index_htm/7.55/en-US/index.htm`,
+POSIX REGEX: https://help.sap.com/doc/abapdocu_755_index_htm/7.55/en-US/index.htm
+
+OCCURENCES: check for OCCURENCES vs OCCURRENCES`,
         };
     }
     getConfig() {
@@ -270,6 +274,13 @@ POSIX REGEX: https://help.sap.com/doc/abapdocu_755_index_htm/7.55/en-US/index.ht
                     issues.push(issue);
                 }
             }
+            if (this.conf.occurences && sta instanceof Statements.Replace) {
+                const concat = staNode.concatTokens().toUpperCase();
+                if (concat.includes(" OCCURENCES ")) {
+                    const issue = issue_1.Issue.atStatement(file, staNode, "Use \"OCCURRENCES\"", this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
+                }
+            }
             if (configVersion >= version_1.Version.v756 && this.conf.regex) {
                 if (sta instanceof Statements.Find || sta instanceof Statements.Replace) {
                     if ((_c = staNode.findFirstExpression(Expressions.FindType)) === null || _c === void 0 ? void 0 : _c.concatTokens().includes("REGEX")) {

package/build/src/rules/space_before_colon.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpaceBeforeColon = exports.SpaceBeforeColonConf = void 0;
+const position_1 = require("../position");
+const edit_helper_1 = require("../edit_helper");
 const issue_1 = require("../issue");
 const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
@@ -19,7 +21,7 @@ class SpaceBeforeColon extends _abap_rule_1.ABAPRule {
             title: "Space before colon",
             shortDescription: `Checks that there are no spaces in front of colons in chained statements.`,
             extendedInformation: `https://docs.abapopenchecks.org/checks/80/`,
-            tags: [_irule_1.RuleTag.Whitespace, _irule_1.RuleTag.SingleFile],
+            tags: [_irule_1.RuleTag.Whitespace, _irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Quickfix],
             badExample: `DATA : foo TYPE string.`,
             goodExample: `DATA: foo TYPE string.`,
         };
@@ -44,8 +46,10 @@ class SpaceBeforeColon extends _abap_rule_1.ABAPRule {
             else if (token.getStr() === ":"
                 && prev.getRow() === token.getRow()
                 && prev.getCol() + prev.getStr().length < token.getCol()) {
-                const issue = issue_1.Issue.atRowRange(file, token.getRow(), prev.getEnd().getCol(), token.getStart().getCol(), this.getMessage(), this.getMetadata().key, this.conf.severity);
-                //        const issue = Issue.atToken(file, token, this.getMessage(), this.getMetadata().key);
+                const start = new position_1.Position(token.getRow(), prev.getEnd().getCol());
+                const end = new position_1.Position(token.getRow(), token.getStart().getCol());
+                const fix = edit_helper_1.EditHelper.deleteRange(file, start, end);
+                const issue = issue_1.Issue.atRowRange(file, start.getRow(), start.getCol(), end.getCol(), this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
                 issues.push(issue);
             }
             prev = token;

package/build/src/rules/unnecessary_chaining.js

@@ -5,6 +5,8 @@ const issue_1 = require("../issue");
 const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const _irule_1 = require("./_irule");
+const edit_helper_1 = require("../edit_helper");
+const _statement_1 = require("../abap/2_statements/statements/_statement");
 class UnnecessaryChainingConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.UnnecessaryChainingConf = UnnecessaryChainingConf;
@@ -19,7 +21,7 @@ class UnnecessaryChaining extends _abap_rule_1.ABAPRule {
             title: "Unnecessary Chaining",
             shortDescription: `Find unnecessary chaining, all statements are checked`,
             extendedInformation: ``,
-            tags: [_irule_1.RuleTag.SingleFile],
+            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Quickfix],
             badExample: `WRITE: bar.`,
             goodExample: `WRITE bar.`,
         };
@@ -31,7 +33,7 @@ class UnnecessaryChaining extends _abap_rule_1.ABAPRule {
         this.conf = conf;
     }
     runParsed(file) {
-        var _a, _b;
+        var _a;
         const issues = [];
         const statements = file.getStatements();
         for (let i = 0; i < statements.length; i++) {
@@ -39,16 +41,24 @@ class UnnecessaryChaining extends _abap_rule_1.ABAPRule {
             if (colon === undefined) {
                 continue;
             }
-            const next = (_a = statements[i + 1]) === null || _a === void 0 ? void 0 : _a.getColon();
-            const prev = (_b = statements[i - 1]) === null || _b === void 0 ? void 0 : _b.getColon();
+            // find the next non Comment statement
+            let j = 1;
+            let nextStatement = statements[i + j];
+            while ((nextStatement === null || nextStatement === void 0 ? void 0 : nextStatement.get()) instanceof _statement_1.Comment) {
+                j++;
+                nextStatement = statements[i + j];
+            }
+            const next = nextStatement === null || nextStatement === void 0 ? void 0 : nextStatement.getColon();
+            const prev = (_a = statements[i - 1]) === null || _a === void 0 ? void 0 : _a.getColon();
             if (next !== undefined && colon.getStart().equals(next.getStart())) {
                 continue;
             }
             else if (prev !== undefined && colon.getStart().equals(prev.getStart())) {
                 continue;
             }
+            const fix = edit_helper_1.EditHelper.deleteRange(file, colon.getStart(), colon.getEnd());
             const message = "Unnecessary chaining";
-            const issue = issue_1.Issue.atStatement(file, statements[i], message, this.getMetadata().key);
+            const issue = issue_1.Issue.atStatement(file, statements[i], message, this.getMetadata().key, this.conf.severity, fix);
             issues.push(issue);
         }
         return issues;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.82.12",
+    "version": "2.82.16",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -45,17 +45,17 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.18.19",
-        "@types/chai": "^4.2.22",
+        "@microsoft/api-extractor": "^7.19.2",
+        "@types/chai": "^4.3.0",
         "@types/mocha": "^9.0.0",
-        "@types/node": "^16.11.11",
+        "@types/node": "^16.11.12",
         "chai": "^4.3.4",
-        "eslint": "^8.3.0",
+        "eslint": "^8.4.1",
         "mocha": "^9.1.3",
         "c8": "^7.10.0",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^0.97.0",
-        "typescript": "^4.5.2"
+        "typescript": "^4.5.3"
     },
     "dependencies": {
         "fast-xml-parser": "^3.21.1",