@abaplint/core 2.119.8 → 2.119.10

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

@@ -354,6 +354,9 @@ class Select {
         const ret = [];
         if (node.get() instanceof Expressions.SelectLoop) {
             expr = node.findFirstExpression(Expressions.SQLFieldListLoop);
+            if (expr === undefined) {
+                expr = node;
+            }
         }
         else {
             expr = node.findFirstExpression(Expressions.SQLFieldList);
@@ -361,7 +364,8 @@ class Select {
         if (((_a = expr === null || expr === void 0 ? void 0 : expr.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.Dynamic) {
             dynamic_1.Dynamic.runSyntax(expr.getFirstChild(), input);
         }
-        for (const field of (expr === null || expr === void 0 ? void 0 : expr.findDirectExpressionsMulti([Expressions.SQLField, Expressions.SQLFieldName])) || []) {
+        // eslint-disable-next-line max-len
+        for (const field of (expr === null || expr === void 0 ? void 0 : expr.findDirectExpressionsMulti([Expressions.SQLField, Expressions.SQLFieldName, Expressions.SQLAggregation])) || []) {
             let code = field.concatTokens().toUpperCase();
             const as = ((_b = field.findDirectExpression(Expressions.SQLAsName)) === null || _b === void 0 ? void 0 : _b.concatTokens()) || "";
             if (as !== "") {

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

@@ -39,6 +39,7 @@ const assert_error_1 = require("../assert_error");
 // TODO: refactor all these method parameters to objects, this is getting messy
 class Source {
     static runSyntax(node, input, targetType, writeReference = false, allowGenericDeference = false) {
+        var _a;
         if (node === undefined) {
             return undefined;
         }
@@ -116,12 +117,13 @@ class Source {
                     {
                         const foundType = this.determineType(node, input, targetType);
                         const bodyType = conv_body_1.ConvBody.runSyntax(node.findDirectExpression(Expressions.ConvBody), input);
+                        const inferred = (_a = node.findDirectExpression(Expressions.TypeNameOrInfer)) === null || _a === void 0 ? void 0 : _a.concatTokens();
                         if (new _type_utils_1.TypeUtils(input.scope).isConvable(foundType, bodyType) === false) {
                             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 basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                         }
-                        else if (foundType === null || foundType === void 0 ? void 0 : foundType.isGeneric()) {
+                        else if ((foundType === null || foundType === void 0 ? void 0 : foundType.isGeneric()) && inferred !== "#") {
                             const message = "Cannot CONV to generic type";
                             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                             return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);

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

@@ -9,16 +9,21 @@ const _syntax_input_1 = require("../_syntax_input");
 const tokens_1 = require("../../1_lexer/tokens");
 class Parameter {
     runSyntax(node, input) {
-        var _a;
-        const nameToken = (_a = node.findFirstExpression(Expressions.FieldSub)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+        const nameExpression = node.findFirstExpression(Expressions.FieldSub);
+        if (nameExpression === undefined) {
+            return;
+        }
+        let nameToken = nameExpression.getFirstToken();
+        // FieldSub can include dashes and optional length, eg p-tcode or p_table(4).
+        if (nameExpression.getChildren().length > 1) {
+            const fullName = nameExpression.concatTokens().replace(/\(.+$/, "").replace(/\[\]$/, "");
+            nameToken = new tokens_1.Identifier(nameToken.getStart(), fullName);
+        }
         if (nameToken && nameToken.getStr().length > 8) {
             const message = "Parameter name too long, " + nameToken.getStr();
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return;
         }
-        else if (nameToken === undefined) {
-            return;
-        }
         if (node.findDirectTokenByText("RADIOBUTTON") && node.findDirectTokenByText("LENGTH")) {
             const message = "RADIOBUTTON and LENGTH not possible together";
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));

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

@@ -10,23 +10,28 @@ const _syntax_input_1 = require("../_syntax_input");
 const tokens_1 = require("../../1_lexer/tokens");
 class SelectOption {
     runSyntax(node, input) {
-        var _a;
-        const nameToken = (_a = node.findFirstExpression(Expressions.FieldSub)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+        const nameExpression = node.findFirstExpression(Expressions.FieldSub);
+        if (nameExpression === undefined) {
+            return;
+        }
+        let nameToken = nameExpression.getFirstToken();
+        // FieldSub can include dashes and optional length, eg s-matnr or s_name(10).
+        if (nameExpression.getChildren().length > 1) {
+            const fullName = nameExpression.concatTokens().replace(/\(.+$/, "").replace(/\[\]$/, "");
+            nameToken = new tokens_1.Identifier(nameToken.getStart(), fullName);
+        }
         if (nameToken && nameToken.getStr().length > 8) {
             const message = "Select-option name too long, " + nameToken.getStr();
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, nameToken, message));
             return;
         }
-        else if (nameToken === undefined) {
-            return;
-        }
         for (const d of node.findDirectExpressions(Expressions.Dynamic)) {
             dynamic_1.Dynamic.runSyntax(d, input);
             input.scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, input.filename, basic_1.VoidType.get("DYNAMIC_SELECT_OPTION")));
             return;
         }
-        const nameExpression = node.findFirstExpression(Expressions.FieldChain);
-        let found = new basic_types_1.BasicTypes(input).resolveLikeName(nameExpression);
+        const nameChain = node.findFirstExpression(Expressions.FieldChain);
+        let found = new basic_types_1.BasicTypes(input).resolveLikeName(nameChain);
         if (found) {
             if (found instanceof basic_1.StructureType) {
                 let length = 0;

package/build/src/registry.js

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

package/build/src/rules/parser_missing_space.js

@@ -49,6 +49,19 @@ This rule makes sure the spaces are consistently required across the language.`,
         return issues;
     }
     missingSpace(statement) {
+        {
+            const tokens = statement.getTokens();
+            for (let i = 1; i < tokens.length; i++) {
+                const prev = tokens[i - 1];
+                const current = tokens[i];
+                if (prev.getStr() === ")"
+                    && current.getStr() === "="
+                    && prev.getRow() === current.getRow()
+                    && prev.getEnd().getCol() === current.getStart().getCol()) {
+                    return current.getStart();
+                }
+            }
+        }
         const found = statement.findAllExpressionsMulti([
             Expressions.CondSub, Expressions.SQLCond, Expressions.ValueBodyLine,
             Expressions.NewObject, Expressions.Cond, Expressions.ComponentCond,

package/package.json

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