@abaplint/core 2.93.76 → 2.93.78

package/build/src/lsp/_lsp_utils.js

@@ -6,22 +6,18 @@ const _identifier_1 = require("../abap/4_file_information/_identifier");
 const _abap_object_1 = require("../objects/_abap_object");
 const position_1 = require("../position");
 const LServer = require("vscode-languageserver-types");
-function getABAPObjects(reg) {
-    const ret = [];
-    for (const o of reg.getObjects()) {
-        if (o instanceof _abap_object_1.ABAPObject) {
-            ret.push(o);
-        }
-    }
-    return ret;
-}
 class LSPUtils {
-    static getABAPFile(reg, name) {
-        const obj = getABAPObjects(reg);
-        for (const o of obj) {
-            for (const file of o.getABAPFiles()) {
-                if (file.getFilename().toUpperCase() === name.toUpperCase()) {
-                    return file;
+    static getABAPFile(reg, filename) {
+        const file = reg.getFileByName(filename);
+        if (file === undefined) {
+            return undefined;
+        }
+        const obj = reg.findObjectForFile(file);
+        obj === null || obj === void 0 ? void 0 : obj.parse();
+        if (obj instanceof _abap_object_1.ABAPObject) {
+            for (const abapfile of obj.getABAPFiles()) {
+                if (abapfile.getFilename().toUpperCase() === filename.toUpperCase()) {
+                    return abapfile;
                 }
             }
         }

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -29,6 +29,12 @@ const _builtin_1 = require("../abap/5_syntax/_builtin");
 class DownportConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.DownportConf = DownportConf;
+class SkipToNextFile extends Error {
+    constructor(issue) {
+        super();
+        this.issue = issue;
+    }
+}
 class Downport {
     constructor() {
         this.conf = new DownportConf();
@@ -151,9 +157,20 @@ Only one transformation is applied to a statement at a time, so multiple steps m
                     if (highSyntax === undefined) {
                         highSyntax = new syntax_1.SyntaxLogic(this.highReg, highSyntaxObj).run();
                     }
-                    const issue = this.checkStatement(low, high, lowFile, highSyntax, highFile);
-                    if (issue) {
-                        ret.push(issue);
+                    try {
+                        const issue = this.checkStatement(low, high, lowFile, highSyntax, highFile);
+                        if (issue) {
+                            ret.push(issue);
+                        }
+                    }
+                    catch (e) {
+                        if (e instanceof SkipToNextFile) {
+                            ret.push(e.issue);
+                            break;
+                        }
+                        else {
+                            throw e;
+                        }
                     }
                 }
             }
@@ -1894,6 +1911,9 @@ ${indentation}    output = ${topTarget}.`;
             if (spag === undefined) {
                 continue;
             }
+            if (this.isDuplicateName(spag, name, c.getFirstToken().getStart())) {
+                this.renameVariable(spag, name, c.getFirstToken().getStart(), lowFile, highSyntax);
+            }
             const found = spag.findVariable(name);
             if (found === undefined) {
                 const source = f.findFirstExpression(Expressions.Source);
@@ -1911,6 +1931,35 @@ ${indentation}    output = ${topTarget}.`;
         }
         return ret;
     }
+    renameVariable(spag, name, pos, lowFile, highSyntax) {
+        var _a, _b;
+        const uniqueName = this.uniqueName(pos, lowFile.getFilename(), highSyntax);
+        let fix = undefined;
+        for (const r of spag.getData().references) {
+            if (((_a = r.resolved) === null || _a === void 0 ? void 0 : _a.getName()) === name && ((_b = r.resolved) === null || _b === void 0 ? void 0 : _b.getStart().equals(pos))) {
+                const replace = edit_helper_1.EditHelper.replaceRange(lowFile, r.position.getStart(), r.position.getEnd(), uniqueName);
+                if (fix === undefined) {
+                    fix = replace;
+                }
+                else {
+                    fix = edit_helper_1.EditHelper.merge(replace, fix);
+                }
+            }
+        }
+        const issue = issue_1.Issue.atPosition(lowFile, pos, "Rename before outline", this.getMetadata().key, this.conf.severity, fix);
+        throw new SkipToNextFile(issue);
+    }
+    isDuplicateName(spag, name, pos) {
+        var _a;
+        let isDuplicate = false;
+        for (const child of ((_a = spag.getParent()) === null || _a === void 0 ? void 0 : _a.getChildren()) || []) {
+            const found = child.findVariable(name);
+            if ((found === null || found === void 0 ? void 0 : found.getStart().equals(pos)) === false) {
+                isDuplicate = true;
+            }
+        }
+        return isDuplicate;
+    }
     findType(i, lowFile, highSyntax, ref = false) {
         var _a;
         const expr = i.findDirectExpression(Expressions.TypeNameOrInfer);

package/package.json

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