@abaplint/cli 2.113.157 → 2.113.159

package/build/cli.js

@@ -28115,6 +28115,10 @@ class Source {
                     {
                         const foundType = this.determineType(node, input, targetType);
                         const bodyType = cond_body_1.CondBody.runSyntax(node.findDirectExpression(Expressions.CondBody), input, foundType);
+                        /*
+                        console.log("COND BODY type;:");
+                        console.dir(bodyType);
+                        */
                         if (foundType === undefined || foundType.isGeneric()) {
                             this.addIfInferred(node, input, bodyType);
                         }
@@ -28144,12 +28148,27 @@ class Source {
                     {
                         let foundType = this.determineType(node, input, targetType);
                         const s = Source.runSyntax(node.findDirectExpression(Expressions.Source), input);
-                        if (foundType === undefined && s) {
+                        /*
+                        console.dir(node.concatTokens());
+                        console.dir(targetType);
+                        console.dir(foundType);
+                        console.dir(s);
+                        */
+                        if (foundType && foundType.isGeneric() && s) {
+                            foundType = new basic_1.DataReference(s);
+                        }
+                        else if (foundType === undefined && s) {
                             foundType = new basic_1.DataReference(s);
                         }
-                        else if (foundType) {
+                        else if (foundType && targetType === undefined) {
                             foundType = new basic_1.DataReference(foundType);
                         }
+                        /*
+                        if (targetType && !(targetType instanceof DataReference)) {
+                          const message = `REF: Types not compatible, ` + targetType.constructor.name;
+                          input.issues.push(syntaxIssue(input, node.getFirstToken(), message));
+                        }
+                        */
                         this.addIfInferred(node, input, foundType);
                         return foundType;
                     }
@@ -28301,11 +28320,20 @@ class Source {
         const typeExpression = node.findDirectExpression(Expressions.TypeNameOrInfer);
         const typeToken = typeExpression === null || typeExpression === void 0 ? void 0 : typeExpression.getFirstToken();
         const typeName = typeToken === null || typeToken === void 0 ? void 0 : typeToken.getStr();
+        /*
+        console.dir(inferredType);
+        console.dir(typeToken);
+        */
+        // hmm, need to align all this
         if (typeName === "#" && inferredType && typeToken) {
             const found = basic.lookupQualifiedName(inferredType.getQualifiedName());
             if (found) {
                 input.scope.addReference(typeToken, found, _reference_1.ReferenceType.InferredType, input.filename);
             }
+            else if (inferredType instanceof basic_1.DataReference) {
+                const tid = new _typed_identifier_1.TypedIdentifier(typeToken, input.filename, inferredType);
+                input.scope.addReference(typeToken, tid, _reference_1.ReferenceType.InferredType, input.filename);
+            }
             else if (inferredType instanceof basic_1.ObjectReferenceType) {
                 const def = input.scope.findObjectDefinition(inferredType.getQualifiedName());
                 if (def) {
@@ -54766,7 +54794,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.157";
+        return "2.113.159";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.157",
+    "version": "2.113.159",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.113.156",
+        "@abaplint/core": "^2.113.159",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",