@abaplint/core 2.113.0 → 2.113.2

package/build/abaplint.d.ts

@@ -2679,6 +2679,8 @@ declare class FunctionExportingParameter extends Expression {
 declare class FunctionGroup extends ABAPObject {
     private includes;
     private modules;
+    private description;
+    private dynpros;
     getType(): string;
     getDescription(): string | undefined;
     setDirty(): void;
@@ -2686,6 +2688,7 @@ declare class FunctionGroup extends ABAPObject {
         maxLength: number;
         allowNamespace: boolean;
     };
+    getDynpros(): DynproList;
     getSequencedFiles(): readonly ABAPFile[];
     getModules(): FunctionModuleDefinition[];
     getIncludeFiles(): {
@@ -4901,9 +4904,6 @@ declare namespace Objects {
         Package,
         Parameter,
         PersonalizationObject,
-        DynproField,
-        DynproHeader,
-        DynproList,
         Program,
         ProxyObject,
         PushChannel,

package/build/src/abap/flow/selection_events.js

@@ -16,6 +16,8 @@ exports.DECLARATION_STUFF = [
     Statements.Data,
     Statements.DataBegin,
     Statements.Constant,
+    Statements.Tables,
+    Statements.Include, // this is not super correct, but anyhow
     Statements.Parameter,
     Statements.SelectionScreen,
     Statements.ConstantBegin,

package/build/src/objects/_dynpros.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseDynpros = parseDynpros;
+const xml_utils_1 = require("../xml_utils");
+function parseDynpros(parsed) {
+    var _a, _b, _c, _d;
+    const dynpros = [];
+    const xmlDynpros = (_c = (_b = (_a = parsed.abapGit) === null || _a === void 0 ? void 0 : _a["asx:abap"]) === null || _b === void 0 ? void 0 : _b["asx:values"]) === null || _c === void 0 ? void 0 : _c.DYNPROS;
+    if (xmlDynpros !== undefined) {
+        for (const d of (0, xml_utils_1.xmlToArray)(xmlDynpros.item)) {
+            const fields = [];
+            for (const f of (0, xml_utils_1.xmlToArray)((_d = d.FIELDS) === null || _d === void 0 ? void 0 : _d.RPY_DYFATC)) {
+                fields.push({
+                    name: f.NAME,
+                    type: f.TYPE,
+                    length: f.LENGTH,
+                });
+            }
+            dynpros.push({
+                number: d.HEADER.SCREEN,
+                fields: fields,
+            });
+        }
+    }
+    return dynpros;
+}
+//# sourceMappingURL=_dynpros.js.map

package/build/src/objects/function_group.js

@@ -5,18 +5,23 @@ const _abap_object_1 = require("./_abap_object");
 const types_1 = require("../abap/types");
 const xml_utils_1 = require("../xml_utils");
 const fast_xml_parser_1 = require("fast-xml-parser");
+const _dynpros_1 = require("./_dynpros");
 class FunctionGroup extends _abap_object_1.ABAPObject {
     constructor() {
         super(...arguments);
         this.includes = undefined;
         this.modules = undefined;
+        this.description = undefined;
+        this.dynpros = undefined;
     }
     getType() {
         return "FUGR";
     }
     getDescription() {
-        // todo
-        return undefined;
+        if (this.description === undefined) {
+            this.parseXML();
+        }
+        return this.description;
     }
     setDirty() {
         super.setDirty();
@@ -29,6 +34,12 @@ class FunctionGroup extends _abap_object_1.ABAPObject {
             allowNamespace: true,
         };
     }
+    getDynpros() {
+        if (this.dynpros === undefined) {
+            this.parseXML();
+        }
+        return this.dynpros || [];
+    }
     getSequencedFiles() {
         const main = this.getMainABAPFile();
         if (main === undefined) {
@@ -130,22 +141,24 @@ class FunctionGroup extends _abap_object_1.ABAPObject {
     }
     /////////////////////////////////
     parseXML() {
-        var _a, _b;
+        var _a, _b, _c;
         this.includes = [];
         this.modules = [];
         const parsed = this.parseRaw2();
         if (parsed === undefined) {
             return;
         }
+        this.description = (_a = parsed.abapGit["asx:abap"]["asx:values"]) === null || _a === void 0 ? void 0 : _a.AREAT;
+        this.dynpros = (0, _dynpros_1.parseDynpros)(parsed);
         // INCLUDES
-        const includes = (_a = parsed.abapGit["asx:abap"]["asx:values"]) === null || _a === void 0 ? void 0 : _a.INCLUDES;
+        const includes = (_b = parsed.abapGit["asx:abap"]["asx:values"]) === null || _b === void 0 ? void 0 : _b.INCLUDES;
         if (includes !== undefined) {
             for (const i of (0, xml_utils_1.xmlToArray)(includes.SOBJ_NAME)) {
                 this.includes.push(i);
             }
         }
         // FUNCTION MODULES
-        const functions = (_b = parsed.abapGit["asx:abap"]["asx:values"]) === null || _b === void 0 ? void 0 : _b.FUNCTIONS;
+        const functions = (_c = parsed.abapGit["asx:abap"]["asx:values"]) === null || _c === void 0 ? void 0 : _c.FUNCTIONS;
         for (const module of (0, xml_utils_1.xmlToArray)(functions === null || functions === void 0 ? void 0 : functions.item)) {
             this.modules.push(new types_1.FunctionModuleDefinition(module));
         }

package/build/src/objects/program.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Program = void 0;
 const _abap_object_1 = require("./_abap_object");
-const xml_utils_1 = require("../xml_utils");
+const _dynpros_1 = require("./_dynpros");
 class Program extends _abap_object_1.ABAPObject {
     getType() {
         return "PROG";
@@ -38,11 +38,10 @@ class Program extends _abap_object_1.ABAPObject {
     }
     getDynpros() {
         this.parseXML();
-        return this.parsedXML.dynpros;
+        return this.parsedXML.dynpros || [];
     }
     ////////////////////////////
     parseXML() {
-        var _a, _b, _c, _d;
         if (this.parsedXML !== undefined) {
             return;
         }
@@ -56,24 +55,7 @@ class Program extends _abap_object_1.ABAPObject {
             };
             return;
         }
-        const dynpros = [];
-        const xmlDynpros = (_c = (_b = (_a = parsed.abapGit) === null || _a === void 0 ? void 0 : _a["asx:abap"]) === null || _b === void 0 ? void 0 : _b["asx:values"]) === null || _c === void 0 ? void 0 : _c.DYNPROS;
-        if (xmlDynpros !== undefined) {
-            for (const d of (0, xml_utils_1.xmlToArray)(xmlDynpros.item)) {
-                const fields = [];
-                for (const f of (0, xml_utils_1.xmlToArray)((_d = d.FIELDS) === null || _d === void 0 ? void 0 : _d.RPY_DYFATC)) {
-                    fields.push({
-                        name: f.NAME,
-                        type: f.TYPE,
-                        length: f.LENGTH,
-                    });
-                }
-                dynpros.push({
-                    number: d.HEADER.SCREEN,
-                    fields: fields,
-                });
-            }
-        }
+        const dynpros = (0, _dynpros_1.parseDynpros)(parsed);
         this.parsedXML = {
             isInclude: file ? file.getRaw().includes("<SUBC>I</SUBC>") : false,
             isModulePool: file ? file.getRaw().includes("<SUBC>M</SUBC>") : false,

package/build/src/registry.js

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

package/build/src/rules/add_test_attributes.js

@@ -21,25 +21,25 @@ class AddTestAttributes extends _abap_rule_1.ABAPRule {
             title: "Add test attributes for tests classes with test methods",
             shortDescription: `Add test attributes DURATION and RISK LEVEL for tests classes with test methods`,
             tags: [_irule_1.RuleTag.SingleFile],
-            badExample: `CLASS ltcl_test DEFINITION FINAL FOR TESTING.
+            badExample: `CLASS ltcl_test1 DEFINITION FINAL FOR TESTING.
   PUBLIC SECTION.
   PROTECTED SECTION.
   PRIVATE SECTION.
     METHODS test FOR TESTING RAISING cx_static_check.
 ENDCLASS.
 
-CLASS ltcl_test IMPLEMENTATION.
+CLASS ltcl_test1 IMPLEMENTATION.
   METHOD test.
   ENDMETHOD.
 ENDCLASS.`,
-            goodExample: `CLASS ltcl_test DEFINITION FINAL FOR TESTING DURATION SHORT RISK LEVEL HARMLESS.
+            goodExample: `CLASS ltcl_test2 DEFINITION FINAL FOR TESTING DURATION SHORT RISK LEVEL HARMLESS.
   PUBLIC SECTION.
   PROTECTED SECTION.
   PRIVATE SECTION.
     METHODS test FOR TESTING RAISING cx_static_check.
 ENDCLASS.
 
-CLASS ltcl_test IMPLEMENTATION.
+CLASS ltcl_test2 IMPLEMENTATION.
   METHOD test.
   ENDMETHOD.
 ENDCLASS.`,

package/build/src/rules/empty_event.js

@@ -23,12 +23,11 @@ class EmptyEvent extends _abap_rule_1.ABAPRule {
             shortDescription: `Empty selection screen or list processing event block`,
             extendedInformation: ``,
             tags: [_irule_1.RuleTag.SingleFile],
-            badExample: `REPORT zfoo.
-START-OF-SELECTION.
-  PERFORM sdf.
-  COMMIT WORK.
+            badExample: `
+INITIALIZATION.
+  WRITE 'hello'.
 END-OF-SELECTION.`,
-            goodExample: `REPORT zfoo.
+            goodExample: `
 START-OF-SELECTION.
   PERFORM sdf.
   COMMIT WORK.`,
@@ -53,6 +52,9 @@ START-OF-SELECTION.
         let children = [];
         for (const s of stru.getChildren() || []) {
             if (selection_events_1.SELECTION_EVENTS.some(f => s.get() instanceof f)) {
+                if (currentEvent !== undefined && children.length === 0) {
+                    issues.push(issue_1.Issue.atStatement(file, currentEvent, "Empty event", this.getMetadata().key, this.getConfig().severity));
+                }
                 children = [];
                 currentEvent = s;
             }
@@ -65,7 +67,11 @@ START-OF-SELECTION.
                 children.push(s);
             }
             else {
+                if (currentEvent !== undefined && children.length === 0) {
+                    issues.push(issue_1.Issue.atStatement(file, currentEvent, "Empty event", this.getMetadata().key, this.getConfig().severity));
+                }
                 children = [];
+                currentEvent = undefined;
             }
         }
         if (currentEvent !== undefined && children.length === 0) {

package/build/src/rules/implicit_start_of_selection.js

@@ -28,7 +28,7 @@ https://help.sap.com/doc/abapdocu_751_index_htm/7.51/en-us/abapstart-of-selectio
             tags: [_irule_1.RuleTag.SingleFile],
             badExample: `REPORT zfoo.
 WRITE 'hello'.`,
-            goodExample: `REPORT zfoo.
+            goodExample: `
 START-OF-SELECTION.
   WRITE 'hello'.`,
         };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.113.0",
+    "version": "2.113.2",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",