@abaplint/core 2.102.11 → 2.102.13

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -26,6 +26,7 @@ const objects_1 = require("../objects");
 const _builtin_1 = require("../abap/5_syntax/_builtin");
 const _scope_type_1 = require("../abap/5_syntax/_scope_type");
 const statements_1 = require("../abap/2_statements/statements");
+const crypto = require("node:crypto");
 // todo: refactor each sub-rule to new classes?
 // todo: add configuration
 class DownportConf extends _basic_rule_config_1.BasicRuleConfig {
@@ -792,7 +793,7 @@ ${indentation}`);
         if (tt === undefined) {
             return undefined;
         }
-        const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax, "ty_");
+        const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
         const code = `TYPES ${uniqueName} ${tt.concatTokens()}.\n`;
         const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getStart(), code);
         const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, tt.getFirstToken().getStart(), tt.getLastToken().getEnd(), "TYPE " + uniqueName);
@@ -2537,15 +2538,21 @@ ${indentation}    output = ${uniqueName}.\n`;
         }
         return undefined;
     }
-    uniqueName(position, filename, highSyntax, prefix = "") {
+    uniqueName(position, filename, highSyntax) {
         const spag = highSyntax.spaghetti.lookupPosition(position, filename);
         if (spag === undefined) {
-            const name = prefix + "temprr" + this.counter;
+            const name = "temprr" + this.counter;
             this.counter++;
             return name;
         }
+        let postfix = "";
+        if (spag.getIdentifier().stype === _scope_type_1.ScopeType.ClassDefinition) {
+            // try making sure this name is not used in subclasses
+            const hash = crypto.createHash("sha1").update(spag.getIdentifier().sname).digest("hex");
+            postfix = "_" + hash.substring(0, 10);
+        }
         while (true) {
-            const name = prefix + "temp" + this.counter;
+            const name = "temp" + this.counter + postfix;
             const exists = this.existsRecursive(spag, name);
             this.counter++;
             if (exists === false) {
@@ -2553,13 +2560,14 @@ ${indentation}    output = ${uniqueName}.\n`;
             }
         }
     }
+    // todo, optimize, the findVariable() and findType() does a lot of redundant checks
     existsRecursive(spag, name) {
-        const existsDirect = spag.findVariable(name);
+        const existsDirect = spag.findVariable(name) || spag.findType(name);
         if (existsDirect) {
             return true;
         }
         for (const child of spag.getChildren()) {
-            if (child.findVariable(name) || this.existsRecursive(child, name)) {
+            if (child.findVariable(name) || child.findType(name) || this.existsRecursive(child, name)) {
                 return true;
             }
         }

package/package.json

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