@abaplint/core 2.120.4 → 2.120.5

package/build/abaplint.d.ts

@@ -7850,8 +7850,8 @@ export declare class SyntaxLogic {
     private issues;
     private readonly object;
     private readonly reg;
-    private readonly scope;
-    private readonly helpers;
+    private scope;
+    private helpers;
     constructor(reg: IRegistry, object: ABAPObject);
     run(): ISyntaxResult;
     private traverseObject;

package/build/src/abap/5_syntax/expressions/cond_body.js

@@ -57,7 +57,7 @@ class CondBody {
                 type = source_1.Source.runSyntax(s, input, targetType);
             }
             else {
-                source_1.Source.runSyntax(s, input, targetType);
+                source_1.Source.runSyntax(s, input, targetType !== null && targetType !== void 0 ? targetType : type);
             }
         }
         if (scoped === true) {

package/build/src/abap/5_syntax/expressions/source.js

@@ -117,7 +117,7 @@ class Source {
                 case "SWITCH":
                     {
                         const foundType = this.determineType(node, input, targetType);
-                        const bodyType = switch_body_1.SwitchBody.runSyntax(node.findDirectExpression(Expressions.SwitchBody), input);
+                        const bodyType = switch_body_1.SwitchBody.runSyntax(node.findDirectExpression(Expressions.SwitchBody), input, foundType);
                         if (foundType === undefined || foundType.isGeneric()) {
                             this.addIfInferred(node, input, bodyType);
                         }

package/build/src/abap/5_syntax/expressions/switch_body.js

@@ -39,7 +39,7 @@ const source_1 = require("./source");
 const _syntax_input_1 = require("../_syntax_input");
 const basic_1 = require("../../types/basic");
 class SwitchBody {
-    static runSyntax(node, input) {
+    static runSyntax(node, input, targetType) {
         if (node === undefined) {
             return;
         }
@@ -49,12 +49,12 @@ class SwitchBody {
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
         }
-        const type = source_1.Source.runSyntax(thenSource, input);
+        const type = source_1.Source.runSyntax(thenSource, input, targetType);
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             if (s === thenSource) {
                 continue;
             }
-            source_1.Source.runSyntax(s, input);
+            source_1.Source.runSyntax(s, input, targetType !== null && targetType !== void 0 ? targetType : type);
         }
         return type;
     }

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

@@ -53,6 +53,10 @@ class Constant {
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, found.getToken(), message));
                 return new _typed_identifier_1.TypedIdentifier(found.getToken(), input.filename, basic_2.VoidType.get(_syntax_input_1.CheckSyntaxKey), meta, val);
             }
+            if (this.isNameTooLong(found.getName())) {
+                const message = "CONSTANTS name too long, " + found.getName();
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, found.getToken(), message));
+            }
             return new _typed_identifier_1.TypedIdentifier(found.getToken(), input.filename, found.getType(), meta, val);
         }
         const fallback = node.findFirstExpression(Expressions.DefinitionName);
@@ -61,10 +65,17 @@ class Constant {
                 const message = "not possible to have a name with only digits";
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, fallback.getFirstToken(), message));
             }
+            if (this.isNameTooLong(fallback.concatTokens())) {
+                const message = "CONSTANTS name too long, " + fallback.concatTokens();
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, fallback.getFirstToken(), message));
+            }
             return new _typed_identifier_1.TypedIdentifier(fallback.getFirstToken(), input.filename, new basic_1.UnknownType("constant, fallback"));
         }
         throw new assert_error_1.AssertError("Statement Constant: unexpected structure");
     }
+    isNameTooLong(name) {
+        return name.length > 30;
+    }
     isOnlyDigits(name) {
         return /^[0-9]+$/.test(name);
     }

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

@@ -51,6 +51,10 @@ class Data {
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, id.getToken(), message));
                 return new _typed_identifier_1.TypedIdentifier(id.getToken(), input.filename, basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey));
             }
