@abaplint/core 2.93.64 → 2.93.66

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

@@ -509,9 +509,14 @@ class BasicTypes {
             className = split[0];
             rest = split[1];
         }
+        else if (chainText.includes("->")) {
+            const split = chainText.split("->");
+            className = split[0];
+            rest = split[1];
+        }
         const subs = rest.split("-");
         let foundType = undefined;
-        if (className) {
+        if (className && chainText.includes("=>")) {
             const split = chainText.split("=>");
             const className = split[0];
             // the prefix might be itself
@@ -545,11 +550,11 @@ class BasicTypes {
                 this.scope.addReference(expr.getTokens()[2], byName, _reference_1.ReferenceType.TypeReference, this.filename);
             }
         }
-        else if (chainText.includes("->")) {
-            const [varName, typeName] = chainText.split("->");
-            const varVar = this.scope.findVariable(varName);
+        else if (className && chainText.includes("->")) {
+            const varVar = this.scope.findVariable(className);
             const foo = varVar === null || varVar === void 0 ? void 0 : varVar.getType();
             if (foo instanceof basic_1.ObjectReferenceType) {
+                const typeName = subs[0];
                 const id = foo.getIdentifier();
                 const type = id instanceof types_1.ClassDefinition ? "CLAS" : "INTF";
                 this.scope.addReference(expr.getFirstToken(), id, _reference_1.ReferenceType.ObjectOrientedReference, this.filename, { ooType: type, ooName: id.getName() });
@@ -562,10 +567,6 @@ class BasicTypes {
                     this.scope.addReference(expr.getTokens()[2], byName, _reference_1.ReferenceType.TypeReference, this.filename);
                 }
             }
-            // todo, ugh, hmm
-            while (subs.length > 0) {
-                subs.shift();
-            }
         }
         else {
             const found = this.scope.findType(subs[0]);

package/build/src/cds/expressions/cds_type.js

@@ -5,7 +5,8 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSType extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("(", (0, combi_1.regex)(/\d+/), ")")));
+        const decimals = (0, combi_1.seq)(",", (0, combi_1.regex)(/\d+/));
+        return (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)), (0, combi_1.opt)((0, combi_1.seq)("(", (0, combi_1.regex)(/\d+/), (0, combi_1.opt)(decimals), ")")));
     }
 }
 exports.CDSType = CDSType;

package/build/src/objects/data_definition.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataDefinition = void 0;
+const nodes_1 = require("../abap/nodes");
 const cds_determine_types_1 = require("../cds/cds_determine_types");
 const cds_parser_1 = require("../cds/cds_parser");
 const expressions_1 = require("../cds/expressions");
@@ -75,7 +76,15 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         this.findSQLViewName();
         this.parsedData.tree = new cds_parser_1.CDSParser().parse(this.findSourceFile());
         if (this.parsedData.tree) {
-            this.parsedData.definitionName = (_b = (_a = this.parsedData.tree) === null || _a === void 0 ? void 0 : _a.findFirstExpression(expressions_1.CDSName)) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr();
+            for (const c of ((_a = this.parsedData.tree) === null || _a === void 0 ? void 0 : _a.getChildren()) || []) {
+                if (c.get() instanceof expressions_1.CDSAnnotation) {
+                    continue;
+                }
+                if (c instanceof nodes_1.ExpressionNode) {
+                    this.parsedData.definitionName = (_b = c.findFirstExpression(expressions_1.CDSName)) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr();
+                    break;
+                }
+            }
             this.findSourcesAndRelations(this.parsedData.tree);
             this.findFieldNames(this.parsedData.tree);
         }

package/build/src/registry.js

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

package/package.json

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