@abaplint/core 2.116.1 → 2.117.1

package/build/abaplint.d.ts

@@ -1993,6 +1993,9 @@ declare type DynproField = {
     name: string;
     type: string;
     length: number;
+    line: number;
+    column: number;
+    height: number;
 };
 
 declare type DynproHeader = {
@@ -5534,6 +5537,7 @@ declare class Program extends ABAPObject {
     isInclude(): boolean;
     isModulePool(): boolean;
     getDynpros(): DynproList;
+    getSelectionTexts(): ITextElements;
     private parseXML;
 }
 

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

@@ -5,9 +5,10 @@ const combi_1 = require("../combi");
 const _1 = require(".");
 const wparen_leftw_1 = require("../../1_lexer/tokens/wparen_leftw");
 const wparen_left_1 = require("../../1_lexer/tokens/wparen_left");
+const version_1 = require("../../../version");
 class SQLIntoList extends combi_1.Expression {
     getRunnable() {
-        const intoList = (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.tok)(wparen_left_1.WParenLeft), (0, combi_1.tok)(wparen_leftw_1.WParenLeftW)), (0, combi_1.starPrio)((0, combi_1.seq)(_1.SQLTarget, ",")), _1.SQLTarget, ")");
+        const intoList = (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.tok)(wparen_left_1.WParenLeft), (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.tok)(wparen_leftw_1.WParenLeftW))), (0, combi_1.starPrio)((0, combi_1.seq)(_1.SQLTarget, ",")), _1.SQLTarget, ")");
         return (0, combi_1.seq)("INTO", intoList);
     }
 }

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

