@abaplint/core 2.85.14 → 2.85.18

package/build/abaplint.d.ts

@@ -3824,11 +3824,19 @@ declare class Normal implements IStructure {
 }
 
 declare class NumberRange extends AbstractObject {
+    private parsedXML;
     getType(): string;
     getAllowedNaming(): {
         maxLength: number;
         allowNamespace: boolean;
     };
+    getDomain(): string | undefined;
+    getPercentage(): number | undefined;
+    setDirty(): void;
+    parse(): {
+        updated: boolean;
+        runtime: number;
+    };
     getDescription(): string | undefined;
 }
 
@@ -4547,6 +4555,7 @@ export declare enum ScopeType {
     Method = "method",
     MethodInstance = "method_instance",
     For = "for",
+    Let = "let",
     OpenSQL = "open_sql"
 }
 

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

@@ -887,14 +887,14 @@ BuiltIn.methods = [
     {
         name: "STRLEN",
         mandatory: {
-            "val": new basic_1.StringType(),
+            "val": new basic_1.CLikeType(),
         },
         return: new basic_1.IntegerType(),
     },
     {
         name: "SUBSTRING",
         mandatory: {
-            "val": new basic_1.StringType(),
+            "val": new basic_1.CLikeType(),
         },
         optional: {
             "off": new basic_1.IntegerType(),
@@ -906,7 +906,7 @@ BuiltIn.methods = [
     {
         name: "SUBSTRING_AFTER",
         mandatory: {
-            "val": new basic_1.StringType(),
+            "val": new basic_1.CLikeType(),
         },
         optional: {
             "sub": new basic_1.StringType(),
@@ -922,7 +922,7 @@ BuiltIn.methods = [
     {
         name: "SUBSTRING_BEFORE",
         mandatory: {
-            "val": new basic_1.StringType(),
+            "val": new basic_1.CLikeType(),
         },
         optional: {
             "sub": new basic_1.StringType(),
@@ -938,7 +938,7 @@ BuiltIn.methods = [
     {
         name: "SUBSTRING_FROM",
         mandatory: {
-            "val": new basic_1.StringType(),
+            "val": new basic_1.CLikeType(),
         },
         optional: {
             "sub": new basic_1.StringType(),
@@ -954,7 +954,7 @@ BuiltIn.methods = [
     {
         name: "SUBSTRING_TO",
         mandatory: {
-            "val": new basic_1.StringType(),
+            "val": new basic_1.CLikeType(),
         },
         optional: {
             "sub": new basic_1.StringType(),

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

@@ -17,6 +17,7 @@ var ScopeType;
     ScopeType["Method"] = "method";
     ScopeType["MethodInstance"] = "method_instance";
     ScopeType["For"] = "for";
+    ScopeType["Let"] = "let";
     ScopeType["OpenSQL"] = "open_sql";
 })(ScopeType = exports.ScopeType || (exports.ScopeType = {}));
 //# sourceMappingURL=_scope_type.js.map

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

@@ -78,7 +78,8 @@ class TypeUtils {
             }
             return false;
         }
-        else if (target instanceof basic_1.ObjectReferenceType || target instanceof basic_1.GenericObjectReferenceType) {
+        else if (target instanceof basic_1.ObjectReferenceType
+            || target instanceof basic_1.GenericObjectReferenceType) {
             if (source instanceof basic_1.ObjectReferenceType
                 || source instanceof basic_1.GenericObjectReferenceType
                 || source instanceof basic_1.VoidType
@@ -120,10 +121,12 @@ class TypeUtils {
         }
         else if (target instanceof basic_1.IntegerType
             || target instanceof basic_1.StringType) {
-            if (source instanceof basic_1.DataReference
+            if (source instanceof basic_1.TableType && source.isWithHeader() === false) {
+                return false;
+            }
+            else if (source instanceof basic_1.DataReference
                 || source instanceof basic_1.ObjectReferenceType
-                || source instanceof basic_1.GenericObjectReferenceType
-                || source instanceof basic_1.TableType) {
+                || source instanceof basic_1.GenericObjectReferenceType) {
                 return false;
             }
             return true;

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

@@ -515,7 +515,8 @@ class BasicTypes {
         }
         subs.shift();
         while (subs.length > 0) {
-            if (foundType instanceof Types.UnknownType) {
+            if (foundType instanceof Types.UnknownType
+                || foundType instanceof Types.VoidType) {
                 return foundType;
             }
             else if (!(foundType instanceof Types.StructureType)) {

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

@@ -10,9 +10,10 @@ class CondBody {
         if (node === undefined) {
             return targetType;
         }
+        let scoped = false;
         const l = node.findDirectExpression(Expressions.Let);
         if (l) {
-            new let_1.Let().runSyntax(l, scope, filename);
+            scoped = new let_1.Let().runSyntax(l, scope, filename);
         }
         for (const s of node.findDirectExpressions(Expressions.Cond)) {
             new cond_1.Cond().runSyntax(s, scope, filename);
@@ -26,6 +27,9 @@ class CondBody {
                 new source_1.Source().runSyntax(s, scope, filename);
             }
         }
+        if (scoped === true) {
+            scope.pop(node.getLastToken().getEnd());
+        }
         return targetType ? targetType : type;
     }
 }

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

@@ -9,13 +9,17 @@ class ConvBody {
         if (node === undefined) {
             return;
         }
+        let scoped = false;
         const l = node.findDirectExpression(Expressions.Let);
         if (l) {
-            new let_1.Let().runSyntax(l, scope, filename);
+            scoped = new let_1.Let().runSyntax(l, scope, filename);
         }
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
+        if (scoped === true) {
+            scope.pop(node.getLastToken().getEnd());
+        }
     }
 }
 exports.ConvBody = ConvBody;

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

@@ -7,12 +7,14 @@ const source_1 = require("./source");
 const inline_loop_definition_1 = require("./inline_loop_definition");
 const _scope_type_1 = require("../_scope_type");
 const component_cond_1 = require("./component_cond");
+const cond_1 = require("./cond");
 class For {
     runSyntax(node, scope, filename) {
         const inlineLoop = node.findDirectExpressions(Expressions.InlineLoopDefinition);
         const inlineField = node.findAllExpressions(Expressions.InlineFieldDefinition);
         const addScope = inlineLoop.length > 0 || inlineField.length > 0;
         if (addScope) {
+            // this scope is popped in parent expressions
             scope.push(_scope_type_1.ScopeType.For, "FOR", node.getFirstToken().getStart(), filename);
         }
         for (const s of inlineLoop) {
@@ -27,11 +29,9 @@ class For {
         for (const s of node.findDirectExpressions(Expressions.ComponentCond)) {
             new component_cond_1.ComponentCond().runSyntax(s, scope, filename);
         }
-        /*
-        if (addScope) {
-          scope.pop(node.getLastToken().getEnd());
+        for (const s of node.findDirectExpressions(Expressions.Cond)) {
+            new cond_1.Cond().runSyntax(s, scope, filename);
         }
-        */
     }
 }
 exports.For = For;

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

@@ -9,8 +9,9 @@ const unknown_type_1 = require("../../types/basic/unknown_type");
 const _reference_1 = require("../_reference");
 class InlineFieldDefinition {
     runSyntax(node, scope, filename) {
+        var _a;
         let type = undefined;
-        const field = node.findDirectExpression(Expressions.Field);
+        const field = (_a = node.findDirectExpression(Expressions.Field)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
         if (field === undefined) {
             return;
         }
@@ -25,8 +26,12 @@ class InlineFieldDefinition {
         if (type === undefined) {
             type = new unknown_type_1.UnknownType("InlineFieldDefinition, fallback");
         }
-        const identifier = new _typed_identifier_1.TypedIdentifier(field.getFirstToken(), filename, type, ["inline" /* InlineDefinition */]);
-        scope.addReference(field.getFirstToken(), identifier, _reference_1.ReferenceType.DataWriteReference, filename);
+        const name = field.getStr();
+        if (scope.findVariable(name) !== undefined) {
+            throw new Error(`Variable ${name} already defined`);
+        }
+        const identifier = new _typed_identifier_1.TypedIdentifier(field, filename, type, ["inline" /* InlineDefinition */]);
+        scope.addReference(field, identifier, _reference_1.ReferenceType.DataWriteReference, filename);
         scope.addIdentifier(identifier);
     }
 }

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

@@ -3,14 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Let = void 0;
 const Expressions = require("../../2_statements/expressions");
 const inline_field_definition_1 = require("./inline_field_definition");
+const _scope_type_1 = require("../_scope_type");
 class Let {
     runSyntax(node, scope, filename) {
         if (node === undefined) {
-            return;
+            return false;
         }
+        scope.push(_scope_type_1.ScopeType.Let, "LET", node.getFirstToken().getStart(), filename);
         for (const f of node.findDirectExpressions(Expressions.InlineFieldDefinition)) {
             new inline_field_definition_1.InlineFieldDefinition().runSyntax(f, scope, filename);
         }
+        return true;
     }
 }
 exports.Let = Let;

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

@@ -12,14 +12,15 @@ class ValueBody {
         if (node === undefined) {
             return targetType;
         }
-        const letNode = node.findDirectExpression(Expressions.Let);
-        if (letNode) {
-            new let_1.Let().runSyntax(letNode, scope, filename);
-        }
         const forNode = node.findDirectExpression(Expressions.For);
         if (forNode) {
             new for_1.For().runSyntax(forNode, scope, filename);
         }
+        let scoped = false;
+        const letNode = node.findDirectExpression(Expressions.Let);
+        if (letNode) {
+            scoped = new let_1.Let().runSyntax(letNode, scope, filename);
+        }
         for (const s of node.findDirectExpressions(Expressions.FieldAssignment)) {
             new field_assignment_1.FieldAssignment().runSyntax(s, scope, filename, targetType);
         }
@@ -27,6 +28,9 @@ class ValueBody {
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             type = new source_1.Source().runSyntax(s, scope, filename);
         }
+        if (scoped === true) {
+            scope.pop(node.getLastToken().getEnd());
+        }
         if (scope.getType() === _scope_type_1.ScopeType.For) {
             scope.pop(node.getLastToken().getEnd());
         }

package/build/src/objects/number_range.js

@@ -12,9 +12,43 @@ class NumberRange extends _abstract_object_1.AbstractObject {
             allowNamespace: true,
         };
     }
+    getDomain() {
+        var _a;
+        this.parse();
+        return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.domain;
+    }
+    getPercentage() {
+        var _a;
+        this.parse();
+        return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.percentage;
+    }
+    setDirty() {
+        this.parsedXML = undefined;
+        super.setDirty();
+    }
+    parse() {
+        var _a, _b, _c, _d, _e, _f;
+        if (this.parsedXML) {
+            return { updated: false, runtime: 0 };
+        }
+        const start = Date.now();
+        this.parsedXML = {};
+        const parsed = super.parseRaw2();
+        if (parsed === undefined) {
+            return { updated: false, runtime: 0 };
+        }
+        const text = (_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.TEXT;
+        this.parsedXML.description = text === null || text === void 0 ? void 0 : text.TXT;
+        const attributes = (_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.ATTRIBUTES;
+        this.parsedXML.domain = attributes === null || attributes === void 0 ? void 0 : attributes.DOMLEN;
+        this.parsedXML.percentage = parseFloat((attributes === null || attributes === void 0 ? void 0 : attributes.PERCENTAGE) || "");
+        const end = Date.now();
+        return { updated: true, runtime: end - start };
+    }
     getDescription() {
-        // todo
-        return undefined;
+        var _a;
+        this.parse();
+        return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.description;
     }
 }
 exports.NumberRange = NumberRange;

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -659,8 +659,34 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
+    outlineFor(forLoop, indentation) {
+        var _a, _b, _c, _d, _e, _f;
+        let body = "";
+        let end = "";
+        const loopSource = (_a = forLoop.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
+        const loopTargetField = (_b = forLoop.findFirstExpression(Expressions.TargetField)) === null || _b === void 0 ? void 0 : _b.concatTokens();
+        if (forLoop.findDirectTokenByText("UNTIL")) {
+            const name = (_c = forLoop.findFirstExpression(Expressions.Field)) === null || _c === void 0 ? void 0 : _c.concatTokens();
+            body += indentation + "DATA " + name + " TYPE i.\n";
+            const cond = forLoop.findFirstExpression(Expressions.Cond);
+            body += indentation + `WHILE NOT ${cond === null || cond === void 0 ? void 0 : cond.concatTokens()}.\n`;
+            const field = (_e = (_d = forLoop.findDirectExpression(Expressions.InlineFieldDefinition)) === null || _d === void 0 ? void 0 : _d.findFirstExpression(Expressions.Field)) === null || _e === void 0 ? void 0 : _e.concatTokens();
+            body += indentation + `  ${field} = ${field} + 1.\n`;
+            end = "ENDWHILE";
+        }
+        else if (loopTargetField) {
+            body += indentation + `LOOP AT ${loopSource} INTO DATA(${loopTargetField}).\n`;
+            end = "ENDLOOP";
+        }
+        else if (loopTargetField === undefined) {
+            const loopTargetFieldSymbol = (_f = forLoop.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _f === void 0 ? void 0 : _f.concatTokens();
+            body += indentation + `LOOP AT ${loopSource} ASSIGNING FIELD-SYMBOL(${loopTargetFieldSymbol}).\n`;
+            end = "ENDLOOP";
+        }
+        return { body, end };
+    }
     outlineReduce(node, lowFile, highSyntax) {
-        var _a, _b, _c, _d;
+        var _a;
         for (const i of node.findAllExpressionsRecursive(Expressions.Source)) {
             const firstToken = i.getFirstToken();
             if (firstToken.getStr().toUpperCase() !== "REDUCE") {
@@ -682,19 +708,12 @@ ${indentation}    output = ${topTarget}.`;
                 name = init.getFirstToken().getStr();
                 body += indentation + `DATA(${name}) = ${(_a = reduceBody.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens()}.\n`;
             }
-            const loop = reduceBody.findFirstExpression(Expressions.InlineLoopDefinition);
-            if (loop === undefined) {
+            const forLoop = reduceBody.findDirectExpression(Expressions.For);
+            if (forLoop === undefined) {
                 continue;
             }
-            const loopSource = (_b = loop.findFirstExpression(Expressions.Source)) === null || _b === void 0 ? void 0 : _b.concatTokens();
-            const loopTargetField = (_c = loop.findFirstExpression(Expressions.TargetField)) === null || _c === void 0 ? void 0 : _c.concatTokens();
-            if (loopTargetField) {
-                body += indentation + `LOOP AT ${loopSource} INTO DATA(${loopTargetField}).\n`;
-            }
-            if (loopTargetField === undefined) {
-                const loopTargetFieldSymbol = (_d = loop.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _d === void 0 ? void 0 : _d.concatTokens();
-                body += indentation + `LOOP AT ${loopSource} ASSIGNING FIELD-SYMBOL(${loopTargetFieldSymbol}).\n`;
-            }
+            const outlineFor = this.outlineFor(forLoop, indentation);
+            body += outlineFor.body;
             const next = reduceBody.findDirectExpression(Expressions.ReduceNext);
             if (next === undefined) {
                 continue;
@@ -713,7 +732,7 @@ ${indentation}    output = ${topTarget}.`;
                     body += n.concatTokens() + ".\n";
                 }
             }
-            body += indentation + `ENDLOOP.\n`;
+            body += indentation + outlineFor.end + `.\n`;
             body += indentation + `${uniqueName} = ${name}.\n`;
             const abap = `DATA ${uniqueName} TYPE ${type}.\n` +
                 body +
@@ -726,7 +745,6 @@ ${indentation}    output = ${topTarget}.`;
         return undefined;
     }
     outlineValue(node, lowFile, highSyntax) {
-        var _a, _b;
         const allSources = node.findAllExpressionsRecursive(Expressions.Source);
         for (const i of allSources) {
             const firstToken = i.getFirstToken();
@@ -741,11 +759,11 @@ ${indentation}    output = ${topTarget}.`;
             const uniqueName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
             let indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
             let body = "";
-            const loop = valueBody === null || valueBody === void 0 ? void 0 : valueBody.findFirstExpression(Expressions.InlineLoopDefinition);
-            if (loop) {
-                const loopSource = (_a = loop.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
-                const loopTargetFieldSymbol = (_b = loop.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _b === void 0 ? void 0 : _b.concatTokens();
-                body += indentation + `LOOP AT ${loopSource} ASSIGNING FIELD-SYMBOL(${loopTargetFieldSymbol}).\n`;
+            const forLoop = valueBody === null || valueBody === void 0 ? void 0 : valueBody.findDirectExpression(Expressions.For);
+            let outlineFor = { body: "", end: "" };
+            if (forLoop !== undefined) {
+                outlineFor = this.outlineFor(forLoop, indentation);
+                body += outlineFor.body;
                 indentation += "  ";
             }
             let structureName = uniqueName;
@@ -773,9 +791,9 @@ ${indentation}    output = ${topTarget}.`;
                     body += indentation + `APPEND ${structureName} TO ${uniqueName}.\n`;
                 }
             }
-            if (loop) {
-                indentation = indentation.substr(2);
-                body += indentation + `ENDLOOP.\n`;
+            if (forLoop !== undefined) {
+                indentation = indentation.substring(2);
+                body += indentation + outlineFor.end + `.\n`;
             }
             const abap = `DATA ${uniqueName} TYPE ${type}.\n` +
                 body +
@@ -913,7 +931,7 @@ ${indentation}    output = ${topTarget}.`;
             const uniqueName = this.uniqueName(i.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const type = this.findType(i, lowFile, highSyntax);
             const indent = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
-            const bodyCode = this.buildCondBody(body, uniqueName, indent);
+            const bodyCode = this.buildCondBody(body, uniqueName, indent, lowFile, highSyntax);
             const abap = `DATA ${uniqueName} TYPE ${type}.\n` + bodyCode;
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), abap);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, i.getFirstToken().getStart(), i.getLastToken().getEnd(), uniqueName);
@@ -922,13 +940,13 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
-    buildCondBody(body, uniqueName, indent) {
-        let code = indent;
+    buildCondBody(body, uniqueName, indent, lowFile, highSyntax) {
+        let code = "";
         for (const c of body.getChildren()) {
             if (c instanceof nodes_1.TokenNode) {
                 switch (c.getFirstToken().getStr().toUpperCase()) {
                     case "WHEN":
-                        code += "IF ";
+                        code += indent + "IF ";
                         break;
                     case "THEN":
                         code += ".\n";
@@ -943,11 +961,14 @@ ${indentation}    output = ${topTarget}.`;
             else if (c.get() instanceof Expressions.Cond) {
                 code += c.concatTokens();
             }
+            else if (c.get() instanceof Expressions.Let) {
+                code += this.outlineLet(c, indent, highSyntax, lowFile);
+            }
             else if (c.get() instanceof Expressions.Source) {
                 code += indent + "  " + uniqueName + " = " + c.concatTokens() + ".\n";
             }
             else {
-                throw "buildCondBody, unexpected expression";
+                throw "buildCondBody, unexpected expression, " + c.get().constructor.name;
             }
         }
         code += indent + "ENDIF.\n";

package/build/src/rules/superclass_final.js

@@ -44,8 +44,12 @@ class SuperclassFinal extends _abap_rule_1.ABAPRule {
             }
             let found = undefined;
             if (localLookup) {
-                // todo, this should look inside the object instead of the file?
-                found = file.getInfo().getClassDefinitionByName(sup);
+                for (const f of obj.getABAPFiles()) {
+                    found = f.getInfo().getClassDefinitionByName(sup);
+                    if (found !== undefined) {
+                        break;
+                    }
+                }
             }
             if (found === undefined) {
                 const clas = this.reg.getObject("CLAS", sup);

package/build/src/rules/use_new.js

@@ -25,7 +25,9 @@ class UseNew extends _abap_rule_1.ABAPRule {
             shortDescription: `Checks for deprecated CREATE OBJECT statements.`,
             extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#prefer-new-to-create-object
 
-If the target variable is referenced in the CREATE OBJECT statement, no errors are issued`,
+If the target variable is referenced in the CREATE OBJECT statement, no errors are issued
+
+Applicable from v740sp02 and up`,
             badExample: `CREATE OBJECT ref.`,
             goodExample: `ref = NEW #( ).`,
             tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Styleguide, _irule_1.RuleTag.Quickfix, _irule_1.RuleTag.SingleFile],

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.85.14",
+    "version": "2.85.18",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,7 +50,7 @@
         "@types/mocha": "^9.1.0",
         "@types/node": "^17.0.17",
         "chai": "^4.3.6",
-        "eslint": "^8.8.0",
+        "eslint": "^8.9.0",
         "mocha": "^9.2.0",
         "c8": "^7.11.0",
         "source-map-support": "^0.5.21",