@abaplint/core 2.118.8 → 2.118.10

package/build/src/abap/5_syntax/statements/create_object.js

@@ -118,7 +118,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;
@@ -135,14 +135,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 " +

package/build/src/objects/rename/rename_program.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RenameProgram = void 0;
+const Statements = require("../../abap/2_statements/statements");
+const Expressions = require("../../abap/2_statements/expressions");
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const __1 = require("..");
+const renamer_helper_1 = require("./renamer_helper");
+const _lsp_utils_1 = require("../../lsp/_lsp_utils");
+const _abap_object_1 = require("../_abap_object");
+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

package/build/src/objects/rename/renamer.js

@@ -7,6 +7,7 @@ const rename_data_element_1 = require("./rename_data_element");
 const rename_domain_1 = require("./rename_domain");
 const rename_global_class_1 = require("./rename_global_class");
 const rename_global_interface_1 = require("./rename_global_interface");
+const rename_program_1 = require("./rename_program");
 const rename_table_1 = require("./rename_table");
 const rename_table_type_1 = require("./rename_table_type");
 const rename_message_class_1 = require("./rename_message_class");
@@ -61,6 +62,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":

package/build/src/registry.js

@@ -74,7 +74,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/core",
-    "version": "2.118.8",
+    "version": "2.118.10",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",