@abaplint/core 2.113.164 → 2.113.166

package/build/abaplint.d.ts

@@ -3881,6 +3881,7 @@ declare interface IReference {
 declare interface IReferenceExtras {
     ooName?: string;
     ooType?: "CLAS" | "INTF" | "Void";
+    foundQualified?: boolean;
 }
 
 export declare interface IRegistry {

package/build/src/abap/2_statements/expressions/source.js

@@ -28,7 +28,7 @@ class Source extends combi_1.Expression {
         const corr = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("CORRESPONDING", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CorrespondingBody, rparen, (0, combi_1.optPrio)(after)));
         const conv = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("CONV", _1.TypeNameOrInfer, lparenNoSpace, _1.ConvBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
         const swit = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("SWITCH", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.SwitchBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
-        const value = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("VALUE", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.ValueBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
+        const value = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("VALUE", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.ValueBody, rparenNoSpace, (0, combi_1.optPrio)(after)), version_1.Version.OpenABAP);
         const cond = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("COND", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CondBody, rparenNoSpace, (0, combi_1.optPrio)(after)));
         const reff = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("REF", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), Source, (0, combi_1.optPrio)("OPTIONAL"), rparen), version_1.Version.OpenABAP);
         const exact = (0, combi_1.ver)(version_1.Version.v740sp02, (0, combi_1.seq)("EXACT", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), Source, rparen, (0, combi_1.optPrio)(after)));

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

@@ -304,27 +304,24 @@ class Source {
         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);
+                input.scope.addReference(typeToken, found, _reference_1.ReferenceType.InferredType, input.filename, { foundQualified: true });
             }
             else if (inferredType instanceof basic_1.ObjectReferenceType) {
                 const def = input.scope.findObjectDefinition(inferredType.getQualifiedName());
+                const tid = new _typed_identifier_1.TypedIdentifier(typeToken, input.filename, inferredType);
                 if (def) {
-                    const tid = new _typed_identifier_1.TypedIdentifier(typeToken, input.filename, inferredType);
-                    input.scope.addReference(typeToken, tid, _reference_1.ReferenceType.InferredType, input.filename);
+                    input.scope.addReference(typeToken, tid, _reference_1.ReferenceType.InferredType, input.filename, { foundQualified: true });
+                }
+                else {
+                    input.scope.addReference(typeToken, tid, _reference_1.ReferenceType.InferredType, input.filename, { foundQualified: false });
                 }
             }
-            else if (inferredType instanceof basic_1.CharacterType) {
-                // character is bit special it does not have a qualified name eg "TYPE c LENGTH 6"
+            else {
                 const tid = new _typed_identifier_1.TypedIdentifier(typeToken, input.filename, inferredType);
-                input.scope.addReference(typeToken, tid, _reference_1.ReferenceType.InferredType, input.filename);
+                input.scope.addReference(typeToken, tid, _reference_1.ReferenceType.InferredType, input.filename, { foundQualified: false });
             }
         }
     }

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.164";
+        return "2.113.166";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/downport.js

@@ -2431,7 +2431,7 @@ ${indentation}    output = ${uniqueName}.\n`;
         throw new SkipToNextFile(issue);
     }
     findType(i, lowFile, highSyntax, ref = false) {
-        var _a;
+        var _a, _b;
         const expr = i.findDirectExpression(Expressions.TypeNameOrInfer);
         if (expr === undefined) {
             return undefined;
@@ -2450,7 +2450,8 @@ ${indentation}    output = ${uniqueName}.\n`;
             if (r.referenceType === _reference_1.ReferenceType.InferredType
                 && r.resolved
                 && r.position.getStart().equals(firstToken.getStart())
-                && r.resolved instanceof _typed_identifier_1.TypedIdentifier) {
+                && r.resolved instanceof _typed_identifier_1.TypedIdentifier
+                && ((_a = r.extra) === null || _a === void 0 ? void 0 : _a.foundQualified) === true) {
                 inferred = r.resolved;
                 break;
             }
@@ -2462,7 +2463,7 @@ ${indentation}    output = ${uniqueName}.\n`;
             return inferred.getType().toABAP();
         }
         else {
-            return (_a = inferred.getType().getQualifiedName()) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+            return (_b = inferred.getType().getQualifiedName()) === null || _b === void 0 ? void 0 : _b.toLowerCase();
         }
     }
     outlineFS(low, high, lowFile, highSyntax) {

package/package.json

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