@abaplint/core 2.102.40 → 2.102.42

package/build/abaplint.d.ts

@@ -2949,6 +2949,7 @@ export declare const enum IdentifierMeta {
     EventParameter = "event_parameter",
     FormParameter = "form_parameter",
     ReadOnly = "read_only",
+    Abstract = "abstract",
     PassByValue = "pass_by_value",
     InlineDefinition = "inline",
     BuiltIn = "built-in",
@@ -3113,9 +3114,10 @@ declare interface IMethodDefinitions {
 }
 
 export declare interface IMethodLengthResult {
+    className: string;
     name: string;
     count: number;
-    file: IFile;
+    file: ABAPFile;
     pos: Position;
 }
 
@@ -4126,7 +4128,7 @@ declare class MethodParameters_2 implements IMethodParameters {
     private readonly exceptions;
     private readonly defaults;
     private readonly filename;
-    constructor(node: StatementNode, filename: string, scope: CurrentScope);
+    constructor(node: StatementNode, filename: string, scope: CurrentScope, abstractMethod: boolean);
     getFilename(): string;
     getOptional(): string[];
     getAll(): TypedIdentifier[];

package/build/src/abap/2_statements/expressions/find_type.js

@@ -5,7 +5,7 @@ const version_1 = require("../../../version");
 const combi_1 = require("../combi");
 class FindType extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.opt)((0, combi_1.alt)("REGEX", "SUBSTRING", (0, combi_1.ver)(version_1.Version.v755, "PCRE")));
+        return (0, combi_1.opt)((0, combi_1.alt)("REGEX", "SUBSTRING", (0, combi_1.ver)(version_1.Version.v755, "PCRE", version_1.Version.OpenABAP)));
     }
 }
 exports.FindType = FindType;

package/build/src/abap/2_statements/statements/open_cursor.js

