@abaplint/core 2.105.17 → 2.105.18

package/README.md

@@ -1,7 +1,7 @@
-# @abaplint/core
-
-[abaplint](https://abaplint.org) core library
-
-Exposes functionality like the parser and rules, which can be used in other projects.
-
+# @abaplint/core
+
+[abaplint](https://abaplint.org) core library
+
+Exposes functionality like the parser and rules, which can be used in other projects.
+
 For more information see https://github.com/abaplint/abaplint

package/build/abaplint.d.ts

@@ -1378,7 +1378,7 @@ export declare class CurrentScope {
     addInterfaceDefinition(i: IInterfaceDefinition): void;
     addNamedIdentifier(name: string, identifier: TypedIdentifier): void;
     addIdentifier(identifier: TypedIdentifier | undefined): void;
-    addDeferred(token: Token | undefined): void;
+    addDeferred(token: Token | undefined, type: "CLAS" | "INTF"): void;
     addListPrefix(identifiers: readonly TypedIdentifier[], prefix: string): void;
     addList(identifiers: readonly TypedIdentifier[]): void;
     addReference(usage: Token | undefined, referencing: Identifier | undefined, type: ReferenceType | ReferenceType[] | undefined, filename: string, extra?: IReferenceExtras): void;
@@ -1631,6 +1631,11 @@ declare class Default extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare type DeferredInformation = {
+    token: Token;
+    ooType: "CLAS" | "INTF";
+};
+
 declare class Define implements IStructure {
     getMatcher(): IStructureRunnable;
 }
@@ -3705,7 +3710,7 @@ declare interface IScopeData {
         [name: string]: TypedIdentifier;
     };
     deferred: {
-        [name: string]: Token;
+        [name: string]: DeferredInformation;
     };
     cdefs: {
         [name: string]: IClassDefinition;
@@ -5702,7 +5707,10 @@ export declare class SpaghettiScopeNode extends ScopeData implements ISpaghettiS
         end: Position;
     };
     setEnd(end: Position): void;
-    findDeferred(name: string): Identifier | undefined;
+    findDeferred(name: string): {
+        id: Identifier | undefined;
+        ooType: "CLAS" | "INTF";
+    } | undefined;
     findClassDefinition(name: string): IClassDefinition | undefined;
     listClassDefinitions(): IClassDefinition[];
     listInterfaceDefinitions(): IInterfaceDefinition[];

package/build/adhoc/syntax_performance.js

@@ -5,175 +5,175 @@ const fs = require("fs");
 console.log("========================");
 const file1 = new src_1.MemoryFile("abapgit.prog.abap", fs.readFileSync("./lexer_performance.abap", "utf-8"));
 const reg = new src_1.Registry().addFile(file1);
-reg.addFile(new src_1.MemoryFile("cx_root.clas.abap", `
-CLASS cx_root DEFINITION ABSTRACT PUBLIC.
-  PUBLIC SECTION.
-    DATA previous TYPE REF TO cx_root.
-    DATA textid   TYPE c LENGTH 32.
-
-    METHODS constructor
-      IMPORTING
-        textid   LIKE textid OPTIONAL
-        previous TYPE REF TO cx_root OPTIONAL.
-
-    METHODS get_source_position
-      EXPORTING
-        program_name TYPE string
-        include_name TYPE string
-        source_line  TYPE i.
-
-    INTERFACES if_message.
-    ALIASES get_longtext FOR if_message~get_longtext.
-    ALIASES get_text FOR if_message~get_text.
-
-ENDCLASS.
-
-CLASS cx_root IMPLEMENTATION.
-
-  METHOD constructor.
-  ENDMETHOD.
-
-  METHOD get_source_position.
-  ENDMETHOD.
-
-  METHOD if_message~get_longtext.
-  ENDMETHOD.
-
-  METHOD if_message~get_text.
-  ENDMETHOD.
-
+reg.addFile(new src_1.MemoryFile("cx_root.clas.abap", `
+CLASS cx_root DEFINITION ABSTRACT PUBLIC.
+  PUBLIC SECTION.
+    DATA previous TYPE REF TO cx_root.
+    DATA textid   TYPE c LENGTH 32.
+
+    METHODS constructor
+      IMPORTING
+        textid   LIKE textid OPTIONAL
+        previous TYPE REF TO cx_root OPTIONAL.
+
+    METHODS get_source_position
+      EXPORTING
+        program_name TYPE string
+        include_name TYPE string
+        source_line  TYPE i.
+
+    INTERFACES if_message.
+    ALIASES get_longtext FOR if_message~get_longtext.
+    ALIASES get_text FOR if_message~get_text.
+
+ENDCLASS.
+
+CLASS cx_root IMPLEMENTATION.
+
+  METHOD constructor.
+  ENDMETHOD.
+
+  METHOD get_source_position.
+  ENDMETHOD.
+
+  METHOD if_message~get_longtext.
+  ENDMETHOD.
+
+  METHOD if_message~get_text.
+  ENDMETHOD.
+
 ENDCLASS.`));
-reg.addFile(new src_1.MemoryFile("cx_static_check.clas.abap", `
-CLASS cx_static_check DEFINITION PUBLIC INHERITING FROM cx_root.
-  PUBLIC SECTION.
-    METHODS constructor
-      IMPORTING
-        textid   LIKE textid OPTIONAL
-        previous TYPE REF TO cx_root OPTIONAL.
-ENDCLASS.
-
-CLASS cx_static_check IMPLEMENTATION.
-  METHOD constructor.
-  ENDMETHOD.
+reg.addFile(new src_1.MemoryFile("cx_static_check.clas.abap", `
+CLASS cx_static_check DEFINITION PUBLIC INHERITING FROM cx_root.
+  PUBLIC SECTION.
+    METHODS constructor
+      IMPORTING
+        textid   LIKE textid OPTIONAL
+        previous TYPE REF TO cx_root OPTIONAL.
+ENDCLASS.
+
+CLASS cx_static_check IMPLEMENTATION.
+  METHOD constructor.
+  ENDMETHOD.
 ENDCLASS.`));
-reg.addFile(new src_1.MemoryFile("if_message.intf.abap", `
-INTERFACE if_message PUBLIC.
-  METHODS get_text RETURNING VALUE(result) TYPE string.
-
-  METHODS get_longtext
-    IMPORTING preserve_newlines TYPE abap_bool OPTIONAL
-    RETURNING VALUE(result) TYPE string.
+reg.addFile(new src_1.MemoryFile("if_message.intf.abap", `
+INTERFACE if_message PUBLIC.
+  METHODS get_text RETURNING VALUE(result) TYPE string.
+
+  METHODS get_longtext
+    IMPORTING preserve_newlines TYPE abap_bool OPTIONAL
+    RETURNING VALUE(result) TYPE string.
 ENDINTERFACE.`));
-reg.addFile(new src_1.MemoryFile("if_t100_message.intf.abap", `
-INTERFACE if_t100_message PUBLIC.
-
-  DATA t100key TYPE scx_t100key.
-
-  CONSTANTS:
-    BEGIN OF default_textid,
-      msgid TYPE symsgid VALUE 'AB',
-      msgno TYPE symsgno VALUE '123',
-      attr1 TYPE scx_attrname VALUE '',
-      attr2 TYPE scx_attrname VALUE '',
-      attr3 TYPE scx_attrname VALUE '',
-      attr4 TYPE scx_attrname VALUE '',
-    END OF default_textid.
-
+reg.addFile(new src_1.MemoryFile("if_t100_message.intf.abap", `
+INTERFACE if_t100_message PUBLIC.
+
+  DATA t100key TYPE scx_t100key.
+
+  CONSTANTS:
+    BEGIN OF default_textid,
+      msgid TYPE symsgid VALUE 'AB',
+      msgno TYPE symsgno VALUE '123',
+      attr1 TYPE scx_attrname VALUE '',
+      attr2 TYPE scx_attrname VALUE '',
+      attr3 TYPE scx_attrname VALUE '',
+      attr4 TYPE scx_attrname VALUE '',
+    END OF default_textid.
+
 ENDINTERFACE.`));
-reg.setConfig(new src_1.Config(`
-{
-  "global": {
-    "files": "/src/**/*.*"
-  },
-  "dependencies": [],
-  "syntax": {
-    "version": "v702",
-    "errorNamespace": "^(Z|Y|LCL_|TY_|LIF_)",
-    "globalConstants": [
-      "abap_func_exporting",
-      "abap_func_tables",
-      "cssf_formtype_text",
-      "icon_abap",
-      "icon_adopt",
-      "icon_change",
-      "icon_create",
-      "icon_delete",
-      "icon_display_text",
-      "icon_folder",
-      "icon_led_green",
-      "icon_led_inactive",
-      "icon_led_red",
-      "icon_led_yellow",
-      "icon_message_information",
-      "icon_okay",
-      "icon_set_state",
-      "icon_stack",
-      "icon_system_help",
-      "icon_workflow_fork",
-      "seoc_category_exception",
-      "seoc_category_webdynpro_class",
-      "seoc_exposure_private",
-      "seoc_exposure_protected",
-      "seoc_exposure_public",
-      "seoc_state_implemented",
-      "seoc_version_active",
-      "seoc_version_deleted",
-      "seoc_version_inactive",
-      "seok_access_free",
-      "seok_access_modify",
-      "seox_false",
-      "seok_pgmid_r3tr",
-      "seoo_cmptype_type",
-      "seoo_cmptype_event",
-      "seoo_cmptype_method",
-      "seoo_cmptype_attribute",
-      "seop_ext_class_locals_def",
-      "seop_ext_class_locals_imp",
-      "seop_ext_class_macros",
-      "seop_ext_class_testclasses",
-      "seop_incextapp_definition",
-      "seop_incextapp_implementation",
-      "seop_incextapp_macros",
-      "seop_incextapp_testclasses",
-      "seos_scotype_exception",
-      "seos_scotype_parameter",
-      "seox_true",
-      "sews_c_vif_version",
-      "skwfc_obtype_folder",
-      "skwfc_obtype_loio",
-      "so2_controller",
-      "icon_no_status",
-      "icon_package_standard",
-      "srext_ext_class_pool",
-      "srext_ext_interface_pool",
-      "ststc_c_type_dialog",
-      "ststc_c_type_object",
-      "ststc_c_type_parameters",
-      "ststc_c_type_report",
-      "swbm_c_op_delete_no_dialog",
-      "swbm_c_type_ddic_db_tabxinx",
-      "swbm_c_type_wdy_application",
-      "swbm_version_active",
-      "swbm_version_inactive",
-      "wbmr_c_skwf_folder_class",
-      "wdyn_limu_component_controller",
-      "wdyn_limu_component_definition",
-      "wdyn_limu_component_view"
-    ]
-  },
-  "rules": {
-    "begin_end_names": true,
-    "check_ddic": true,
-    "check_include": true,
-    "check_syntax": true,
-    "global_class": true,
-    "implement_methods": true,
-    "method_implemented_twice": true,
-    "parser_error": true,
-    "superclass_final": true,
-    "unknown_types": true,
-    "xml_consistency": true
-  }
+reg.setConfig(new src_1.Config(`
+{
+  "global": {
+    "files": "/src/**/*.*"
+  },
+  "dependencies": [],
+  "syntax": {
+    "version": "v702",
+    "errorNamespace": "^(Z|Y|LCL_|TY_|LIF_)",
+    "globalConstants": [
+      "abap_func_exporting",
+      "abap_func_tables",
+      "cssf_formtype_text",
+      "icon_abap",
+      "icon_adopt",
+      "icon_change",
+      "icon_create",
+      "icon_delete",
+      "icon_display_text",
+      "icon_folder",
+      "icon_led_green",
+      "icon_led_inactive",
+      "icon_led_red",
+      "icon_led_yellow",
+      "icon_message_information",
+      "icon_okay",
+      "icon_set_state",
+      "icon_stack",
+      "icon_system_help",
+      "icon_workflow_fork",
+      "seoc_category_exception",
+      "seoc_category_webdynpro_class",
+      "seoc_exposure_private",
+      "seoc_exposure_protected",
+      "seoc_exposure_public",
+      "seoc_state_implemented",
+      "seoc_version_active",
+      "seoc_version_deleted",
+      "seoc_version_inactive",
+      "seok_access_free",
+      "seok_access_modify",
+      "seox_false",
+      "seok_pgmid_r3tr",
+      "seoo_cmptype_type",
+      "seoo_cmptype_event",
+      "seoo_cmptype_method",
+      "seoo_cmptype_attribute",
+      "seop_ext_class_locals_def",
+      "seop_ext_class_locals_imp",
+      "seop_ext_class_macros",
+      "seop_ext_class_testclasses",
+      "seop_incextapp_definition",
+      "seop_incextapp_implementation",
+      "seop_incextapp_macros",
+      "seop_incextapp_testclasses",
+      "seos_scotype_exception",
+      "seos_scotype_parameter",
+      "seox_true",
+      "sews_c_vif_version",
+      "skwfc_obtype_folder",
+      "skwfc_obtype_loio",
+      "so2_controller",
+      "icon_no_status",
+      "icon_package_standard",
+      "srext_ext_class_pool",
+      "srext_ext_interface_pool",
+      "ststc_c_type_dialog",
+      "ststc_c_type_object",
+      "ststc_c_type_parameters",
+      "ststc_c_type_report",
+      "swbm_c_op_delete_no_dialog",
+      "swbm_c_type_ddic_db_tabxinx",
+      "swbm_c_type_wdy_application",
+      "swbm_version_active",
+      "swbm_version_inactive",
+      "wbmr_c_skwf_folder_class",
+      "wdyn_limu_component_controller",
+      "wdyn_limu_component_definition",
+      "wdyn_limu_component_view"
+    ]
+  },
+  "rules": {
+    "begin_end_names": true,
+    "check_ddic": true,
+    "check_include": true,
+    "check_syntax": true,
+    "global_class": true,
+    "implement_methods": true,
+    "method_implemented_twice": true,
+    "parser_error": true,
+    "superclass_final": true,
+    "unknown_types": true,
+    "xml_consistency": true
+  }
 }`));
 reg.parse();
 console.log("run syntax logic,");

package/build/src/abap/5_syntax/_current_scope.js

@@ -126,11 +126,11 @@ class CurrentScope {
         }
         this.addNamedIdentifier(identifier.getName(), identifier);
     }
-    addDeferred(token) {
+    addDeferred(token, type) {
         if (token === undefined) {
             return;
         }
-        this.current.getData().deferred[token.getStr().toUpperCase()] = token;
+        this.current.getData().deferred[token.getStr().toUpperCase()] = { token, ooType: type };
     }
     addListPrefix(identifiers, prefix) {
         for (const id of identifiers) {
@@ -235,7 +235,16 @@ class CurrentScope {
         }
         const def = (_c = this.current) === null || _c === void 0 ? void 0 : _c.findDeferred(name);
         if (def !== undefined) {
-            return { id: def };
+            let rttiName = prefixRTTI;
+            switch (def.ooType) {
+                case "INTF":
+                    rttiName = rttiName + "\\INTERFACE=" + name;
+                    break;
+                default:
+                    rttiName = rttiName + "\\CLASS=" + name;
+                    break;
+            }
+            return { id: def.id, ooType: def.ooType, RTTIName: rttiName };
         }
         return undefined;
     }
@@ -265,6 +274,11 @@ class CurrentScope {
         if (typePoolName.length <= 1 || typePoolName.length > 5) {
             return undefined;
         }
+        if (this.parentObj.getType() === "TYPE"
+            && this.parentObj.getName().toUpperCase() === typePoolName.toUpperCase()) {
+            // dont recurse into itself
+            return undefined;
+        }
         const typePool = this.reg.getObject("TYPE", typePoolName);
         if (typePool === undefined) {
             return undefined;
@@ -282,6 +296,11 @@ class CurrentScope {
         if (typePoolName.length <= 2 || typePoolName.length > 5) {
             return undefined;
         }
+        if (this.parentObj.getType() === "TYPE"
+            && this.parentObj.getName().toUpperCase() === typePoolName.toUpperCase()) {
+            // dont recurse into itself
+            return undefined;
+        }
         if (new ddic_1.DDIC(this.reg).lookupNoVoid(name) !== undefined) {
             // this is tricky, it should not do recursion when parsing the type pool itself,
             // think about DTEL ABAP_ENCOD vs TYPE ABAP

package/build/src/abap/5_syntax/expressions/source.js

@@ -97,6 +97,11 @@ class Source {
                         else {
                             this.addIfInferred(node, scope, filename, foundType);
                         }
+                        children.shift();
+                        children.shift();
+                        children.shift();
+                        children.shift();
+                        this.traverseRemainingChildren(children, scope, filename);
                         return foundType ? foundType : bodyType;
                     }
                 case "CONV":
@@ -213,6 +218,12 @@ class Source {
         return context;
     }
     ////////////////////////////////
+    traverseRemainingChildren(children, scope, filename) {
+        const last = children[children.length - 1];
+        if (last && last.get() instanceof Expressions.Source) {
+            new Source().runSyntax(last, scope, filename);
+        }
+    }
     infer(context, found) {
         if (context instanceof basic_1.FloatType && found instanceof basic_1.IntegerType) {
             return context;

package/build/src/abap/5_syntax/spaghetti_scope.js

@@ -61,7 +61,10 @@ class SpaghettiScopeNode extends ScopeData {
         while (search !== undefined) {
             const found = search.getData().deferred[name.toUpperCase()];
             if (found) {
-                return new _identifier_1.Identifier(found, search.identifier.filename);
+                return {
+                    id: new _identifier_1.Identifier(found.token, search.identifier.filename),
+                    ooType: found.ooType,
+                };
             }
             search = search.getParent();
         }

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

@@ -6,7 +6,7 @@ class ClassDeferred {
     runSyntax(node, scope, _filename) {
         var _a;
         const name = (_a = node.findFirstExpression(Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
-        scope.addDeferred(name);
+        scope.addDeferred(name, "CLAS");
     }
 }
 exports.ClassDeferred = ClassDeferred;

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

@@ -6,7 +6,7 @@ class InterfaceDeferred {
     runSyntax(node, scope, _filename) {
         var _a;
         const name = (_a = node.findFirstExpression(Expressions.InterfaceName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
-        scope.addDeferred(name);
+        scope.addDeferred(name, "INTF");
     }
 }
 exports.InterfaceDeferred = InterfaceDeferred;

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

@@ -84,13 +84,13 @@ class FlowGraph {
         this.label = label;
     }
     toDigraph() {
-        return `digraph G {
-labelloc="t";
-label="${this.label}";
-graph [fontname = "helvetica"];
-node [fontname = "helvetica", shape="box"];
-edge [fontname = "helvetica"];
-${this.toTextEdges()}
+        return `digraph G {
+labelloc="t";
+label="${this.label}";
+graph [fontname = "helvetica"];
+node [fontname = "helvetica", shape="box"];
+edge [fontname = "helvetica"];
+${this.toTextEdges()}
 }`;
     }
     listSources(node) {

package/build/src/lsp/help.js

@@ -19,13 +19,13 @@ class Help {
     /////////////////////////////////////////////////
     static dumpABAP(file, reg, textDocument, position) {
         let content = "";
-        content = `
-    <a href="#_tokens" rel="no-refresh">Tokens</a> |
-    <a href="#_statements" rel="no-refresh">Statements</a> |
-    <a href="#_structure" rel="no-refresh">Structure</a> |
-    <a href="#_files" rel="no-refresh">Files</a> |
-    <a href="#_info" rel="no-refresh">Info Dump</a>
-    <hr>
+        content = `
+    <a href="#_tokens" rel="no-refresh">Tokens</a> |
+    <a href="#_statements" rel="no-refresh">Statements</a> |
+    <a href="#_structure" rel="no-refresh">Structure</a> |
+    <a href="#_files" rel="no-refresh">Files</a> |
+    <a href="#_info" rel="no-refresh">Info Dump</a>
+    <hr>
     ` +
             "<tt>" + textDocument.uri + " (" +
             (position.line + 1) + ", " +

package/build/src/registry.js

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

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

@@ -17,10 +17,10 @@ class SevenBitAscii {
             key: "7bit_ascii",
             title: "Check for 7bit ascii",
             shortDescription: `Only allow characters from the 7bit ASCII set.`,
-            extendedInformation: `https://docs.abapopenchecks.org/checks/05/
-
-https://help.sap.com/doc/abapdocu_750_index_htm/7.50/en-US/abencharacter_set_guidl.htm
-
+            extendedInformation: `https://docs.abapopenchecks.org/checks/05/
+
+https://help.sap.com/doc/abapdocu_750_index_htm/7.50/en-US/abencharacter_set_guidl.htm
+
 Checkes files with extensions ".abap" and ".asddls"`,
             tags: [_irule_1.RuleTag.SingleFile],
         };

package/build/src/rules/abapdoc.js

@@ -28,10 +28,10 @@ class Abapdoc extends _abap_rule_1.ABAPRule {
             key: "abapdoc",
             title: "Check abapdoc",
             shortDescription: `Various checks regarding abapdoc.`,
-            extendedInformation: `Base rule checks for existence of abapdoc for public class methods and all interface methods.
-
-Plus class and interface definitions.
-
+            extendedInformation: `Base rule checks for existence of abapdoc for public class methods and all interface methods.
+
+Plus class and interface definitions.
+
 https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#abap-doc-only-for-public-apis`,
             tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Styleguide],
         };