@@ -33,36 +33,36 @@ class SQLCompare {
         if (sqlin) {
             sql_in_1.SQLIn.runSyntax(sqlin, input);
         }
-        const fieldName = (_b = node.findDirectExpression(Expressions.SQLFieldName)) === null || _b === void 0 ? void 0 : _b.concatTokens();
+        const fieldName = (_b = node.findDirectExpression(Expressions.SQLFieldName)) === null || _b === void 0 ? void 0 : _b.concatTokens().toUpperCase();
         if (fieldName && sourceType && token) {
             // check compatibility for rule sql_value_conversion
             const targetType = this.findType(fieldName, tables, input.scope);
             let message = "";
             if (sourceType instanceof basic_1.IntegerType
                 && targetType instanceof basic_1.CharacterType) {
-                message = "Integer to CHAR conversion";
+                message = `${fieldName}: Integer to CHAR conversion`;
             }
             else if (sourceType instanceof basic_1.IntegerType
                 && targetType instanceof basic_1.NumericType) {
-                message = "Integer to NUMC conversion";
+                message = `${fieldName}: Integer to NUMC conversion`;
             }
             else if (sourceType instanceof basic_1.NumericType
                 && targetType instanceof basic_1.IntegerType) {
-                message = "NUMC to Integer conversion";
+                message = `${fieldName}: NUMC to Integer conversion`;
             }
             else if (sourceType instanceof basic_1.CharacterType
                 && targetType instanceof basic_1.IntegerType) {
-                message = "CHAR to Integer conversion";
+                message = `${fieldName}: CHAR to Integer conversion`;
             }
             else if (sourceType instanceof basic_1.CharacterType
                 && targetType instanceof basic_1.CharacterType
                 && sourceType.getLength() > targetType.getLength()) {
-                message = "Source field longer than database field, CHAR -> CHAR";
+                message = `${fieldName}: Source field longer than database field, CHAR -> CHAR`;
             }
             else if (sourceType instanceof basic_1.NumericType
                 && targetType instanceof basic_1.NumericType
                 && sourceType.getLength() > targetType.getLength()) {
-                message = "Source field longer than database field, NUMC -> NUMC";
+                message = `${fieldName}: Source field longer than database field, NUMC -> NUMC`;
             }
             if (message !== "") {
                 input.scope.addSQLConversion(fieldName, message, token);

package/build/src/objects/_dynpros.js

@@ -2,6 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseDynpros = parseDynpros;
 const xml_utils_1 = require("../xml_utils");
+function parseNumber(value) {
+    if (value === undefined) {
+        return 0;
+    }
+    return parseInt(value, 10);
+}
 function parseDynpros(parsed) {
     var _a, _b, _c, _d;
     const dynpros = [];
@@ -13,7 +19,10 @@ function parseDynpros(parsed) {
                 fields.push({
                     name: f.NAME,
                     type: f.TYPE,
-                    length: f.LENGTH,
+                    length: parseNumber(f.LENGTH),
+                    line: parseNumber(f.LINE),
+                    column: parseNumber(f.COLUMN),
+                    height: parseNumber(f.HEIGHT),
                 });
             }
             dynpros.push({

package/build/src/objects/program.js

@@ -42,6 +42,10 @@ class Program extends _abap_object_1.ABAPObject {
         this.parseXML();
         return this.parsedXML.dynpros || [];
     }
+    getSelectionTexts() {
+        this.parseXML();
+        return this.parsedXML.selectionTexts;
+    }
     ////////////////////////////
     parseXML() {
         var _a, _b, _c;
@@ -56,14 +60,19 @@ class Program extends _abap_object_1.ABAPObject {
                 isModulePool: false,
                 description: undefined,
                 dynpros: [],
+                selectionTexts: {},
             };
             return;
         }
         let description = "";
+        const selectionTexts = {};
         for (const t of (0, xml_utils_1.xmlToArray)((_c = (_b = (_a = parsed.abapGit) === null || _a === void 0 ? void 0 : _a["asx:abap"]["asx:values"]) === null || _b === void 0 ? void 0 : _b.TPOOL) === null || _c === void 0 ? void 0 : _c.item)) {
             if ((t === null || t === void 0 ? void 0 : t.ID) === "R") {
                 description = t.ENTRY ? (0, xml_utils_1.unescape)(t.ENTRY) : "";
             }
+            else if ((t === null || t === void 0 ? void 0 : t.ID) === "S" && t.KEY !== undefined) {
+                selectionTexts[t.KEY.toUpperCase()] = t.ENTRY ? (0, xml_utils_1.unescape)(t.ENTRY) : "";
+            }
         }
         const dynpros = (0, _dynpros_1.parseDynpros)(parsed);
         this.parsedXML = {
@@ -71,6 +80,7 @@ class Program extends _abap_object_1.ABAPObject {
             isModulePool: file ? file.getRaw().includes("<SUBC>M</SUBC>") : false,
             dynpros: dynpros,
             description: description,
+            selectionTexts: selectionTexts,
         };
     }
 }

package/build/src/registry.js

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

package/build/src/rules/dynpro_checks.js

@@ -18,7 +18,7 @@ class DynproChecks {
             key: "dynpro_checks",
             title: "Dynpro Checks",
             shortDescription: `Various Dynpro checks`,
-            extendedInformation: `* Check length of PUSH elements less than 132`,
+            extendedInformation: `* Check length of PUSH elements less than 132\n* Check for overlapping screen elements`,
             tags: [_irule_1.RuleTag.Syntax],
         };
     }
@@ -47,9 +47,43 @@ class DynproChecks {
                     ret.push(issue_1.Issue.atPosition(file, new position_1.Position(1, 1), message, this.getMetadata().key, this.getConfig().severity));
                 }
             }
+            ret.push(...this.findOverlappingFields(dynpro, file));
         }
         return ret;
     }
+    findOverlappingFields(dynpro, file) {
+        const ret = [];
+        for (let index = 0; index < dynpro.fields.length; index++) {
+            const current = dynpro.fields[index];
+            if (current.name === undefined) {
+                continue;
+            }
+            for (let compare = index + 1; compare < dynpro.fields.length; compare++) {
+                const other = dynpro.fields[compare];
+                if (other.name === undefined || this.overlaps(current, other) === false) {
+                    continue;
+                }
+                const message = `Screen ${dynpro.number}, fields ${current.name} and ${other.name} are overlapping`;
+                ret.push(issue_1.Issue.atPosition(file, new position_1.Position(1, 1), message, this.getMetadata().key, this.getConfig().severity));
+            }
+        }
+        return ret;
+    }
+    overlaps(first, second) {
+        if (first.line === 0 || second.line === 0 || first.column === 0 || second.column === 0) {
+            return false;
+        }
+        const firstHeight = Math.max(first.height, 1);
+        const secondHeight = Math.max(second.height, 1);
+        const firstLastLine = first.line + firstHeight - 1;
+        const secondLastLine = second.line + secondHeight - 1;
+        if (firstLastLine < second.line || secondLastLine < first.line) {
+            return false;
+        }
+        const firstLastColumn = first.column + Math.max(first.length, 1) - 1;
+        const secondLastColumn = second.column + Math.max(second.length, 1) - 1;
+        return first.column <= secondLastColumn && second.column <= firstLastColumn;
+    }
 }
 exports.DynproChecks = DynproChecks;
 //# sourceMappingURL=dynpro_checks.js.map