@@ -6,7 +6,7 @@ const expressions_1 = require("../expressions");
 const version_1 = require("../../../version");
 class OpenCursor {
     getMatcher() {
-        const ret = (0, combi_1.seq)("OPEN CURSOR", (0, combi_1.optPrio)("WITH HOLD"), expressions_1.SQLTarget, "FOR", expressions_1.Select, (0, combi_1.optPrio)(expressions_1.DatabaseConnection), (0, combi_1.optPrio)(expressions_1.SQLHints));
+        const ret = (0, combi_1.seq)("OPEN CURSOR", (0, combi_1.optPrio)("WITH HOLD"), expressions_1.SQLTarget, "FOR", expressions_1.Select);
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }

package/build/src/abap/types/method_definition.js

@@ -65,7 +65,7 @@ class MethodDefinition extends _identifier_1.Identifier {
             this.exceptions.push(name);
         }
         this.visibility = visibility;
-        this.parameters = new method_parameters_1.MethodParameters(node, this.filename, scope);
+        this.parameters = new method_parameters_1.MethodParameters(node, this.filename, scope, this.abstract);
     }
     getVisibility() {
         return this.visibility;

package/build/src/abap/types/method_parameters.js

@@ -16,7 +16,7 @@ const _scope_type_1 = require("../5_syntax/_scope_type");
 // this.exceptions = [];
 // also consider RAISING vs EXCEPTIONS
 class MethodParameters {
-    constructor(node, filename, scope) {
+    constructor(node, filename, scope, abstractMethod) {
         if (!(node.get() instanceof method_def_1.MethodDef)) {
             throw new Error("MethodDefinition, expected MethodDef as part of input node");
         }
@@ -32,7 +32,7 @@ class MethodParameters {
         // need the scope for LIKE typing inside method parameters
         const parentName = scope.getName();
         scope.push(_scope_type_1.ScopeType.MethodDefinition, "method definition", node.getStart(), filename);
-        this.parse(node, scope, filename, parentName);
+        this.parse(node, scope, filename, parentName, abstractMethod);
         scope.pop(node.getEnd());
     }
     getFilename() {
@@ -108,7 +108,7 @@ class MethodParameters {
         return this.defaults[parameter.toUpperCase()];
     }
     ///////////////////
-    parse(node, scope, filename, parentName) {
+    parse(node, scope, filename, parentName, abstractMethod) {
         var _a, _b;
         const handler = node.findFirstExpression(Expressions.EventHandler);
         if (handler) {
@@ -148,7 +148,7 @@ class MethodParameters {
         }
         const importing = node.findFirstExpression(Expressions.MethodDefImporting);
         if (importing) {
-            this.add(this.importing, importing, scope, ["importing" /* IdentifierMeta.MethodImporting */]);
+            this.add(this.importing, importing, scope, ["importing" /* IdentifierMeta.MethodImporting */], abstractMethod);
             if (importing.concatTokens().toUpperCase().includes(" PREFERRED PARAMETER")) {
                 this.preferred = importing.getLastToken().getStr().toUpperCase();
                 if (this.preferred.startsWith("!")) {
@@ -158,11 +158,11 @@ class MethodParameters {
         }
         const exporting = node.findFirstExpression(Expressions.MethodDefExporting);
         if (exporting) {
-            this.add(this.exporting, exporting, scope, ["exporting" /* IdentifierMeta.MethodExporting */]);
+            this.add(this.exporting, exporting, scope, ["exporting" /* IdentifierMeta.MethodExporting */], abstractMethod);
         }
         const changing = node.findFirstExpression(Expressions.MethodDefChanging);
         if (changing) {
-            this.add(this.changing, changing, scope, ["changing" /* IdentifierMeta.MethodChanging */]);
+            this.add(this.changing, changing, scope, ["changing" /* IdentifierMeta.MethodChanging */], abstractMethod);
         }
         const returning = node.findFirstExpression(Expressions.MethodDefReturning);
         if (returning) {
@@ -208,7 +208,7 @@ class MethodParameters {
             this.importing.push(...tempImporting);
         }
     }
-    add(target, source, scope, meta) {
+    add(target, source, scope, meta, abstractMethod) {
         var _a;
         for (const opt of source.findAllExpressions(Expressions.MethodParamOptional)) {
             const p = opt.findDirectExpression(Expressions.MethodParam);
@@ -222,6 +222,9 @@ class MethodParameters {
             else if (meta.includes("importing" /* IdentifierMeta.MethodImporting */)) {
                 extraMeta.push("read_only" /* IdentifierMeta.ReadOnly */);
             }
+            if (abstractMethod === true) {
+                extraMeta.push("abstract" /* IdentifierMeta.Abstract */);
+            }
             const id = new method_param_1.MethodParam().runSyntax(p, scope, this.filename, [...meta, ...extraMeta]);
             scope.addIdentifier(id);
             target.push(id);

package/build/src/registry.js

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

package/build/src/rules/method_length.js

@@ -34,7 +34,9 @@ class MethodLength {
             key: "method_length",
             title: "Method/Form Length",
             shortDescription: `Checks relating to method/form length.`,
-            extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#keep-methods-small`,
+            extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#keep-methods-small
+
+Abstract methods without statements are considered okay.`,
             tags: [_irule_1.RuleTag.Styleguide, _irule_1.RuleTag.SingleFile],
         };
     }
@@ -79,6 +81,9 @@ class MethodLength {
                 continue;
             }
             if (s.count === 0 && this.conf.errorWhenEmpty === true) {
+                if (this.isAbstract(s)) {
+                    continue;
+                }
                 const issue = issue_1.Issue.atPosition(s.file, s.pos, this.getDescription(IssueType.EmptyMethod, "0", type), this.getMetadata().key, this.conf.severity);
                 issues.push(issue);
                 continue;
@@ -91,6 +96,10 @@ class MethodLength {
         }
         return issues;
     }
+    isAbstract(result) {
+        const cdef = result.file.getInfo().getClassDefinitionByName(result.className);
+        return (cdef === null || cdef === void 0 ? void 0 : cdef.isAbstract) === true;
+    }
 }
 exports.MethodLength = MethodLength;
 //# sourceMappingURL=method_length.js.map

package/build/src/rules/unused_variables.js

@@ -19,6 +19,8 @@ class UnusedVariablesConf extends _basic_rule_config_1.BasicRuleConfig {
          * @uniqueItems true
         */
         this.skipNames = [];
+        /** skip parameters from abstract methods */
+        this.skipAbstract = false;
     }
 }
 exports.UnusedVariablesConf = UnusedVariablesConf;
@@ -161,6 +163,9 @@ Errors found in INCLUDES are reported for the main program.`,
                     && this.conf.skipNames.some((a) => a.toUpperCase() === name)) {
                     continue;
                 }
+                else if (this.conf.skipAbstract === true && meta.includes("abstract" /* IdentifierMeta.Abstract */)) {
+                    continue;
+                }
                 else if (name === "ME"
                     || name === "SUPER"
                     || meta.includes("selection_screen_tab" /* IdentifierMeta.SelectionScreenTab */)

package/build/src/utils/form_length_stats.js

@@ -26,7 +26,7 @@ class FormLengthStats {
                 }
                 else if (type instanceof Statements.EndForm) {
                     if (pos) {
-                        res.push({ name, count, file, pos });
+                        res.push({ name: name, className: "", count, file, pos });
                     }
                     else {
                         continue;

package/build/src/utils/method_length_stats.js

@@ -2,31 +2,37 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MethodLengthStats = void 0;
 const Statements = require("../abap/2_statements/statements");
+const Expressions = require("../abap/2_statements/expressions");
 const expressions_1 = require("../abap/2_statements/expressions");
 const _abap_object_1 = require("../objects/_abap_object");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
 class MethodLengthStats {
     static run(obj) {
+        var _a;
         const res = [];
         let pos = undefined;
-        let name = "";
+        let methodName = "";
         let count = 0;
         let method = false;
         if (!(obj instanceof _abap_object_1.ABAPObject)) {
             return [];
         }
         for (const file of obj.getABAPFiles()) {
+            let className = "";
             for (const stat of file.getStatements()) {
                 const type = stat.get();
                 if (type instanceof Statements.MethodImplementation) {
                     pos = stat.getFirstToken().getStart();
-                    name = this.findName(stat);
+                    methodName = this.findName(stat);
                     method = true;
                     count = 0;
                 }
+                else if (type instanceof Statements.ClassImplementation) {
+                    className = ((_a = stat.findFirstExpression(Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "INTERNAL_ERROR";
+                }
                 else if (type instanceof Statements.EndMethod) {
                     if (pos) {
-                        res.push({ name, count, file, pos });
+                        res.push({ name: methodName, className, count, file, pos });
                     }
                     else {
                         continue;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.102.40",
+    "version": "2.102.42",
     "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.36.4",
+        "@microsoft/api-extractor": "^7.37.0",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^20.6.0",
+        "@types/node": "^20.6.2",
         "chai": "^4.3.8",
         "eslint": "^8.49.0",
         "mocha": "^10.2.0",