@abaplint/cli 2.120.66 → 2.120.67

package/build/cli.js

@@ -16912,7 +16912,9 @@ class ModifyLine {
         const ocp = (0, combi_1.str)("OF CURRENT PAGE");
         const intensified = (0, combi_1.seq)("INTENSIFIED", onOff);
         const intensifiedOpt = (0, combi_1.seq)("INTENSIFIED", (0, combi_1.opt)(onOff));
-        const lineFormat = (0, combi_1.seq)("LINE FORMAT", (0, combi_1.per)("INPUT OFF", "INVERSE", "RESET", intensifiedOpt, expressions_1.Color));
+        const inputOpt = (0, combi_1.seq)("INPUT", (0, combi_1.opt)((0, combi_1.alt)(eq, onOff)));
+        const inverseOpt = (0, combi_1.seq)("INVERSE", (0, combi_1.opt)((0, combi_1.alt)(eq, onOff)));
+        const lineFormat = (0, combi_1.seq)("LINE FORMAT", (0, combi_1.per)(inputOpt, inverseOpt, "RESET", intensifiedOpt, expressions_1.Color));
         const options = (0, combi_1.per)(index, value, format, page, lineFormat, lineValue, ocp, intensified, expressions_1.Color);
         const ret = (0, combi_1.seq)("MODIFY", (0, combi_1.altPrio)("CURRENT LINE", (0, combi_1.seq)("LINE", expressions_1.Source)), (0, combi_1.opt)(options));
         return (0, combi_1.verNotLang)(version_1.LanguageVersion.Cloud, ret);
@@ -26471,6 +26473,7 @@ class CurrentScope {
         if (name === undefined) {
             return undefined;
         }
+        name = name.replace(/^!/, "");
         const found = (_a = this.current) === null || _a === void 0 ? void 0 : _a.findVariable(name);
         if (found) {
             return found;
@@ -26800,6 +26803,61 @@ class ObjectOriented {
     }
     // does the supplied class have friendship with "friendName"?
     // note that interfaces of the friend, and subclasses of the friend also have friendship
+    // returns the visibility as text if a member declared in foundDef, reached via def, cannot be accessed from enclosing
+    memberNotVisible(visibility, def, foundDef, enclosing) {
+        var _a, _b;
+        if (visibility === visibility_1.Visibility.Public || foundDef === undefined) {
+            return undefined;
+        }
+        else if (!(foundDef instanceof types_1.ClassDefinition)) {
+            // interface members are always public
+            return undefined;
+        }
+        const name = foundDef.getName().toUpperCase();
+        enclosing = enclosing === null || enclosing === void 0 ? void 0 : enclosing.toUpperCase();
+        if (enclosing === undefined || enclosing === name) {
+            return undefined;
+        }
+        // friendship with the class used at the call site also gives access to inherited members
+        const visited = [];
+        let current = def instanceof types_1.ClassDefinition ? def : foundDef;
+        while (current !== undefined && visited.includes(current.getName().toUpperCase()) === false) {
+            visited.push(current.getName().toUpperCase());
+            if (this.hasFriendship(current, enclosing)) {
+                return undefined;
+            }
+            const sup = current.getSuperClass();
+            current = sup === undefined ? undefined : this.scope.findClassDefinition(sup);
+        }
+        if (visibility === visibility_1.Visibility.Protected) {
+            // subclasses can access protected members
+            let sup = (_a = this.scope.findClassDefinition(enclosing)) === null || _a === void 0 ? void 0 : _a.getSuperClass();
+            while (sup !== undefined) {
+                if (sup.toUpperCase() === name) {
+                    return undefined;
+                }
+                sup = (_b = this.scope.findClassDefinition(sup)) === null || _b === void 0 ? void 0 : _b.getSuperClass();
+            }
+            return "protected";
+        }
+        return "private";
+    }
+    // the class declaring the attribute or constant, searched from def up through the super classes
+    findAttributeOwner(def, found) {
+        const visited = [];
+        let current = def;
+        while (current instanceof types_1.ClassDefinition && visited.includes(current.getName().toUpperCase()) === false) {
+            visited.push(current.getName().toUpperCase());
+            const attributes = current.getAttributes();
+            if (attributes.getAll().includes(found)
+                || attributes.getConstants().includes(found)) {
+                return current;
+            }
+            const sup = current.getSuperClass();
+            current = sup === undefined ? undefined : this.findSuperDefinition(sup);
+        }
+        return undefined;
+    }
     hasFriendship(cd, friendName) {
         var _a;
         const friends = cd.getFriends().map(f => f.toUpperCase());
@@ -29776,6 +29834,8 @@ const _object_oriented_1 = __webpack_require__(/*! ../_object_oriented */ "../co
 const data_reference_type_1 = __webpack_require__(/*! ../../types/basic/data_reference_type */ "../core/build/src/abap/types/basic/data_reference_type.js");
 const _reference_1 = __webpack_require__(/*! ../_reference */ "../core/build/src/abap/5_syntax/_reference.js");
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "../core/build/src/abap/types/basic/index.js");
+const class_attribute_1 = __webpack_require__(/*! ../../types/class_attribute */ "../core/build/src/abap/types/class_attribute.js");
+const class_constant_1 = __webpack_require__(/*! ../../types/class_constant */ "../core/build/src/abap/types/class_constant.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "../core/build/src/abap/5_syntax/_syntax_input.js");
 class AttributeName {
     static runSyntax(context, node, input, type, error = true) {
@@ -29804,6 +29864,15 @@ class AttributeName {
                 }
                 return void_type_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
             }
+            if (found instanceof class_attribute_1.ClassAttribute || found instanceof class_constant_1.ClassConstant) {
+                const owner = helper.findAttributeOwner(def, found);
+                const notVisible = helper.memberNotVisible(found.getVisibility(), def, owner, input.scope.getEnclosingClassName());
+                if (notVisible !== undefined) {
+                    const message = `Attribute "${name}" is ${notVisible} and cannot be accessed`;
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, token, message));
+                    return void_type_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
+            }
             if (type) {
                 input.scope.addReference(token, found, type, input.filename);
             }
@@ -32742,8 +32811,6 @@ const _reference_1 = __webpack_require__(/*! ../_reference */ "../core/build/src
 const component_name_1 = __webpack_require__(/*! ./component_name */ "../core/build/src/abap/5_syntax/expressions/component_name.js");
 const attribute_name_1 = __webpack_require__(/*! ./attribute_name */ "../core/build/src/abap/5_syntax/expressions/attribute_name.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "../core/build/src/abap/5_syntax/_syntax_input.js");
-const visibility_1 = __webpack_require__(/*! ../../4_file_information/visibility */ "../core/build/src/abap/4_file_information/visibility.js");
-const class_definition_1 = __webpack_require__(/*! ../../types/class_definition */ "../core/build/src/abap/types/class_definition.js");
 class MethodCallChain {
     static runSyntax(node, input, targetType) {
         var _a, _b;
@@ -32792,7 +32859,9 @@ class MethodCallChain {
                         input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, message));
                         return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                     }
-                    const notVisible = method ? this.checkVisibility(method, def, foundDef, input) : undefined;
+                    const notVisible = method
+                        ? helper.memberNotVisible(method.getVisibility(), def, foundDef, input.scope.getEnclosingClassName())
+                        : undefined;
                     if (notVisible !== undefined) {
                         const message = `Method "${methodName}" is ${notVisible} and cannot be accessed`;
                         input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, message));
@@ -32840,47 +32909,6 @@ class MethodCallChain {
         return context;
     }
     //////////////////////////////////////
-    // returns the visibility as text if the method cannot be accessed from the current scope
-    static checkVisibility(method, def, foundDef, input) {
-        var _a, _b, _c;
-        const visibility = method.getVisibility();
-        if (visibility === visibility_1.Visibility.Public || foundDef === undefined) {
-            return undefined;
-        }
-        else if (!(foundDef instanceof class_definition_1.ClassDefinition)) {
-            // interface members are always public
-            return undefined;
-        }
-        const name = foundDef.getName().toUpperCase();
-        const enclosing = (_a = input.scope.getEnclosingClassName()) === null || _a === void 0 ? void 0 : _a.toUpperCase();
-        if (enclosing === undefined || enclosing === name) {
-            return undefined;
-        }
-        // friendship with the class used at the call site also gives access to inherited members
-        const helper = new _object_oriented_1.ObjectOriented(input.scope);
-        const visited = [];
-        let current = def instanceof class_definition_1.ClassDefinition ? def : foundDef;
-        while (current !== undefined && visited.includes(current.getName().toUpperCase()) === false) {
-            visited.push(current.getName().toUpperCase());
-            if (helper.hasFriendship(current, enclosing)) {
-                return undefined;
-            }
-            const sup = current.getSuperClass();
-            current = sup === undefined ? undefined : input.scope.findClassDefinition(sup);
-        }
-        if (visibility === visibility_1.Visibility.Protected) {
-            // subclasses can access protected members
-            let sup = (_b = input.scope.findClassDefinition(enclosing)) === null || _b === void 0 ? void 0 : _b.getSuperClass();
-            while (sup !== undefined) {
-                if (sup.toUpperCase() === name) {
-                    return undefined;
-                }
-                sup = (_c = input.scope.findClassDefinition(sup)) === null || _c === void 0 ? void 0 : _c.getSuperClass();
-            }
-            return "protected";
-        }
-        return "private";
-    }
     static findTop(first, input, targetType) {
         var _a;
         if (first.get() instanceof Expressions.ClassName) {
@@ -36209,6 +36237,7 @@ const expressions_1 = __webpack_require__(/*! ../../2_statements/expressions */
 const field_length_1 = __webpack_require__(/*! ./field_length */ "../core/build/src/abap/5_syntax/expressions/field_length.js");
 const cast_1 = __webpack_require__(/*! ./cast */ "../core/build/src/abap/5_syntax/expressions/cast.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "../core/build/src/abap/5_syntax/_syntax_input.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "../core/build/src/version.js");
 class Target {
     static runSyntax(node, input) {
         const concat = node.concatTokens();
@@ -36274,6 +36303,12 @@ class Target {
                 if (!(context instanceof basic_1.VoidType)) {
                     context = context.getType();
                 }
+                if ((context === null || context === void 0 ? void 0 : context.isGeneric()) === true
+                    && !(0, version_1.releaseAtLeast)(input.scope.getRelease(), version_1.Release.v756)
+                    && input.scope.getLanguageVersion() !== version_1.LanguageVersion.Cloud
+                    && !input.scope.getOpenABAP()) {
+                    throw new Error("A generic reference cannot be dereferenced");
+                }
             }
             else if (current.get() instanceof Expressions.ComponentName) {
                 context = component_name_1.ComponentName.runSyntax(context, current, input);
@@ -70063,6 +70098,7 @@ class Indent {
                 || type instanceof Statements.ProcessBeforeOutput
                 || type instanceof Statements.ProcessOnValueRequest
                 || type instanceof Statements.TopOfPage
+                || type instanceof Statements.EndOfPage
                 || type instanceof Statements.Get
                 || type instanceof Statements.EndOfSelection
                 || type instanceof Statements.LoadOfProgram) {
@@ -70158,6 +70194,7 @@ class Indent {
                 || type instanceof Statements.Initialization
                 || type instanceof Statements.AtUserCommand
                 || type instanceof Statements.TopOfPage
+                || type instanceof Statements.EndOfPage
                 || type instanceof Statements.EndOfSelection
                 || type instanceof Statements.Public
                 || type instanceof Statements.Protected
@@ -70355,7 +70392,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.66";
+        return "2.120.67";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

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