package/build/src/rules/index.js

@@ -152,6 +152,7 @@ __exportStar(require("./select_add_order_by"), exports);
 __exportStar(require("./select_performance"), exports);
 __exportStar(require("./select_single_full_key"), exports);
 __exportStar(require("./selection_screen_naming"), exports);
+__exportStar(require("./selection_screen_texts_missing"), exports);
 __exportStar(require("./sequential_blank"), exports);
 __exportStar(require("./short_case"), exports);
 __exportStar(require("./sicf_consistency"), exports);

package/build/src/rules/selection_screen_texts_missing.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SelectionScreenTextsMissing = exports.SelectionScreenTextsMissingConf = void 0;
+const issue_1 = require("../issue");
+const _basic_rule_config_1 = require("./_basic_rule_config");
+const statements_1 = require("../abap/2_statements/statements");
+const expressions_1 = require("../abap/2_statements/expressions");
+const objects_1 = require("../objects");
+class SelectionScreenTextsMissingConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.SelectionScreenTextsMissingConf = SelectionScreenTextsMissingConf;
+class SelectionScreenTextsMissing {
+    constructor() {
+        this.conf = new SelectionScreenTextsMissingConf();
+    }
+    getMetadata() {
+        return {
+            key: "selection_screen_texts_missing",
+            title: "Selection screen texts missing",
+            shortDescription: `Checks that selection screen parameters and select-options have selection texts`,
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    initialize(reg) {
+        this.reg = reg;
+        return this;
+    }
+    run(obj) {
+        if (!(obj instanceof objects_1.Program)) {
+            return [];
+        }
+        if (obj.isInclude()) {
+            return [];
+        }
+        const selTexts = obj.getSelectionTexts();
+        const output = [];
+        const checked = new Set();
+        this.checkFile(obj.getMainABAPFile(), selTexts, output, checked);
+        return output;
+    }
+    checkFile(file, selTexts, output, checked) {
+        if (file === undefined) {
+            return;
+        }
+        if (checked.has(file.getFilename())) {
+            return;
+        }
+        checked.add(file.getFilename());
+        for (const stat of file.getStatements()) {
+            const s = stat.get();
+            if (s instanceof statements_1.Parameter || s instanceof statements_1.SelectOption) {
+                const fieldNode = stat.findFirstExpression(expressions_1.FieldSub);
+                if (fieldNode) {
+                    const fieldName = fieldNode.getFirstToken().getStr().toUpperCase();
+                    if (selTexts[fieldName] === undefined) {
+                        output.push(issue_1.Issue.atToken(file, fieldNode.getFirstToken(), `Selection text missing for "${fieldName}"`, this.getMetadata().key, this.conf.severity));
+                    }
+                }
+            }
+            else if (s instanceof statements_1.Include) {
+                const nameNode = stat.findFirstExpression(expressions_1.IncludeName);
+                if (nameNode) {
+                    const inclName = nameNode.getFirstToken().getStr().toUpperCase();
+                    const inclObj = this.reg.getObject("PROG", inclName);
+                    if (inclObj) {
+                        this.checkFile(inclObj.getMainABAPFile(), selTexts, output, checked);
+                    }
+                }
+            }
+        }
+    }
+}
+exports.SelectionScreenTextsMissing = SelectionScreenTextsMissing;
+//# sourceMappingURL=selection_screen_texts_missing.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.116.1",
+    "version": "2.117.1",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -37,7 +37,7 @@
         "url": "git+https://github.com/abaplint/abaplint.git"
     },
     "engines": {
-        "node": ">=12.0.0"
+        "node": ">=18.0.0"
     },
     "keywords": [
         "ABAP",
@@ -63,7 +63,7 @@
         "typescript": "^5.9.3"
     },
     "dependencies": {
-        "fast-xml-parser": "^5.5.3",
+        "fast-xml-parser": "^5.5.5",
         "json5": "^2.2.3",
         "vscode-languageserver-types": "^3.17.5"
     }