@abaplint/cli 2.118.8 → 2.118.10

package/build/cli.js

@@ -31834,7 +31834,7 @@ class CreateObject {
         this.validateParameters(cdef, node, input);
     }
     static checkInstantiationAllowed(cdef, input) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const createVis = cdef.getCreateVisibility();
         if (createVis === visibility_1.Visibility.Public) {
             return undefined;
@@ -31851,14 +31851,23 @@ class CreateObject {
             input.scope.isLocalFriend(cdef.getName(), enclosingClass)) {
             return undefined;
         }
+        // subclasses of friends also have friendship
+        let enclosingSup = (_a = input.scope.findClassDefinition(enclosingClass)) === null || _a === void 0 ? void 0 : _a.getSuperClass();
+        while (enclosingSup !== undefined) {
+            if (cdef.getFriends().some(f => f.toUpperCase() === enclosingSup.toUpperCase()) ||
+                input.scope.isLocalFriend(cdef.getName(), enclosingSup)) {
+                return undefined;
+            }
+            enclosingSup = (_b = input.scope.findClassDefinition(enclosingSup)) === null || _b === void 0 ? void 0 : _b.getSuperClass();
+        }
         if (createVis === visibility_1.Visibility.Protected) {
             // subclasses are also allowed
-            let sup = (_a = input.scope.findClassDefinition(enclosingClass)) === null || _a === void 0 ? void 0 : _a.getSuperClass();
+            let sup = (_c = input.scope.findClassDefinition(enclosingClass)) === null || _c === void 0 ? void 0 : _c.getSuperClass();
             while (sup !== undefined) {
                 if (sup.toUpperCase() === cdef.getName().toUpperCase()) {
                     return undefined;
                 }
-                sup = (_b = input.scope.findClassDefinition(sup)) === null || _b === void 0 ? void 0 : _b.getSuperClass();
+                sup = (_d = input.scope.findClassDefinition(sup)) === null || _d === void 0 ? void 0 : _d.getSuperClass();
             }
         }
         return cdef.getName() + " cannot be instantiated, class is defined as " +
@@ -53407,6 +53416,83 @@ exports.RenameMessageClass = RenameMessageClass;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/core/build/src/objects/rename/rename_program.js"
+/*!********************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/objects/rename/rename_program.js ***!
+  \********************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.RenameProgram = void 0;
+const Statements = __webpack_require__(/*! ../../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
+const Expressions = __webpack_require__(/*! ../../abap/2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
+const vscode_languageserver_types_1 = __webpack_require__(/*! vscode-languageserver-types */ "./node_modules/vscode-languageserver-types/lib/umd/main.js");
+const __1 = __webpack_require__(/*! .. */ "./node_modules/@abaplint/core/build/src/objects/index.js");
+const renamer_helper_1 = __webpack_require__(/*! ./renamer_helper */ "./node_modules/@abaplint/core/build/src/objects/rename/renamer_helper.js");
+const _lsp_utils_1 = __webpack_require__(/*! ../../lsp/_lsp_utils */ "./node_modules/@abaplint/core/build/src/lsp/_lsp_utils.js");
+const _abap_object_1 = __webpack_require__(/*! ../_abap_object */ "./node_modules/@abaplint/core/build/src/objects/_abap_object.js");
+class RenameProgram {
+    constructor(reg) {
+        this.reg = reg;
+    }
+    buildEdits(obj, oldName, newName) {
+        if (!(obj instanceof __1.Program)) {
+            throw new Error("RenameProgram, not a program");
+        }
+        const main = obj.getMainABAPFile();
+        if (main === undefined) {
+            throw new Error(`Main file not found, ${obj.getType()} ${obj.getName()}`);
+        }
+        let changes = [];
+        const helper = new renamer_helper_1.RenamerHelper(this.reg);
+        changes = changes.concat(helper.buildXMLFileEdits(obj, "NAME", oldName, newName));
+        changes = changes.concat(helper.renameFiles(obj, oldName, newName));
+        const edits = [];
+        for (const s of main.getStatements()) {
+            if (s.get() instanceof Statements.Report || s.get() instanceof Statements.Program) {
+                const exp = s.findFirstExpression(Expressions.ReportName);
+                if (exp) {
+                    edits.push(vscode_languageserver_types_1.TextEdit.replace(_lsp_utils_1.LSPUtils.tokenToRange(exp.getFirstToken()), newName.toLowerCase()));
+                }
+            }
+        }
+        if (edits.length > 0) {
+            changes.push(vscode_languageserver_types_1.TextDocumentEdit.create({ uri: main.getFilename(), version: 1 }, edits));
+        }
+        // Rename INCLUDE statements in all ABAP objects
+        for (const o of this.reg.getObjects()) {
+            if (o instanceof _abap_object_1.ABAPObject && o !== obj) {
+                for (const file of o.getABAPFiles()) {
+                    const includeEdits = [];
+                    for (const s of file.getStatements()) {
+                        if (s.get() instanceof Statements.Include ||
+                            s.get() instanceof Statements.Submit ||
+                            s.get() instanceof Statements.Perform) {
+                            for (const exp of s.findAllExpressions(Expressions.IncludeName)) {
+                                if (exp && exp.getFirstToken().getStr().toUpperCase() === oldName.toUpperCase()) {
+                                    includeEdits.push(vscode_languageserver_types_1.TextEdit.replace(_lsp_utils_1.LSPUtils.tokenToRange(exp.getFirstToken()), newName.toLowerCase()));
+                                }
+                            }
+                        }
+                    }
+                    if (includeEdits.length > 0) {
+                        changes.push(vscode_languageserver_types_1.TextDocumentEdit.create({ uri: file.getFilename(), version: 1 }, includeEdits));
+                    }
+                }
+            }
+        }
+        return {
+            documentChanges: changes,
+        };
+    }
+}
+exports.RenameProgram = RenameProgram;
+//# sourceMappingURL=rename_program.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/core/build/src/objects/rename/rename_table.js"
 /*!******************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/objects/rename/rename_table.js ***!
@@ -53498,6 +53584,7 @@ const rename_data_element_1 = __webpack_require__(/*! ./rename_data_element */ "
 const rename_domain_1 = __webpack_require__(/*! ./rename_domain */ "./node_modules/@abaplint/core/build/src/objects/rename/rename_domain.js");
 const rename_global_class_1 = __webpack_require__(/*! ./rename_global_class */ "./node_modules/@abaplint/core/build/src/objects/rename/rename_global_class.js");
 const rename_global_interface_1 = __webpack_require__(/*! ./rename_global_interface */ "./node_modules/@abaplint/core/build/src/objects/rename/rename_global_interface.js");
+const rename_program_1 = __webpack_require__(/*! ./rename_program */ "./node_modules/@abaplint/core/build/src/objects/rename/rename_program.js");
 const rename_table_1 = __webpack_require__(/*! ./rename_table */ "./node_modules/@abaplint/core/build/src/objects/rename/rename_table.js");
 const rename_table_type_1 = __webpack_require__(/*! ./rename_table_type */ "./node_modules/@abaplint/core/build/src/objects/rename/rename_table_type.js");
 const rename_message_class_1 = __webpack_require__(/*! ./rename_message_class */ "./node_modules/@abaplint/core/build/src/objects/rename/rename_message_class.js");
@@ -53552,6 +53639,8 @@ class Renamer {
                 return new rename_table_type_1.RenameTableType(this.reg);
             case "INTF":
                 return new rename_global_interface_1.RenameGlobalInterface(this.reg);
+            case "PROG":
+                return new rename_program_1.RenameProgram(this.reg);
             case "MSAG":
                 return new rename_message_class_1.RenameMessageClass(this.reg);
             case "SICF":
@@ -56039,7 +56128,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.118.8";
+        return "2.118.10";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

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