@abaplint/core 2.91.13 → 2.91.16

package/build/abaplint.d.ts

@@ -1780,10 +1780,10 @@ declare namespace Expressions {
         ArithOperator,
         ArrowOrDash,
         Arrow,
+        AssociationName,
         AttributeChain,
         AttributeName,
         BlockName,
-        AssociationName,
         CallTransformationOptions,
         CallTransformationParameters,
         Cast,
@@ -1794,7 +1794,6 @@ declare namespace Expressions {
         Color,
         CompareOperator,
         Compare,
-        TestSeamName,
         ComponentChainSimple,
         ComponentChain,
         ComponentCompareSimple,
@@ -1934,6 +1933,7 @@ declare namespace Expressions {
         SQLGroupBy,
         SQLHaving,
         SQLHints,
+        SQLIn,
         SQLIntoStructure,
         SQLIntoTable,
         SQLJoin,
@@ -1942,6 +1942,7 @@ declare namespace Expressions {
         SQLSourceSimple,
         SQLSource,
         SQLTarget,
+        SQLUpTo,
         StringTemplateFormatting,
         StringTemplateSource,
         StringTemplate,
@@ -1952,6 +1953,7 @@ declare namespace Expressions {
         TargetFieldSymbol,
         TargetField,
         Target,
+        TestSeamName,
         TextElementKey,
         TextElementString,
         TextElement,
@@ -1962,9 +1964,8 @@ declare namespace Expressions {
         TypeTableKey,
         TypeTable,
         Type_2 as Type,
-        SQLUpTo,
-        ValueBody,
         ValueBodyLines,
+        ValueBody,
         Value,
         WithName,
         WriteOffsetLength
@@ -4966,6 +4967,10 @@ declare class SQLHints extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class SQLIn extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class SQLIntoStructure extends Expression {
     getRunnable(): IStatementRunnable;
 }

package/build/src/abap/2_statements/expressions/index.js

@@ -20,10 +20,10 @@ __exportStar(require("./and_return"), exports);
 __exportStar(require("./arith_operator"), exports);
 __exportStar(require("./arrow_or_dash"), exports);
 __exportStar(require("./arrow"), exports);
+__exportStar(require("./association_name"), exports);
 __exportStar(require("./attribute_chain"), exports);
 __exportStar(require("./attribute_name"), exports);
 __exportStar(require("./block_name"), exports);
-__exportStar(require("./association_name"), exports);
 __exportStar(require("./call_transformation_options"), exports);
 __exportStar(require("./call_transformation_parameters"), exports);
 __exportStar(require("./cast"), exports);
@@ -34,7 +34,6 @@ __exportStar(require("./class_name"), exports);
 __exportStar(require("./color"), exports);
 __exportStar(require("./compare_operator"), exports);
 __exportStar(require("./compare"), exports);
-__exportStar(require("./test_seam_name"), exports);
 __exportStar(require("./component_chain_simple"), exports);
 __exportStar(require("./component_chain"), exports);
 __exportStar(require("./component_compare_simple"), exports);
@@ -174,6 +173,7 @@ __exportStar(require("./sql_function"), exports);
 __exportStar(require("./sql_group_by"), exports);
 __exportStar(require("./sql_having"), exports);
 __exportStar(require("./sql_hints"), exports);
+__exportStar(require("./sql_in"), exports);
 __exportStar(require("./sql_into_structure"), exports);
 __exportStar(require("./sql_into_table"), exports);
 __exportStar(require("./sql_join"), exports);
@@ -182,6 +182,7 @@ __exportStar(require("./sql_path"), exports);
 __exportStar(require("./sql_source_simple"), exports);
 __exportStar(require("./sql_source"), exports);
 __exportStar(require("./sql_target"), exports);
+__exportStar(require("./sql_up_to"), exports);
 __exportStar(require("./string_template_formatting"), exports);
 __exportStar(require("./string_template_source"), exports);
 __exportStar(require("./string_template"), exports);
@@ -192,6 +193,7 @@ __exportStar(require("./table_expression"), exports);
 __exportStar(require("./target_field_symbol"), exports);
 __exportStar(require("./target_field"), exports);
 __exportStar(require("./target"), exports);
+__exportStar(require("./test_seam_name"), exports);
 __exportStar(require("./text_element_key"), exports);
 __exportStar(require("./text_element_string"), exports);
 __exportStar(require("./text_element"), exports);
@@ -202,9 +204,8 @@ __exportStar(require("./type_param"), exports);
 __exportStar(require("./type_table_key"), exports);
 __exportStar(require("./type_table"), exports);
 __exportStar(require("./type"), exports);
-__exportStar(require("./sql_up_to"), exports);
-__exportStar(require("./value_body"), exports);
 __exportStar(require("./value_body_lines"), exports);
+__exportStar(require("./value_body"), exports);
 __exportStar(require("./value"), exports);
 __exportStar(require("./with_name"), exports);
 __exportStar(require("./write_offset_length"), exports);

package/build/src/abap/2_statements/expressions/sql_compare.js

@@ -3,23 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLCompare = void 0;
 const combi_1 = require("../combi");
 const _1 = require(".");
-const tokens_1 = require("../../1_lexer/tokens");
 const version_1 = require("../../../version");
 class SQLCompare extends combi_1.Expression {
     getRunnable() {
-        const val = new _1.SQLSource();
-        const listOld = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeft), val, (0, combi_1.starPrio)((0, combi_1.seq)(",", val)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenRight), (0, combi_1.tok)(tokens_1.ParenRightW), (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const listNew = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), val, (0, combi_1.starPrio)((0, combi_1.seq)(",", val)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRight), (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const list = (0, combi_1.alt)(listOld, (0, combi_1.ver)(version_1.Version.v740sp02, listNew)); // version is a guess, https://github.com/abaplint/abaplint/issues/2530
         const subSelect = (0, combi_1.seq)("(", _1.Select, ")");
-        const inn = (0, combi_1.seq)("IN", (0, combi_1.altPrio)(_1.SQLSource, list, subSelect));
         const between = (0, combi_1.seq)("BETWEEN", _1.SQLSource, "AND", _1.SQLSource);
         const like = (0, combi_1.seq)("LIKE", _1.SQLSource, (0, combi_1.optPrio)((0, combi_1.seq)("ESCAPE", _1.SQLSource)));
         const nul = (0, combi_1.seq)("IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("NULL", (0, combi_1.ver)(version_1.Version.v753, "INITIAL")));
         const source = new _1.SQLSource();
         const sub = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("ALL", "ANY", "SOME")), subSelect);
         const arith = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/"), _1.SQLFieldName)));
-        const rett = (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLFunction, (0, combi_1.seq)(_1.SQLFieldName, (0, combi_1.optPrio)(arith))), (0, combi_1.altPrio)((0, combi_1.seq)(_1.SQLCompareOperator, (0, combi_1.altPrio)(sub, source)), (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(inn, like, between)), nul));
+        const rett = (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLFunction, (0, combi_1.seq)(_1.SQLFieldName, (0, combi_1.optPrio)(arith))), (0, combi_1.altPrio)((0, combi_1.seq)(_1.SQLCompareOperator, (0, combi_1.altPrio)(sub, source)), (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(_1.SQLIn, like, between)), nul));
         const exists = (0, combi_1.seq)("EXISTS", subSelect);
         return (0, combi_1.altPrio)(exists, _1.Dynamic, rett);
     }

package/build/src/abap/2_statements/expressions/sql_in.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLIn = void 0;
+const combi_1 = require("../combi");
+const _1 = require(".");
+const tokens_1 = require("../../1_lexer/tokens");
+const version_1 = require("../../../version");
+class SQLIn extends combi_1.Expression {
+    getRunnable() {
+        const val = new _1.SQLSource();
+        const listOld = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeft), val, (0, combi_1.starPrio)((0, combi_1.seq)(",", val)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenRight), (0, combi_1.tok)(tokens_1.ParenRightW), (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const listNew = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), val, (0, combi_1.starPrio)((0, combi_1.seq)(",", val)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRight), (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const list = (0, combi_1.alt)(listOld, (0, combi_1.ver)(version_1.Version.v740sp02, listNew)); // version is a guess, https://github.com/abaplint/abaplint/issues/2530
+        const subSelect = (0, combi_1.seq)("(", _1.Select, ")");
+        const inn = (0, combi_1.seq)("IN", (0, combi_1.altPrio)(_1.SQLSource, list, subSelect));
+        return inn;
+    }
+}
+exports.SQLIn = SQLIn;
+//# sourceMappingURL=sql_in.js.map

package/build/src/registry.js

@@ -68,7 +68,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.91.13";
+        return "2.91.16";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/definitions_top.js

@@ -4,12 +4,14 @@ exports.DefinitionsTop = exports.DefinitionsTopConf = void 0;
 const issue_1 = require("../issue");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
 const Statements = require("../abap/2_statements/statements");
+const Expressions = require("../abap/2_statements/expressions");
 const Structures = require("../abap/3_structures/structures");
 const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const _irule_1 = require("./_irule");
 const edit_helper_1 = require("../edit_helper");
 const nodes_1 = require("../abap/nodes");
+const version_1 = require("../version");
 class DefinitionsTopConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.DefinitionsTopConf = DefinitionsTopConf;
@@ -28,7 +30,9 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
             key: "definitions_top",
             title: "Place definitions in top of routine",
             shortDescription: `Checks that definitions are placed at the beginning of METHODs and FORMs.`,
-            extendedInformation: `https://docs.abapopenchecks.org/checks/17/`,
+            extendedInformation: `If the routine has inline definitions then no issues are reported
+
+https://docs.abapopenchecks.org/checks/17/`,
             tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Quickfix],
         };
     }
@@ -63,6 +67,13 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
     }
     //////////////////
     walk(r, file) {
+        var _a, _b, _c, _d, _e, _f;
+        if (this.reg.getConfig().getVersion() !== version_1.Version.v702) {
+            if (r.findFirstExpression(Expressions.InlineData)) {
+                return undefined;
+            }
+        }
+        let previous = undefined;
         for (const c of r.getChildren()) {
             if (c instanceof nodes_1.StatementNode && c.get() instanceof _statement_1.Comment) {
                 continue;
@@ -79,8 +90,24 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
                     || c.get() instanceof Structures.Constants
                     || c.get() instanceof Structures.Statics)) {
                 if (this.mode === AFTER) {
+                    // These are chained structured statements
+                    let fix = undefined;
+                    if (((_b = (_a = c.getLastChild()) === null || _a === void 0 ? void 0 : _a.getLastChild()) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr()) === "."
+                        && !(previous instanceof nodes_1.StructureNode)
+                        && this.moveTo) {
+                        // this is not perfect, but will work for now
+                        const start = (_d = (_c = c.getFirstChild()) === null || _c === void 0 ? void 0 : _c.getFirstChild()) === null || _d === void 0 ? void 0 : _d.getFirstToken().getStart();
+                        const end = (_f = (_e = c.getLastChild()) === null || _e === void 0 ? void 0 : _e.getLastChild()) === null || _f === void 0 ? void 0 : _f.getLastToken().getEnd();
+                        if (start && end) {
+                            let concat = c.concatTokens();
+                            concat = concat.replace(/,/g, ".\n");
+                            const fix1 = edit_helper_1.EditHelper.deleteRange(file, start, end);
+                            const fix2 = edit_helper_1.EditHelper.insertAt(file, this.moveTo, "\n" + concat);
+                            fix = edit_helper_1.EditHelper.merge(fix1, fix2);
+                        }
+                    }
                     // no quick fixes for these, its difficult?
-                    return issue_1.Issue.atStatement(file, c.getFirstStatement(), this.getMessage(), this.getMetadata().key, this.conf.severity);
+                    return issue_1.Issue.atStatement(file, c.getFirstStatement(), this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
                 }
                 else {
                     this.moveTo = c.getLastToken().getEnd();
@@ -122,6 +149,7 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
                     return found;
                 }
             }
+            previous = c;
         }
         return undefined;
     }

