@abaplint/core 2.89.3 → 2.89.6

package/build/abaplint.d.ts

@@ -1144,7 +1144,7 @@ export declare class CurrentScope {
     /** Lookup class in local and global scope */
     findClassDefinition(name: string | undefined): IClassDefinition | undefined;
     findTypePoolConstant(name: string | undefined): TypedIdentifier | undefined;
-    findTypePoolType(name: string): AbstractType | undefined;
+    findTypePoolType(name: string): TypedIdentifier | undefined;
     /** Lookup interface in local and global scope */
     findInterfaceDefinition(name: string): IInterfaceDefinition | undefined;
     findFormDefinition(name: string): IFormDefinition | undefined;

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

@@ -220,7 +220,7 @@ class CurrentScope {
         return found;
     }
     findTypePoolType(name) {
-        var _a, _b;
+        var _a;
         if (name.includes("_") === undefined) {
             return undefined;
         }
@@ -230,7 +230,7 @@ class CurrentScope {
             return undefined;
         }
         const spag = (_a = new syntax_1.SyntaxLogic(this.reg, typePool).run().spaghetti.getFirstChild()) === null || _a === void 0 ? void 0 : _a.getFirstChild();
-        const found = (_b = spag === null || spag === void 0 ? void 0 : spag.findType(name)) === null || _b === void 0 ? void 0 : _b.getType();
+        const found = spag === null || spag === void 0 ? void 0 : spag.findType(name);
         return found;
     }
     /** Lookup interface in local and global scope */

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

@@ -52,6 +52,10 @@ class BasicTypes {
         if (builtin) {
             return new _typed_identifier_1.TypedIdentifier(new identifier_1.Identifier(new position_1.Position(1, 1), name), _builtin_1.BuiltIn.filename, builtin);
         }
+        const type = this.scope.findTypePoolType(name);
+        if (type) {
+            return type;
+        }
         return undefined;
     }
     resolveLikeName(node, headerLogic = true) {
@@ -145,6 +149,7 @@ class BasicTypes {
         return type;
     }
     resolveTypeName(typeName, length, decimals, name) {
+        var _a;
         if (typeName === undefined) {
             return undefined;
         }
@@ -170,7 +175,7 @@ class BasicTypes {
             this.scope.addReference(token, typ, _reference_1.ReferenceType.TypeReference, this.filename);
             return typ.getType();
         }
-        const type = this.scope.findTypePoolType(chainText);
+        const type = (_a = this.scope.findTypePoolType(chainText)) === null || _a === void 0 ? void 0 : _a.getType();
         if (type) {
             //      this.scope.addReference(typeName.getFirstToken(), type, ReferenceType.TypeReference, this.filename);
             return type;
@@ -445,6 +450,7 @@ class BasicTypes {
     /////////////////////
     // todo, rewrite this method
     resolveTypeChain(expr) {
+        var _a;
         const chainText = expr.concatTokens().toUpperCase();
         if (chainText.includes("=>") === false && chainText.includes("-") === false) {
             return undefined;
@@ -496,7 +502,7 @@ class BasicTypes {
             const found = this.scope.findType(subs[0]);
             foundType = found === null || found === void 0 ? void 0 : found.getType();
             if (foundType === undefined) {
-                const typePoolType = this.scope.findTypePoolType(subs[0]);
+                const typePoolType = (_a = this.scope.findTypePoolType(subs[0])) === null || _a === void 0 ? void 0 : _a.getType();
                 if (typePoolType) {
                     //          this.scope.addReference(typeName.getFirstToken(), typePoolType, ReferenceType.TypeReference, this.filename);
                     foundType = typePoolType;

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

@@ -120,7 +120,11 @@ class Source {
                 case "VALUE":
                     {
                         const foundType = this.determineType(node, scope, filename, targetType);
-                        return new value_body_1.ValueBody().runSyntax(node.findDirectExpression(Expressions.ValueBody), scope, filename, foundType);
+                        const bodyType = new value_body_1.ValueBody().runSyntax(node.findDirectExpression(Expressions.ValueBody), scope, filename, foundType);
+                        if (foundType === undefined || foundType.isGeneric()) {
+                            this.addIfInferred(node, scope, filename, bodyType);
+                        }
+                        return foundType ? foundType : bodyType;
                     }
                 default:
                     return new unknown_type_1.UnknownType("todo, Source type " + tok);

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

@@ -33,6 +33,9 @@ class ValueBody {
         while (scope.getType() === _scope_type_1.ScopeType.For) {
             scope.pop(node.getLastToken().getEnd());
         }
+        if ((targetType === null || targetType === void 0 ? void 0 : targetType.isGeneric()) && type) {
+            return type;
+        }
         return targetType ? targetType : type;
     }
 }

package/build/src/ddic.js

@@ -46,13 +46,13 @@ class DDIC {
     lookupBuiltinType(name, length, decimals, qualifiedName) {
         switch (name) {
             case "STRING":
-                return new Types.StringType(name);
+                return new Types.StringType(qualifiedName || name);
             case "XSTRING":
-                return new Types.XStringType(name);
+                return new Types.XStringType(qualifiedName || name);
             case "D":
-                return new Types.DateType(name);
+                return new Types.DateType(qualifiedName || name);
             case "T":
-                return new Types.TimeType(name);
+                return new Types.TimeType(qualifiedName || name);
             case "XSEQUENCE":
                 return new Types.XSequenceType(qualifiedName);
             case "CLIKE":
@@ -81,9 +81,9 @@ class DDIC {
                 return new Types.CSequenceType(qualifiedName);
             case "I":
             case "INT8": // todo, take version into account
-                return new Types.IntegerType(name);
+                return new Types.IntegerType(qualifiedName || name);
             case "F":
-                return new Types.FloatType(name);
+                return new Types.FloatType(qualifiedName || name);
             case "P":
                 if (length && decimals) {
                     return new Types.PackedType(length, decimals, qualifiedName);

package/build/src/registry.js

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

package/build/src/rules/definitions_top.js

@@ -42,6 +42,7 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
         this.conf = conf;
     }
     runParsed(file) {
+        var _a;
         const issues = [];
         const structure = file.getStructure();
         if (structure === undefined) {
@@ -52,7 +53,7 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
             // one fix per routine
             this.fixed = false;
             this.mode = DEFINITION;
-            this.moveTo = r.getFirstStatement();
+            this.moveTo = (_a = r.getFirstStatement()) === null || _a === void 0 ? void 0 : _a.getLastToken().getEnd();
             const found = this.walk(r, file);
             if (found) {
                 issues.push(found);
@@ -81,6 +82,9 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
                     // no quick fixes for these, its difficult?
                     return issue_1.Issue.atStatement(file, c.getFirstStatement(), this.getMessage(), this.getMetadata().key, this.conf.severity);
                 }
+                else {
+                    this.moveTo = c.getLastToken().getEnd();
+                }
             }
             else if (c instanceof nodes_1.StatementNode
                 && (c.get() instanceof Statements.Data
@@ -98,7 +102,7 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
                     return issue_1.Issue.atStatement(file, c, this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
                 }
                 else {
-                    this.moveTo = c;
+                    this.moveTo = c.getLastToken().getEnd();
                 }
             }
             else if (c instanceof nodes_1.StructureNode && c.get() instanceof Structures.Define) {
@@ -121,12 +125,12 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
         }
         return undefined;
     }
-    buildFix(file, statement, start) {
+    buildFix(file, statement, at) {
         let concat = statement.concatTokens();
         concat = concat.replace(/,$/, ".");
         const fix1 = edit_helper_1.EditHelper.deleteStatement(file, statement);
         const indentation = " ".repeat(statement.getFirstToken().getCol() - 1);
-        const fix2 = edit_helper_1.EditHelper.insertAt(file, start.getEnd(), "\n" + indentation + concat);
+        const fix2 = edit_helper_1.EditHelper.insertAt(file, at, "\n" + indentation + concat);
         return edit_helper_1.EditHelper.merge(fix1, fix2);
     }
 }

package/build/src/rules/downport.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Downport = exports.DownportConf = void 0;
+const Statements = require("../abap/2_statements/statements");
+const Expressions = require("../abap/2_statements/expressions");
+const Structures = require("../abap/3_structures/structures");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const issue_1 = require("../issue");
 const _irule_1 = require("./_irule");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
 const nodes_1 = require("../abap/nodes");
-const Statements = require("../abap/2_statements/statements");
-const Expressions = require("../abap/2_statements/expressions");
 const edit_helper_1 = require("../edit_helper");
 const position_1 = require("../position");
 const _abap_object_1 = require("../objects/_abap_object");
@@ -61,6 +62,7 @@ Current rules:
 * RAISE EXCEPTION ... MESSAGE
 * Moving with +=, -=, /=, *=, &&= is expanded
 * line_exists and line_index is downported to READ TABLE
+* ENUMs, but does not nessesarily give the correct type and value
 
 Only one transformation is applied to a statement at a time, so multiple steps might be required to do the full downport.`,
             tags: [_irule_1.RuleTag.Experimental, _irule_1.RuleTag.Downport, _irule_1.RuleTag.Quickfix],
@@ -131,7 +133,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
                 const high = highStatements[i];
                 if ((low.get() instanceof _statement_1.Unknown && !(high.get() instanceof _statement_1.Unknown))
                     || high.findFirstExpression(Expressions.InlineData)) {
-                    const issue = this.checkStatement(low, high, lowFile, highSyntax);
+                    const issue = this.checkStatement(low, high, lowFile, highSyntax, highFile);
                     if (issue) {
                         ret.push(issue);
                     }
@@ -163,11 +165,15 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         this.highReg.parse();
     }
     /** applies one rule at a time, multiple iterations are required to transform complex statements */
-    checkStatement(low, high, lowFile, highSyntax) {
+    checkStatement(low, high, lowFile, highSyntax, highFile) {
         if (low.getFirstToken().getStart() instanceof position_1.VirtualPosition) {
             return undefined;
         }
-        let found = this.partiallyImplemented(high, lowFile);
+        let found = this.downportEnum(low, high, lowFile, highSyntax, highFile);
+        if (found) {
+            return found;
+        }
+        found = this.partiallyImplemented(high, lowFile);
         if (found) {
             return found;
         }
@@ -738,6 +744,38 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, simple move", this.getMetadata().key, this.conf.severity, fix);
     }
+    // note, downporting ENUM does not give the correct types, but it will work in most cases?
+    downportEnum(_low, high, lowFile, _highSyntax, highFile) {
+        var _a, _b, _c, _d, _e;
+        if (!(high.get() instanceof Statements.TypeEnumBegin)) {
+            return undefined;
+        }
+        const enumStructure = (_a = highFile.getStructure()) === null || _a === void 0 ? void 0 : _a.findFirstStructure(Structures.TypeEnum);
+        if (enumStructure === undefined) {
+            return undefined;
+        }
+        if (enumStructure.getFirstStatement() !== high) {
+            return undefined;
+        }
+        const enumName = (_b = high.findExpressionAfterToken("ENUM")) === null || _b === void 0 ? void 0 : _b.concatTokens();
+        const structureName = (_c = high.findExpressionAfterToken("STRUCTURE")) === null || _c === void 0 ? void 0 : _c.concatTokens();
+        let code = `TYPES ${enumName} TYPE i.
+CONSTANTS: BEGIN OF ${structureName},\n`;
+        let count = 1;
+        for (const e of enumStructure.findDirectStatements(Statements.TypeEnum).concat(enumStructure.findDirectStatements(Statements.Type))) {
+            const name = (_d = e.findFirstExpression(Expressions.NamespaceSimpleName)) === null || _d === void 0 ? void 0 : _d.concatTokens();
+            let value = (_e = e.findFirstExpression(Expressions.Value)) === null || _e === void 0 ? void 0 : _e.concatTokens();
+            if (value === undefined) {
+                value = "VALUE " + count++;
+            }
+            code += `             ${name} TYPE ${enumName} ${value},\n`;
+        }
+        code += `           END OF ${structureName}.`;
+        const start = enumStructure.getFirstToken().getStart();
+        const end = enumStructure.getLastToken().getEnd();
+        const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
+        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport ENUM", this.getMetadata().key, this.conf.severity, fix);
+    }
     moveWithTableTarget(node, high, lowFile, highSyntax) {
         var _a;
         if (!(high.get() instanceof Statements.Move)) {
@@ -1164,6 +1202,9 @@ ${indentation}    output = ${topTarget}.`;
                 }
                 else if (b.get() instanceof Expressions.Source) {
                     structureName = b.concatTokens();
+                    if (base && (valueBody === null || valueBody === void 0 ? void 0 : valueBody.findDirectTokenByText("(")) === undefined) {
+                        structureName = uniqueName;
+                    }
                 }
                 else if (b.get() instanceof Expressions.ValueBodyLines) {
                     body += indentation + "APPEND " + b.concatTokens() + ` TO ${uniqueName}.\n`;

package/package.json

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