@abaplint/core 2.82.8 → 2.82.9

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

@@ -524,39 +524,52 @@ class BasicTypes {
         return foundType;
     }
     resolveConstantValue(expr) {
-        var _a;
+        var _a, _b;
         if (!(expr.get() instanceof Expressions.SimpleFieldChain)) {
             throw new Error("resolveConstantValue");
         }
-        const first = expr.getFirstChild();
-        if (first.get() instanceof Expressions.Field) {
-            const token = first.getFirstToken();
-            const name = token.getStr();
-            const found = this.scope.findVariable(name);
+        const firstNode = expr.getFirstChild();
+        const firstToken = firstNode.getFirstToken();
+        const firstName = firstToken.getStr();
+        if (firstNode.get() instanceof Expressions.Field) {
+            const found = this.scope.findVariable(firstName);
             const val = found === null || found === void 0 ? void 0 : found.getValue();
             if (typeof val === "string") {
-                this.scope.addReference(token, found, _reference_1.ReferenceType.DataReadReference, this.filename);
+                this.scope.addReference(firstToken, found, _reference_1.ReferenceType.DataReadReference, this.filename);
                 return val;
             }
             return undefined;
         }
-        else if (first.get() instanceof Expressions.ClassName) {
-            const name = first.getFirstToken().getStr();
-            const obj = this.scope.findObjectDefinition(name);
+        else if (firstNode.get() instanceof Expressions.ClassName
+            && firstName.toLowerCase() === this.scope.getName().toLowerCase()
+            && (this.scope.getType() === _scope_type_1.ScopeType.Interface
+                || this.scope.getType() === _scope_type_1.ScopeType.ClassDefinition)) {
+            const children = expr.getChildren();
+            const token = (_a = children[2]) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+            const found = this.scope.findVariable(token.getStr());
+            const val = found === null || found === void 0 ? void 0 : found.getValue();
+            if (typeof val === "string") {
+                this.scope.addReference(firstToken, found, _reference_1.ReferenceType.DataReadReference, this.filename);
+                return val;
+            }
+            return undefined;
+        }
+        else if (firstNode.get() instanceof Expressions.ClassName) {
+            const obj = this.scope.findObjectDefinition(firstName);
             if (obj === undefined) {
-                if (this.scope.existsObject(name).found === true) {
+                if (this.scope.existsObject(firstName).found === true) {
                     return undefined;
                 }
-                else if (this.scope.getDDIC().inErrorNamespace(name) === true) {
-                    throw new Error("resolveConstantValue, not found: " + name);
+                else if (this.scope.getDDIC().inErrorNamespace(firstName) === true) {
+                    throw new Error("resolveConstantValue, not found: " + firstName);
                 }
                 else {
-                    this.scope.addReference(first.getFirstToken(), undefined, _reference_1.ReferenceType.ObjectOrientedVoidReference, this.filename, { ooName: name.toUpperCase() });
+                    this.scope.addReference(firstNode.getFirstToken(), undefined, _reference_1.ReferenceType.ObjectOrientedVoidReference, this.filename, { ooName: firstName.toUpperCase() });
                     return undefined;
                 }
             }
             const children = expr.getChildren();
-            const token = (_a = children[2]) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+            const token = (_b = children[2]) === null || _b === void 0 ? void 0 : _b.getFirstToken();
             const attr = token.getStr();
             const c = new _object_oriented_1.ObjectOriented(this.scope).searchConstantName(obj, attr);
             if (c instanceof class_constant_1.ClassConstant) {

package/build/src/registry.js

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

package/package.json

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