+            if (id && this.isNameTooLong(id.getName())) {
+                const message = "DATA name too long, " + id.getName();
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, id.getToken(), message));
+            }
             if ((id === null || id === void 0 ? void 0 : id.getType().isGeneric()) === true
                 && (id === null || id === void 0 ? void 0 : id.getType().containsVoid()) === false) {
                 const message = "DATA definition cannot be generic, " + (name === null || name === void 0 ? void 0 : name.concatTokens());
@@ -64,10 +68,17 @@ class Data {
                 const message = "not possible to have a name with only digits";
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, name.getFirstToken(), message));
             }
+            if (this.isNameTooLong(name.concatTokens())) {
+                const message = "DATA name too long, " + name.concatTokens();
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, name.getFirstToken(), message));
+            }
             return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), input.filename, new unknown_type_1.UnknownType("data, fallback"));
         }
         return undefined;
     }
+    isNameTooLong(name) {
+        return name.length > 30;
+    }
     isOnlyDigits(name) {
         return /^[0-9]+$/.test(name);
     }

package/build/src/abap/5_syntax/syntax.js

@@ -335,16 +335,17 @@ class SyntaxLogic {
         this.reg = reg;
         this.issues = [];
         this.object = object;
-        this.scope = _current_scope_1.CurrentScope.buildDefault(this.reg, object);
-        this.helpers = {
-            oooc: new _object_oriented_1.ObjectOriented(this.scope),
-            proc: new _procedural_1.Procedural(this.reg, this.scope),
-        };
     }
     run() {
         if (this.object.syntaxResult !== undefined) {
             return this.object.syntaxResult;
         }
+        // the scope is built here instead of in the constructor, cached results must stay cheap
+        this.scope = _current_scope_1.CurrentScope.buildDefault(this.reg, this.object);
+        this.helpers = {
+            oooc: new _object_oriented_1.ObjectOriented(this.scope),
+            proc: new _procedural_1.Procedural(this.reg, this.scope),
+        };
         this.issues = [];
         this.reg.getDDICReferences().clear(this.object);
         this.reg.getMSAGReferences().clear(this.object);

package/build/src/registry.js

@@ -75,7 +75,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.4";
+        return "2.120.5";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/unused_variables.js

@@ -59,35 +59,38 @@ class UnusedVariablesConf extends _basic_rule_config_1.BasicRuleConfig {
 exports.UnusedVariablesConf = UnusedVariablesConf;
 class WorkArea {
     constructor() {
-        this.workarea = [];
+        // keyed by filename + start position, this equals Identifier.equals()
+        this.workarea = new Map();
     }
     push(id, count = 1) {
-        for (const w of this.workarea) {
-            if (id.equals(w.id)) {
-                return;
-            }
+        const key = this.buildKey(id);
+        if (this.workarea.has(key)) {
+            return;
         }
-        this.workarea.push({ id, count });
+        this.workarea.set(key, { id, count });
     }
     removeIfExists(id) {
         if (id === undefined) {
             return;
         }
-        for (let i = 0; i < this.workarea.length; i++) {
-            if (id.equals(this.workarea[i].id)) {
-                this.workarea[i].count--;
-                if (this.workarea[i].count === 0) {
-                    this.workarea.splice(i, 1);
-                }
-                return;
+        const key = this.buildKey(id);
+        const found = this.workarea.get(key);
+        if (found !== undefined) {
+            found.count--;
+            if (found.count === 0) {
+                this.workarea.delete(key);
             }
         }
     }
     get() {
-        return this.workarea;
+        return [...this.workarea.values()];
     }
     count() {
-        return this.workarea.length;
+        return this.workarea.size;
+    }
+    buildKey(id) {
+        const start = id.getStart();
+        return id.getFilename() + "," + start.getRow() + "," + start.getCol();
     }
 }
 class UnusedVariables {
@@ -221,6 +224,9 @@ Errors found in INCLUDES are reported for the main program.`,
     }
     buildIssues(obj) {
         const ret = [];
+        const metadata = this.getMetadata();
+        const pragma = metadata.pragma + "";
+        const files = new Map();
         for (const w of this.workarea.get()) {
             const filename = w.id.getFilename();
             if (this.reg.isFileDependency(filename) === true) {
@@ -229,41 +235,51 @@ Errors found in INCLUDES are reported for the main program.`,
             else if (obj instanceof objects_1.Program === false && obj.containsFile(filename) === false) {
                 continue;
             }
-            const statement = this.findStatement(w.id);
-            if (statement === null || statement === void 0 ? void 0 : statement.getPragmas().map(t => t.getStr()).includes(this.getMetadata().pragma + "")) {
-                continue;
+            if (files.has(filename) === false) {
+                files.set(filename, this.findFile(filename));
             }
-            else if (this.suppressedbyPseudo(statement, w.id, obj)) {
-                continue;
+            const file = files.get(filename);
+            let statement = undefined;
+            let statementIndex = -1;
+            if (file !== undefined) {
+                const statements = file.getStatements();
+                const token = w.id.getToken();
+                for (let i = 0; i < statements.length; i++) {
+                    if (statements[i].includesToken(token)) {
+                        statement = statements[i];
+                        statementIndex = i;
+                        break;
+                    }
+                }
+            }
+            if (statement !== undefined && file !== undefined) {
+                if (statement.getPragmas().some(t => t.getStr() === pragma)) {
+                    continue;
+                }
+                else if (this.suppressedbyPseudo(file, statementIndex, w.id, obj)) {
+                    continue;
+                }
             }
             const name = w.id.getName();
             const message = "Variable \"" + name.toLowerCase() + "\" not used";
-            const fix = this.buildFix(w.id, obj);
-            ret.push(issue_1.Issue.atIdentifier(w.id, message, this.getMetadata().key, this.conf.severity, fix));
+            const fix = this.buildFix(w.id, obj, statement);
+            ret.push(issue_1.Issue.atIdentifier(w.id, message, metadata.key, this.conf.severity, fix));
         }
         return ret;
     }
-    suppressedbyPseudo(statement, v, obj) {
-        if (statement === undefined) {
+    suppressedbyPseudo(file, statementIndex, v, obj) {
+        // pseudo comments are only found in files belonging to the object itself, not in eg. includes
+        if (obj.getABAPFileByName(v.getFilename()) === undefined) {
             return false;
         }
-        const file = obj.getABAPFileByName(v.getFilename());
-        if (file === undefined) {
-            return false;
-        }
-        let next = false;
-        for (const s of file.getStatements()) {
-            if (next === true && s.get() instanceof _statement_1.Comment) {
-                return s.concatTokens().includes(this.getMetadata().pseudoComment + "");
-            }
-            if (s === statement) {
-                next = true;
-            }
-        }
+        const statements = file.getStatements();
+        const next = statements[statementIndex + 1];
+        return (next === null || next === void 0 ? void 0 : next.get()) instanceof _statement_1.Comment
+            && next.concatTokens().includes(this.getMetadata().pseudoComment + "");
         return false;
     }
-    findStatement(v) {
-        const file = this.reg.getFileByName(v.getFilename());
+    findFile(filename) {
+        const file = this.reg.getFileByName(filename);
         if (file === undefined) {
             return undefined;
         }
@@ -271,26 +287,17 @@ Errors found in INCLUDES are reported for the main program.`,
         if (!(object instanceof _abap_object_1.ABAPObject)) {
             return undefined;
         }
-        const abapfile = object.getABAPFileByName(v.getFilename());
-        if (abapfile === undefined) {
+        return object.getABAPFileByName(filename);
+    }
+    buildFix(v, obj, statement) {
+        if (statement === undefined || !(statement.get() instanceof Statements.Data)) {
             return undefined;
         }
-        const statement = edit_helper_1.EditHelper.findStatement(v.getToken(), abapfile);
-        return statement;
-    }
-    buildFix(v, obj) {
         const file = obj.getABAPFileByName(v.getFilename());
         if (file === undefined) {
             return undefined;
         }
-        const statement = edit_helper_1.EditHelper.findStatement(v.getToken(), file);
-        if (statement === undefined) {
-            return undefined;
-        }
-        else if (statement.get() instanceof Statements.Data) {
-            return edit_helper_1.EditHelper.deleteStatement(file, statement);
-        }
-        return undefined;
+        return edit_helper_1.EditHelper.deleteStatement(file, statement);
     }
 }
 exports.UnusedVariables = UnusedVariables;

package/package.json

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