@abaplint/cli 2.113.183 → 2.113.185

package/build/cli.js

@@ -7618,7 +7618,7 @@ class Select extends combi_1.Expression {
         const where = (0, combi_1.seq)("WHERE", _1.SQLCond);
         const offset = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("OFFSET", _1.SQLSource));
         const bypass = (0, combi_1.str)("BYPASSING BUFFER");
-        const fields = (0, combi_1.ver)(version_1.Version.v750, _1.SQLFields);
+        const fields = (0, combi_1.ver)(version_1.Version.v750, _1.SQLFields, version_1.Version.OpenABAP);
         // todo, HINTS cannot be anywhere, need an expression dedicated for strict sql
         const perm = (0, combi_1.per)(_1.SQLFrom, into, _1.SQLForAllEntries, where, _1.SQLOrderBy, sql_up_to_1.SQLUpTo, offset, _1.SQLClient, _1.SQLHaving, bypass, sql_group_by_1.SQLGroupBy, fields, _1.DatabaseConnection, _1.SQLHints);
         const permSingle = (0, combi_1.per)(_1.SQLFrom, (0, combi_1.altPrio)(sql_into_structure_1.SQLIntoStructure, _1.SQLIntoList), where, _1.SQLClient, bypass, sql_group_by_1.SQLGroupBy, fields, _1.DatabaseConnection, _1.SQLHints);
@@ -7919,7 +7919,7 @@ class Source extends combi_1.Expression {
         const conv = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("CONV", _1.TypeNameOrInfer, lparenNoSpace, _1.ConvBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
         const swit = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("SWITCH", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.SwitchBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
         const value = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("VALUE", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.ValueBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
-        const cond = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("COND", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CondBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
+        const cond = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("COND", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CondBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
         const reff = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("REF", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), Source, (0, combi_1.optPrio)("OPTIONAL"), rparen), version_1.Version.OpenABAP);
         const exact = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("EXACT", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), Source, rparen, (0, combi_1.optPrio)(after)));
         const filter = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.seq)("FILTER", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.FilterBody, rparen));
@@ -25955,7 +25955,7 @@ class FieldChain {
                     input.issues.push((0, _syntax_input_1.syntaxIssue)(input, current.getFirstToken(), message));
                     return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                 }
-                table_expression_1.TableExpression.runSyntax(current, input);
+                table_expression_1.TableExpression.runSyntax(current, input, context);
                 if (!(context instanceof basic_1.VoidType)) {
                     context = context.getRowType();
                 }
@@ -28936,16 +28936,39 @@ exports.SwitchBody = SwitchBody;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TableExpression = void 0;
+const nodes_1 = __webpack_require__(/*! ../../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const component_chain_1 = __webpack_require__(/*! ./component_chain */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/component_chain.js");
 class TableExpression {
-    static runSyntax(node, input) {
+    static runSyntax(node, input, rowType) {
         if (node === undefined) {
             return;
         }
-        for (const s of node.findDirectExpressions(Expressions.Source)) {
+        let context = rowType;
+        if (context instanceof basic_1.TableType) {
+            context = context.getRowType();
+        }
+        if (node.getChildren().length === 3) {
+            const s = node.findDirectExpression(Expressions.Source);
+            source_1.Source.runSyntax(s, input, context);
+        }
+        else if (node.findDirectTokenByText("INDEX")) {
+            const s = node.findDirectExpression(Expressions.Source);
             source_1.Source.runSyntax(s, input);
         }
+        else {
+            let fieldType = undefined;
+            for (const c of node.getChildren()) {
+                if (c instanceof nodes_1.ExpressionNode && c.get() instanceof Expressions.ComponentChainSimple) {
+                    fieldType = component_chain_1.ComponentChain.runSyntax(context, c, input);
+                }
+                else if (c instanceof nodes_1.ExpressionNode && c.get() instanceof Expressions.Source) {
+                    source_1.Source.runSyntax(c, input, fieldType);
+                }
+            }
+        }
     }
 }
 exports.TableExpression = TableExpression;
@@ -29063,7 +29086,7 @@ class Target {
                     input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                     return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                 }
-                table_expression_1.TableExpression.runSyntax(current, input);
+                table_expression_1.TableExpression.runSyntax(current, input, context);
                 if (!(context instanceof basic_1.VoidType)) {
                     context = context.getRowType();
                 }
@@ -54926,7 +54949,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.183";
+        return "2.113.185";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -75944,7 +75967,9 @@ ENDFORM.`,
                 continue;
             }
             const prev = statements[i - 1];
-            if (prev && prev.get() instanceof Statements.Return) {
+            if (prev
+                && prev.get() instanceof Statements.Return
+                && prev.getChildren().length === 2) {
                 if (this.conf.allowEmpty === true && statementCounter === 2) {
                     continue;
                 }
@@ -75955,6 +75980,7 @@ ENDFORM.`,
             const prevprev = statements[i - 2];
             if (prev && prevprev
                 && prevprev.get() instanceof Statements.Return
+                && prevprev.getChildren().length === 2
                 && prev.get() instanceof Statements.EndIf) {
                 const fix = edit_helper_1.EditHelper.deleteStatement(file, prevprev);
                 issues.push(issue_1.Issue.atStatement(file, prevprev, message, this.getMetadata().key, this.getConfig().severity, fix));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.183",
+    "version": "2.113.185",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.113.183",
+        "@abaplint/core": "^2.113.185",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",