@abaplint/core 2.89.1 → 2.89.4

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

@@ -623,7 +623,7 @@ class BasicTypes {
             const search = this.scope.existsObject(name);
             if (search.found === true && search.id) {
                 this.scope.addReference(chain.getFirstToken(), search.id, _reference_1.ReferenceType.ObjectOrientedReference, this.filename, { ooType: search.ooType, ooName: name });
-                return new Types.ObjectReferenceType(search.id);
+                return new Types.ObjectReferenceType(search.id, name);
             }
         }
         const found = this.resolveTypeName(chain);

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

@@ -30,12 +30,14 @@ class Cast {
                 tt = new basic_1.VoidType(typeName);
             }
             else if (found === undefined) {
+                // todo, this should be an UnknownType instead?
                 throw new Error("Type \"" + typeName + "\" not found in scope, Cast");
             }
             else {
                 tt = new basic_1.ObjectReferenceType(found);
             }
         }
+        new source_1.Source().addIfInferred(node, scope, filename, tt);
         if (new _type_utils_1.TypeUtils(scope).isCastable(sourceType, tt) === false) {
             throw new Error("Cast, incompatible types");
         }

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

@@ -176,6 +176,13 @@ class Source {
             if (found) {
                 scope.addReference(typeToken, found, _reference_1.ReferenceType.InferredType, filename);
             }
+            else if (inferredType instanceof basic_1.ObjectReferenceType) {
+                const def = scope.findObjectDefinition(inferredType.getQualifiedName());
+                if (def) {
+                    const tid = new _typed_identifier_1.TypedIdentifier(typeToken, filename, inferredType);
+                    scope.addReference(typeToken, tid, _reference_1.ReferenceType.InferredType, filename);
+                }
+            }
             else if (inferredType instanceof basic_1.CharacterType) {
                 // character is bit special it does not have a qualified name eg "TYPE c LENGTH 6"
                 const tid = new _typed_identifier_1.TypedIdentifier(typeToken, filename, inferredType);

package/build/src/abap/5_syntax/statements/find.js

@@ -18,12 +18,12 @@ class Find {
                 { name: "OFFSET", type: new basic_1.IntegerType() },
                 { name: "LENGTH", type: new basic_1.IntegerType() },
                 { name: "SUBMATCHES", type: new basic_1.TableType(new basic_1.StringType(), { withHeader: false }) },
-            ]);
+            ], "MATCH_RESULT");
             if (node.concatTokens().toUpperCase().startsWith("FIND FIRST")) {
                 this.inline(rfound, scope, filename, type);
             }
             else {
-                this.inline(rfound, scope, filename, new basic_1.TableType(type, { withHeader: false }));
+                this.inline(rfound, scope, filename, new basic_1.TableType(type, { withHeader: false }, "MATCH_RESULT_TAB"));
             }
         }
         const ofound = node.findExpressionsAfterToken("OFFSET");

package/build/src/registry.js

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

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)) {
@@ -1310,7 +1348,10 @@ ${indentation}    output = ${topTarget}.`;
             else if (found.getType() instanceof basic_1.VoidType && found.getType().getQualifiedName() === undefined) {
                 continue;
             }
-            const type = found.getType().getQualifiedName() ? (_b = found.getType().getQualifiedName()) === null || _b === void 0 ? void 0 : _b.toLowerCase() : found.getType().toABAP();
+            let type = found.getType().getQualifiedName() ? (_b = found.getType().getQualifiedName()) === null || _b === void 0 ? void 0 : _b.toLowerCase() : found.getType().toABAP();
+            if (found.getType() instanceof basic_1.ObjectReferenceType) {
+                type = found.getType().toABAP();
+            }
             const code = `DATA ${name} TYPE ${type}.\n` +
                 " ".repeat(node.getFirstToken().getStart().getCol() - 1);
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);

package/build/src/rules/no_inline_in_optional_branches.js

@@ -67,7 +67,7 @@ Not considered optional branches:
             const inline = c.findFirstExpression(Expressions.InlineData);
             if (inline) {
                 const message = "Don't declare inline in optional branches";
-                const issue = issue_1.Issue.atToken(file, c.getFirstToken(), message, this.getMetadata().key, this.getConfig().severity);
+                const issue = issue_1.Issue.atToken(file, inline.getFirstToken(), message, this.getMetadata().key, this.getConfig().severity);
                 output.push(issue);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.89.1",
+    "version": "2.89.4",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -52,7 +52,7 @@
         "chai": "^4.3.6",
         "eslint": "^8.13.0",
         "mocha": "^9.2.2",
-        "c8": "^7.11.0",
+        "c8": "^7.11.2",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^1.0.0",
         "typescript": "^4.6.3"