@abaplint/core 2.120.49 → 2.120.51

package/build/abaplint.d.ts

@@ -2080,6 +2080,7 @@ declare class Domain extends AbstractObject {
         maxLength: number;
         allowNamespace: boolean;
     };
+    getIdentifier(): Identifier | undefined;
     setDirty(): void;
     parseType(reg: IRegistry, dataElement?: string, description?: string): AbstractType;
     parse(): {
@@ -2088,6 +2089,7 @@ declare class Domain extends AbstractObject {
     };
     getFixedValues(): DomainValue[];
     getFixedValuesTranslations(): DomainValueTranslation[];
+    private getAFFFile;
 }
 
 declare interface DomainValue {

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

@@ -337,6 +337,20 @@ class TypeUtils {
             || node.findFirstExpression(Expressions.ArithOperator) !== undefined;
         return calculated;
     }
+    // a character constant is only assignable to a hexadecimal target if it can be
+    // interpreted as a hexadecimal value
+    isHexConstant(node) {
+        const constant = node === null || node === void 0 ? void 0 : node.concatTokens();
+        if (constant === undefined) {
+            return true;
+        }
+        if ((constant.startsWith("'") && constant.endsWith("'"))
+            || (constant.startsWith("`") && constant.endsWith("`"))) {
+            const value = constant.substring(1, constant.length - 1);
+            return value.length > 0 && /^[0-9A-Fa-f]+$/.test(value);
+        }
+        return true;
+    }
     isAssignableNew(source, target, node) {
         const calculated = (node === null || node === void 0 ? void 0 : node.findFirstExpression(Expressions.ArithOperator)) !== undefined;
         if (calculated && source instanceof basic_1.HexType && target instanceof basic_1.IntegerType) {
@@ -402,7 +416,7 @@ class TypeUtils {
             }
             else if (target instanceof basic_1.XStringType) {
                 if (((_d = source.getAbstractTypeData()) === null || _d === void 0 ? void 0 : _d.derivedFromConstant) === true) {
-                    return (node === null || node === void 0 ? void 0 : node.concatTokens()) !== "''";
+                    return this.isHexConstant(node);
                 }
                 return false;
             }

package/build/src/objects/domain.js

@@ -38,16 +38,21 @@ const _abstract_object_1 = require("./_abstract_object");
 const Types = __importStar(require("../abap/types/basic"));
 const ddic_1 = require("../ddic");
 const xml_utils_1 = require("../xml_utils");
+const _identifier_1 = require("../abap/4_file_information/_identifier");
+const identifier_1 = require("../abap/1_lexer/tokens/identifier");
+const position_1 = require("../position");
 class Domain extends _abstract_object_1.AbstractObject {
     getType() {
         return "DOMA";
     }
     getDescription() {
         var _a;
+        this.parse();
         return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.description;
     }
     getConversionExit() {
         var _a;
+        this.parse();
         return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.conversionExit;
     }
     getDataType() {
@@ -61,6 +66,17 @@ class Domain extends _abstract_object_1.AbstractObject {
             allowNamespace: true,
         };
     }
+    getIdentifier() {
+        const xmlIdentifier = super.getIdentifier();
+        if (xmlIdentifier) {
+            return xmlIdentifier;
+        }
+        const file = this.getAFFFile();
+        if (file === undefined) {
+            return undefined;
+        }
+        return new _identifier_1.Identifier(new identifier_1.Identifier(new position_1.Position(1, 1), this.getName()), file.getFilename());
+    }
     setDirty() {
         this.parsedXML = undefined;
         super.setDirty();
@@ -87,18 +103,57 @@ class Domain extends _abstract_object_1.AbstractObject {
         });
     }
     parse() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+        var _v, _w;
         if (this.parsedXML) {
             return { updated: false, runtime: 0 };
         }
         const start = Date.now();
         this.parsedXML = {};
+        const jsonFile = this.getAFFFile();
+        if (jsonFile) {
+            try {
+                const parsed = JSON.parse(jsonFile.getRaw());
+                const language = (_a = parsed.header) === null || _a === void 0 ? void 0 : _a.originalLanguage;
+                const values = [];
+                for (const fixedValue of (_v = parsed.fixedValues) !== null && _v !== void 0 ? _v : []) {
+                    values.push({
+                        low: fixedValue === null || fixedValue === void 0 ? void 0 : fixedValue.fixedValue,
+                        high: "",
+                        description: fixedValue === null || fixedValue === void 0 ? void 0 : fixedValue.description,
+                        language: language,
+                    });
+                }
+                for (const interval of (_w = parsed.fixedValueIntervals) !== null && _w !== void 0 ? _w : []) {
+                    values.push({
+                        low: interval === null || interval === void 0 ? void 0 : interval.lowLimit,
+                        high: interval === null || interval === void 0 ? void 0 : interval.highLimit,
+                        description: interval === null || interval === void 0 ? void 0 : interval.description,
+                        language: language,
+                    });
+                }
+                this.parsedXML = {
+                    description: (_b = parsed.header) === null || _b === void 0 ? void 0 : _b.description,
+                    datatype: (_c = parsed.format) === null || _c === void 0 ? void 0 : _c.dataType,
+                    length: (_e = (_d = parsed.format) === null || _d === void 0 ? void 0 : _d.length) === null || _e === void 0 ? void 0 : _e.toString(),
+                    decimals: (_g = (_f = parsed.format) === null || _f === void 0 ? void 0 : _f.decimals) === null || _g === void 0 ? void 0 : _g.toString(),
+                    conversionExit: (_h = parsed.outputCharacteristics) === null || _h === void 0 ? void 0 : _h.conversionRoutine,
+                    values: values,
+                    valuesTranslations: [],
+                };
+            }
+            catch (_x) {
+                // handled by parseType()
+            }
+            const end = Date.now();
+            return { updated: true, runtime: end - start };
+        }
         const parsed = super.parseRaw2();
         if (parsed === undefined) {
             return { updated: false, runtime: 0 };
         }
-        const dd01v = (_c = (_b = (_a = parsed.abapGit) === null || _a === void 0 ? void 0 : _a["asx:abap"]) === null || _b === void 0 ? void 0 : _b["asx:values"]) === null || _c === void 0 ? void 0 : _c.DD01V;
-        const dd07v_tab = (0, xml_utils_1.xmlToArray)((_g = (_f = (_e = (_d = parsed.abapGit) === null || _d === void 0 ? void 0 : _d["asx:abap"]) === null || _e === void 0 ? void 0 : _e["asx:values"]) === null || _f === void 0 ? void 0 : _f.DD07V_TAB) === null || _g === void 0 ? void 0 : _g.DD07V);
+        const dd01v = (_l = (_k = (_j = parsed.abapGit) === null || _j === void 0 ? void 0 : _j["asx:abap"]) === null || _k === void 0 ? void 0 : _k["asx:values"]) === null || _l === void 0 ? void 0 : _l.DD01V;
+        const dd07v_tab = (0, xml_utils_1.xmlToArray)((_q = (_p = (_o = (_m = parsed.abapGit) === null || _m === void 0 ? void 0 : _m["asx:abap"]) === null || _o === void 0 ? void 0 : _o["asx:values"]) === null || _p === void 0 ? void 0 : _p.DD07V_TAB) === null || _q === void 0 ? void 0 : _q.DD07V);
         const values = [];
         for (const ddo7v of dd07v_tab) {
             const value = {
@@ -109,7 +164,7 @@ class Domain extends _abstract_object_1.AbstractObject {
             };
             values.push(value);
         }
-        const dd07v_texts = (0, xml_utils_1.xmlToArray)((_l = (_k = (_j = (_h = parsed.abapGit) === null || _h === void 0 ? void 0 : _h["asx:abap"]) === null || _j === void 0 ? void 0 : _j["asx:values"]) === null || _k === void 0 ? void 0 : _k.DD07_TEXTS) === null || _l === void 0 ? void 0 : _l.item);
+        const dd07v_texts = (0, xml_utils_1.xmlToArray)((_u = (_t = (_s = (_r = parsed.abapGit) === null || _r === void 0 ? void 0 : _r["asx:abap"]) === null || _s === void 0 ? void 0 : _s["asx:values"]) === null || _t === void 0 ? void 0 : _t.DD07_TEXTS) === null || _u === void 0 ? void 0 : _u.item);
         const translationValues = [];
         for (const dd07v of dd07v_texts) {
             const value = {
@@ -140,6 +195,9 @@ class Domain extends _abstract_object_1.AbstractObject {
         var _b;
         return (_b = (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.valuesTranslations) !== null && _b !== void 0 ? _b : [];
     }
+    getAFFFile() {
+        return this.getFiles().find(file => file.getFilename().toLowerCase().endsWith(".doma.json"));
+    }
 }
 exports.Domain = Domain;
 //# sourceMappingURL=domain.js.map

package/build/src/registry.js

@@ -75,7 +75,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.49";
+        return "2.120.51";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/downport.js

@@ -1058,15 +1058,19 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
                 continue;
             }
             const condition = this.tableCondition(tableExpression);
-            const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+            // ASSIGNING, not INTO: from v740 a table expression in a read position addresses the
+            // row rather than copying it, so "REF #( tab[ i ]-comp )" and "ASSIGN tab[ i ]-comp"
+            // hand back an address INTO a work area would not preserve. The write path
+            // (moveWithTableTarget) already lowers to ASSIGNING for the same reason.
+            const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax, true);
             const tabixBackup = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             const firstToken = high.getFirstToken();
             // note that the tabix restore should be done before throwing the exception
-            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), `DATA ${uniqueName} LIKE LINE OF ${pre}.
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), `FIELD-SYMBOLS ${uniqueName} LIKE LINE OF ${pre}.
 ${indentation}DATA ${tabixBackup} LIKE sy-tabix.
 ${indentation}${tabixBackup} = sy-tabix.
-${indentation}READ TABLE ${pre} ${condition}INTO ${uniqueName}.
+${indentation}READ TABLE ${pre} ${condition}ASSIGNING ${uniqueName}.
 ${indentation}sy-tabix = ${tabixBackup}.
 ${indentation}IF sy-subrc <> 0.
 ${indentation}  RAISE EXCEPTION TYPE cx_sy_itab_line_not_found.
@@ -1820,8 +1824,7 @@ CONSTANTS: BEGIN OF ${structureName},\n`;
         if (index === undefined) {
             return undefined;
         }
-        let uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
-        uniqueName = `<${uniqueName}>`;
+        const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax, true);
         const tName = target.concatTokens().split("[")[0];
         const condition = this.tableCondition(tableExpression);
         const tabixBackup = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
@@ -2833,12 +2836,16 @@ ${indentation}    output = ${uniqueName}.\n`;
         }
         return undefined;
     }
-    uniqueName(position, filename, highSyntax) {
+    /** a FIELD-SYMBOLS declaration is known to the scope under its bracketed spelling, so
+     * the collision check has to use that spelling too - otherwise a second outline in the
+     * same method is handed a name that is already taken and the result does not compile */
+    uniqueName(position, filename, highSyntax, fieldSymbol = false) {
+        const decorate = (name) => fieldSymbol === true ? `<${name}>` : name;
         const spag = highSyntax.spaghetti.lookupPosition(position, filename);
         if (spag === undefined) {
             const name = "temprr" + this.counter;
             this.counter++;
-            return name;
+            return decorate(name);
         }
         let postfix = "";
         if (spag.getIdentifier().stype === _scope_type_1.ScopeType.ClassDefinition) {
@@ -2847,7 +2854,7 @@ ${indentation}    output = ${uniqueName}.\n`;
             postfix = "_" + hash.substring(0, 10);
         }
         while (true) {
-            const name = "temp" + this.counter + postfix;
+            const name = decorate("temp" + this.counter + postfix);
             const exists = this.existsRecursive(spag, name);
             this.counter++;
             if (exists === false) {

package/build/src/rules/index.js

@@ -202,6 +202,7 @@ __exportStar(require("./use_line_exists"), exports);
 __exportStar(require("./use_new"), exports);
 __exportStar(require("./when_others_last"), exports);
 __exportStar(require("./whitespace_end"), exports);
+__exportStar(require("./wrong_abapdoc_position"), exports);
 __exportStar(require("./xml_consistency"), exports);
 __exportStar(require("./no_exclamation_escape"), exports);
 __exportStar(require("./xml_bom"), exports);

package/build/src/rules/wrong_abapdoc_position.js

@@ -0,0 +1,162 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WrongAbapdocPosition = exports.WrongAbapdocPositionConf = void 0;
+const Statements = __importStar(require("../abap/2_statements/statements"));
+const issue_1 = require("../issue");
+const _abap_rule_1 = require("./_abap_rule");
+const _basic_rule_config_1 = require("./_basic_rule_config");
+const _irule_1 = require("./_irule");
+const _statement_1 = require("../abap/2_statements/statements/_statement");
+class WrongAbapdocPositionConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.WrongAbapdocPositionConf = WrongAbapdocPositionConf;
+class WrongAbapdocPosition extends _abap_rule_1.ABAPRule {
+    constructor() {
+        super(...arguments);
+        this.conf = new WrongAbapdocPositionConf();
+    }
+    getMetadata() {
+        return {
+            key: "wrong_abapdoc_position",
+            title: "Wrong ABAP Doc position",
+            shortDescription: `ABAP Doc must be placed directly in front of the declaration it documents.`,
+            extendedInformation: `ABAP Doc documents the single declaration following it, an ABAP Doc block placed
+elsewhere is silently ignored, leaving the declaration undocumented.
+
+The following positions are reported,
+* in front of a chained keyword, ie. before "CONSTANTS:" instead of after the colon,
+* in the middle of a statement, ie. between the parameters of a METHODS definition,
+* directly in front of ENDCLASS, ENDINTERFACE or a SECTION statement.
+
+Only checks ABAP Doc inside class definitions and interfaces.`,
+            tags: [_irule_1.RuleTag.SingleFile],
+            badExample: `CLASS zcl_foo DEFINITION PUBLIC.
+  PUBLIC SECTION.
+    "! Navigation modes
+    CONSTANTS:
+      BEGIN OF cs_nav_mode,
+        back TYPE i VALUE 1,
+      END OF cs_nav_mode.
+ENDCLASS.`,
+            goodExample: `CLASS zcl_foo DEFINITION PUBLIC.
+  PUBLIC SECTION.
+    CONSTANTS:
+      "! Navigation modes
+      BEGIN OF cs_nav_mode,
+        back TYPE i VALUE 1,
+      END OF cs_nav_mode.
+ENDCLASS.`,
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    runParsed(file) {
+        const issues = [];
+        const statements = file.getStatements();
+        let definition = false;
+        for (let i = 0; i < statements.length; i++) {
+            const statement = statements[i];
+            const type = statement.get();
+            if (type instanceof Statements.ClassDefinition || type instanceof Statements.Interface) {
+                definition = true;
+                continue;
+            }
+            else if (type instanceof Statements.EndClass || type instanceof Statements.EndInterface) {
+                definition = false;
+                continue;
+            }
+            else if (definition === false || this.isAbapdoc(statement) === false) {
+                continue;
+            }
+            else if (this.isAbapdoc(statements[i - 1]) === true
+                && statements[i - 1].getStart().getRow() + 1 === statement.getStart().getRow()) {
+                continue; // only report the first row of each block
+            }
+            let next = undefined;
+            for (let j = i + 1; j < statements.length; j++) {
+                if (statements[j].get() instanceof _statement_1.Comment) {
+                    continue;
+                }
+                next = statements[j];
+                break;
+            }
+            if (next === undefined) {
+                continue;
+            }
+            const message = this.check(statement, next);
+            if (message !== undefined) {
+                issues.push(issue_1.Issue.atStatement(file, statement, message, this.getMetadata().key, this.conf.severity));
+            }
+        }
+        return issues;
+    }
+    isAbapdoc(statement) {
+        return (statement === null || statement === void 0 ? void 0 : statement.get()) instanceof _statement_1.Comment
+            && statement.getFirstToken().getStr().startsWith(`"!`);
+    }
+    check(abapdoc, next) {
+        const type = next.get();
+        if (type instanceof Statements.EndClass
+            || type instanceof Statements.EndInterface
+            || type instanceof Statements.Public
+            || type instanceof Statements.Protected
+            || type instanceof Statements.Private) {
+            return "ABAP Doc does not document anything, move or delete it";
+        }
+        const position = abapdoc.getStart();
+        const colon = next.getColon();
+        if (colon === undefined) {
+            if (position.isAfter(next.getStart()) === true) {
+                return "ABAP Doc inside statement, move it in front of the statement";
+            }
+            return undefined;
+        }
+        if (position.isBefore(colon.getStart()) === true) {
+            return "ABAP Doc in front of chained statement, move it after the colon";
+        }
+        const member = next.getTokens().find(t => t.getStart().isAfter(colon.getStart()));
+        if (member !== undefined && position.isAfter(member.getStart()) === true) {
+            return "ABAP Doc inside statement, move it in front of the chained declaration";
+        }
+        return undefined;
+    }
+}
+exports.WrongAbapdocPosition = WrongAbapdocPosition;
+//# sourceMappingURL=wrong_abapdoc_position.js.map

package/package.json

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