@abaplint/core 2.113.51 → 2.113.52

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

@@ -32,7 +32,7 @@ class SelectionScreen {
         const posIntegers = (0, combi_1.regex)(/^(0?[1-9]|[1234567][0-9]|8[0-3])$/);
         const pos = (0, combi_1.seq)("POSITION", (0, combi_1.altPrio)(posIntegers, posSymbols));
         const incl = (0, combi_1.seq)("INCLUDE BLOCKS", expressions_1.BlockName);
-        const tabbed = (0, combi_1.seq)("BEGIN OF TABBED BLOCK", expressions_1.InlineField, "FOR", expressions_1.Integer, "LINES", (0, combi_1.optPrio)("NO INTERVALS"));
+        const tabbed = (0, combi_1.seq)("BEGIN OF TABBED BLOCK", expressions_1.BlockName, "FOR", expressions_1.Integer, "LINES", (0, combi_1.optPrio)("NO INTERVALS"));
         const uline = (0, combi_1.seq)("ULINE", (0, combi_1.opt)(position));
         const param = (0, combi_1.seq)("INCLUDE PARAMETERS", expressions_1.Field);
         const iso = (0, combi_1.seq)("INCLUDE SELECT-OPTIONS", expressions_1.Field);

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

@@ -67,7 +67,7 @@ class ObjectOriented {
         return undefined;
     }
     findMethodViaAlias(methodName, def) {
-        for (const a of def.getAliases()) {
+        for (const a of def.getAliases() || []) {
             if (a.getName().toUpperCase() === methodName.toUpperCase()) {
                 const comp = a.getComponent();
                 const res = this.findMethodInInterface(comp.split("~")[0], comp.split("~")[1]);
@@ -150,9 +150,12 @@ class ObjectOriented {
             return undefined;
         }
         const upper = name.toUpperCase();
-        for (const a of def.getAttributes().getAll()) {
-            if (a.getName().toUpperCase() === upper) {
-                return a;
+        const attr = def.getAttributes();
+        if (attr) {
+            for (const a of attr.getAll()) {
+                if (a.getName().toUpperCase() === upper) {
+                    return a;
+                }
             }
         }
         for (const a of def.getAliases() || []) {
@@ -266,7 +269,11 @@ class ObjectOriented {
         return { method: undefined, def: undefined };
     }
     findMethod(def, methodName) {
-        for (const method of def.getMethodDefinitions().getAll()) {
+        const defs = def.getMethodDefinitions();
+        if (defs === undefined) {
+            return undefined;
+        }
+        for (const method of defs.getAll()) {
             if (method.getName().toUpperCase() === methodName.toUpperCase()) {
                 if (method.isRedefinition()) {
                     return this.findMethodInSuper(def, methodName);

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

@@ -112,7 +112,7 @@ class Source {
                         const foundType = this.determineType(node, input, targetType);
                         const bodyType = new conv_body_1.ConvBody().runSyntax(node.findDirectExpression(Expressions.ConvBody), input);
                         if (new _type_utils_1.TypeUtils(input.scope).isAssignable(foundType, bodyType) === false) {
-                            const message = "CONV: Types not compatible";
+                            const message = `CONV: Types not compatible, ${foundType === null || foundType === void 0 ? void 0 : foundType.constructor.name}, ${bodyType === null || bodyType === void 0 ? void 0 : bodyType.constructor.name}`;
                             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                             return new basic_1.VoidType(_syntax_input_1.CheckSyntaxKey);
                         }

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

@@ -7,30 +7,35 @@ const basic_1 = require("../../types/basic");
 const _syntax_input_1 = require("../_syntax_input");
 class SelectionScreen {
     runSyntax(node, input) {
-        const field = node.findFirstExpression(Expressions.InlineField);
-        if (field === undefined) {
+        const blockNode = node.findFirstExpression(Expressions.BlockName);
+        const blockToken = blockNode === null || blockNode === void 0 ? void 0 : blockNode.getFirstToken();
+        const blockName = blockNode === null || blockNode === void 0 ? void 0 : blockNode.concatTokens();
+        if (blockName !== undefined && blockName.length > 16) {
+            const message = "SELECTION-SCREEN block name too long, " + blockName;
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return;
         }
-        if (field.getFirstToken().getStr().length > 8) {
+        const field = node.findFirstExpression(Expressions.InlineField);
+        if (field !== undefined && field.getFirstToken().getStr().length > 8) {
             const message = "SELECTION-SCREEN name too long, " + field.getFirstToken().getStr();
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, field.getFirstToken(), message));
             return;
         }
-        const name = field.getFirstToken();
+        const fieldName = field === null || field === void 0 ? void 0 : field.getFirstToken();
         const concat = node.concatTokens().toUpperCase();
-        if (concat.includes("BEGIN OF TABBED BLOCK")) {
+        if (concat.includes("BEGIN OF TABBED BLOCK") && blockToken) {
             const type = new basic_1.StructureType([
                 { name: "PROG", type: new basic_1.CharacterType(40) },
                 { name: "DYNNR", type: new basic_1.CharacterType(4) },
                 { name: "ACTIVETAB", type: new basic_1.CharacterType(132) },
             ]);
-            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(name, input.filename, type, ["selection_screen_tab" /* IdentifierMeta.SelectionScreenTab */]));
+            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(blockToken, input.filename, type, ["selection_screen_tab" /* IdentifierMeta.SelectionScreenTab */]));
         }
-        else if (concat.startsWith("SELECTION-SCREEN TAB")) {
-            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(name, input.filename, new basic_1.CharacterType(83), ["selection_screen_tab" /* IdentifierMeta.SelectionScreenTab */]));
+        else if (concat.startsWith("SELECTION-SCREEN TAB") && fieldName) {
+            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(fieldName, input.filename, new basic_1.CharacterType(83), ["selection_screen_tab" /* IdentifierMeta.SelectionScreenTab */]));
         }
-        else {
-            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(name, input.filename, new basic_1.CharacterType(83)));
+        else if (fieldName) {
+            input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(fieldName, input.filename, new basic_1.CharacterType(83)));
         }
     }
 }

package/build/src/registry.js

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

package/build/src/rules/selection_screen_naming.js

@@ -95,7 +95,11 @@ class SelectionScreenNaming extends _abap_rule_1.ABAPRule {
             return statNode.findFirstExpression(expressions_1.FieldSub);
         }
         else if (statNode.get() instanceof statements_1.SelectionScreen) {
-            return statNode.findFirstExpression(expressions_1.InlineField);
+            let ret = statNode.findFirstExpression(expressions_1.InlineField);
+            if (ret === undefined && statNode.concatTokens().toUpperCase().includes(" BEGIN OF TABBED BLOCK")) {
+                ret = statNode.findFirstExpression(expressions_1.BlockName);
+            }
+            return ret;
         }
         else {
             return undefined;

package/package.json

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