package/build/src/rules/downport.js

@@ -352,12 +352,28 @@ Only one transformation is applied to a statement at a time, so multiple steps m
                 }
             }
         }
-        if (fix === undefined) {
-            return undefined;
-        }
-        else {
+        if (fix !== undefined) {
             return issue_1.Issue.atToken(lowFile, low.getFirstToken(), "SQL, remove \" and ,", this.getMetadata().key, this.conf.severity, fix);
         }
+        for (const c of high.findAllExpressionsRecursive(Expressions.SQLIn)) {
+            const children = c.getChildren();
+            const first = children[1];
+            if (!(first.get() instanceof tokens_1.WParenLeftW)) {
+                continue;
+            }
+            const last = children[children.length - 1];
+            if (last.get() instanceof tokens_1.WParenRightW || last.get() instanceof tokens_1.WParenRight) {
+                const firstEnd = first.getFirstToken().getEnd();
+                const endDelete = new position_1.Position(firstEnd.getRow(), firstEnd.getCol() + 1);
+                const fix1 = edit_helper_1.EditHelper.deleteRange(lowFile, firstEnd, endDelete);
+                const lastStart = last.getFirstToken().getStart();
+                const startDelete = new position_1.Position(lastStart.getRow(), lastStart.getCol() - 1);
+                const fix2 = edit_helper_1.EditHelper.deleteRange(lowFile, startDelete, lastStart);
+                fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+                return issue_1.Issue.atToken(lowFile, low.getFirstToken(), "SQL, remove spaces", this.getMetadata().key, this.conf.severity, fix);
+            }
+        }
+        return undefined;
     }
     downportSelectInline(low, high, lowFile, highSyntax) {
         if (!(low.get() instanceof _statement_1.Unknown)) {
@@ -846,7 +862,8 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
     downportRef(high, lowFile, highSyntax) {
         let found = undefined;
         for (const s of high.findAllExpressionsRecursive(Expressions.Source)) {
-            if (s.getFirstToken().getStr().toUpperCase() === "REF") {
+            if (s.getFirstToken().getStr().toUpperCase() === "REF"
+                && s.findDirectExpression(Expressions.TypeNameOrInfer)) {
                 found = s;
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.91.13",
+    "version": "2.91.16",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,7 +48,7 @@
         "@microsoft/api-extractor": "^7.28.6",
         "@types/chai": "^4.3.1",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^18.0.6",
+        "@types/node": "^18.6.1",
         "chai": "^4.3.6",
         "eslint": "^8.20.0",
         "mocha": "^10.0.0",