@abaplint/core 2.89.4 → 2.89.7

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/2_statements/statements/message.js

@@ -12,7 +12,7 @@ class Message {
         const raising = (0, combi_1.seq)("RAISING", expressions_1.ExceptionName);
         const options = (0, combi_1.per)(like, into, raising);
         const type = (0, combi_1.seq)("TYPE", expressions_1.Source);
-        const sou = (0, combi_1.altPrio)(options, expressions_1.Source);
+        const sou = (0, combi_1.altPrio)(options, s);
         const sourc = (0, combi_1.alt)(sou, (0, combi_1.seq)(s, sou), (0, combi_1.seq)(s, s, sou), (0, combi_1.seq)(s, s, s, options));
         const mwith = (0, combi_1.seq)("WITH", s, (0, combi_1.opt)(sourc));
         const foo = (0, combi_1.seq)(expressions_1.MessageSource, (0, combi_1.opt)(options), (0, combi_1.opt)(mwith));

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/component_compare_simple.js

@@ -2,15 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentCompareSimple = void 0;
 const Expressions = require("../../2_statements/expressions");
+const nodes_1 = require("../../nodes");
 const component_chain_1 = require("./component_chain");
 const source_1 = require("./source");
 class ComponentCompareSimple {
     runSyntax(node, scope, filename, rowType) {
-        for (const s of node.findDirectExpressions(Expressions.Source)) {
-            new source_1.Source().runSyntax(s, scope, filename);
-        }
-        for (const s of node.findDirectExpressions(Expressions.ComponentChainSimple)) {
-            new component_chain_1.ComponentChain().runSyntax(rowType, s);
+        let targetType = undefined;
+        for (const c of node.getChildren()) {
+            if (c instanceof nodes_1.ExpressionNode) {
+                if (c.get() instanceof Expressions.ComponentChainSimple) {
+                    targetType = new component_chain_1.ComponentChain().runSyntax(rowType, c);
+                }
+                else if (c.get() instanceof Expressions.Dynamic) {
+                    targetType = undefined;
+                }
+                else if (c.get() instanceof Expressions.Source) {
+                    new source_1.Source().runSyntax(c, scope, filename, targetType);
+                }
+                else {
+                    throw "ComponentCompareSimple, unexpected node";
+                }
+            }
         }
     }
 }

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.4";
+        return "2.89.7";
     }
     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

@@ -63,6 +63,7 @@ Current rules:
 * 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
+* MESSAGE with non simple source
 
 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],
@@ -285,6 +286,10 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
+        found = this.downportMessage(high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         return undefined;
     }
     //////////////////////////////////////////
@@ -456,6 +461,30 @@ ${indentation}`);
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         return issue_1.Issue.atToken(lowFile, inlineData.getFirstToken(), "Outline SELECT @DATA", this.getMetadata().key, this.conf.severity, fix);
     }
+    downportMessage(high, lowFile, highSyntax) {
+        if (!(high.get() instanceof Statements.Message)) {
+            return undefined;
+        }
+        const foundWith = high.findExpressionAfterToken("WITH");
+        if (foundWith === undefined) {
+            return undefined;
+        }
+        const likeSource = high.findExpressionAfterToken("LIKE");
+        for (const s of high.findAllExpressions(Expressions.Source)) {
+            if (s === likeSource) {
+                continue;
+            }
+            const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+            const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+            const firstToken = high.getFirstToken();
+            const code = `DATA(${uniqueName}) = ${s.concatTokens()}.\n${indentation}`;
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), code);
+            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, s.getFirstToken().getStart(), s.getLastToken().getEnd(), uniqueName);
+            const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+            return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Refactor MESSAGE WITH source", this.getMetadata().key, this.conf.severity, fix);
+        }
+        return undefined;
+    }
     replaceAppendExpression(high, lowFile, highSyntax) {
         if (!(high.get() instanceof Statements.Append)) {
             return undefined;
@@ -1202,6 +1231,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.4",
+    "version": "2.89.7",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -47,7 +47,7 @@
     "devDependencies": {
         "@microsoft/api-extractor": "^7.22.2",
         "@types/chai": "^4.3.1",
-        "@types/mocha": "^9.1.0",
+        "@types/mocha": "^9.1.1",
         "@types/node": "^17.0.25",
         "chai": "^4.3.6",
         "eslint": "^8.13.0",