@abaplint/core 2.119.60 → 2.119.62

package/build/abaplint.d.ts

@@ -412,6 +412,8 @@ declare class Attributes implements IAttributes {
     private readonly filename;
     private readonly aliases;
     private readonly declaredInterfaces;
+    private readonly all;
+    private readonly byName;
     constructor(node: StructureNode, input: SyntaxInput);
     getTypes(): TypeDefinitions;
     getStatic(): ClassAttribute[];
@@ -423,6 +425,7 @@ declare class Attributes implements IAttributes {
     getConstants(): ClassConstant[];
     getConstantsByVisibility(visibility: Visibility): ClassConstant[];
     findByName(name: string): ClassAttribute | ClassConstant | undefined;
+    private buildByName;
     private parse;
     private parseSection;
     private parseAlias;
@@ -4398,13 +4401,16 @@ declare interface ISyntaxResult {
 declare interface ISyntaxSettings {
     /** ABAP language version */
     version?: VersionOldOrNew;
-    languageVersion?: LanguageVersion;
     /** Report error for objects in this regex namespace. Types not in namespace will be void. Case insensitive */
     errorNamespace: string;
     /** List of full named global constants (regex not possible)
      * @uniqueItems true
      */
     globalConstants?: string[];
+    /** List of names to void in ambigious statements (regex not possible)
+     * @uniqueItems true
+     */
+    ambigiousVoids?: string[];
     /** List of full named global macros (regex not possible)
      * @uniqueItems true
      */
@@ -6403,10 +6409,13 @@ declare class Result {
     private readonly tokens;
     private readonly tokenIndex;
     private nodes;
+    private nodeCount;
     constructor(tokens: readonly Token[], tokenIndex: number, nodes?: (ExpressionNode | TokenNode)[]);
+    private static fromChain;
     peek(): Token;
     peekAt(offset: number): Token | undefined;
     shift(node: ExpressionNode | TokenNode): Result;
+    wrapConsumed(consumedTokens: number, node: ExpressionNode): Result;
     popNode(): ExpressionNode | TokenNode | undefined;
     getNodes(): (ExpressionNode | TokenNode)[];
     setNodes(n: (ExpressionNode | TokenNode)[]): void;
@@ -6752,6 +6761,7 @@ declare class Skip implements IStatement {
 
 export declare class SkipLogic {
     private readonly reg;
+    private includeGraph;
     /** TOBJ cache hashmap */
     private tobj;
     constructor(reg: IRegistry);

package/build/src/abap/2_statements/combi.js

@@ -599,24 +599,14 @@ class Expression {
         for (const input of r) {
             const temp = this.runnable.run([input]);
             for (const t of temp) {
-                let consumed = input.remainingLength() - t.remainingLength();
+                const consumed = input.remainingLength() - t.remainingLength();
                 if (consumed > 0) {
-                    const originalLength = t.getNodes().length;
-                    const children = [];
-                    while (consumed > 0) {
-                        const sub = t.popNode();
-                        if (sub) {
-                            children.push(sub);
-                            consumed = consumed - sub.countTokens();
-                        }
-                    }
                     const re = new nodes_1.ExpressionNode(this);
-                    re.setChildren(children.reverse());
-                    const n = t.getNodes().slice(0, originalLength - consumed);
-                    n.push(re);
-                    t.setNodes(n);
+                    results.push(t.wrapConsumed(consumed, re));
+                }
+                else {
+                    results.push(t);
                 }
-                results.push(t);
             }
         }
         //    console.dir(results);

package/build/src/abap/2_statements/result.js

@@ -7,11 +7,17 @@ class Result {
         // nodes: matched tokens
         this.tokens = tokens;
         this.tokenIndex = tokenIndex;
-        this.nodes = nodes;
-        if (this.nodes === undefined) {
-            this.nodes = [];
+        this.nodeCount = 0;
+        if (nodes !== undefined) {
+            this.setNodes(nodes);
         }
     }
+    static fromChain(tokens, tokenIndex, nodes, nodeCount) {
+        const ret = new Result(tokens, tokenIndex);
+        ret.nodes = nodes;
+        ret.nodeCount = nodeCount;
+        return ret;
+    }
     peek() {
         return this.tokens[this.tokenIndex];
     }
@@ -19,18 +25,54 @@ class Result {
         return this.tokens[this.tokenIndex + offset];
     }
     shift(node) {
-        const cp = this.nodes.slice();
-        cp.push(node);
-        return new Result(this.tokens, this.tokenIndex + 1, cp);
+        return Result.fromChain(this.tokens, this.tokenIndex + 1, { node, previous: this.nodes }, this.nodeCount + 1);
+    }
+    wrapConsumed(consumedTokens, node) {
+        let current = this.nodes;
+        let currentCount = this.nodeCount;
+        const children = [];
+        while (consumedTokens > 0) {
+            if (current === undefined) {
+                break;
+            }
+            children.push(current.node);
+            consumedTokens = consumedTokens - current.node.countTokens();
+            current = current.previous;
+            currentCount--;
+        }
+        node.setChildren(children.reverse());
+        this.nodes = { node, previous: current };
+        this.nodeCount = currentCount + 1;
+        return this;
     }
     popNode() {
-        return this.nodes.pop();
+        if (this.nodes === undefined) {
+            return undefined;
+        }
+        const ret = this.nodes.node;
+        this.nodes = this.nodes.previous;
+        this.nodeCount--;
+        return ret;
     }
     getNodes() {
-        return this.nodes;
+        const ret = new Array(this.nodeCount);
+        let current = this.nodes;
+        for (let index = this.nodeCount - 1; index >= 0; index--) {
+            if (current === undefined) {
+                break;
+            }
+            ret[index] = current.node;
+            current = current.previous;
+        }
+        return ret;
     }
     setNodes(n) {
-        this.nodes = n;
+        this.nodes = undefined;
+        this.nodeCount = 0;
+        for (const node of n) {
+            this.nodes = { node, previous: this.nodes };
+            this.nodeCount++;
+        }
     }
     getTokens() {
         return this.tokens;

package/build/src/abap/2_statements/statement_parser.js

@@ -239,7 +239,9 @@ class StatementParser {
                 statement = input;
             }
             else if (length === 1 && lastToken instanceof tokens_1.Pragma) {
-                statement = new nodes_1.StatementNode(new _statement_1.Empty(), undefined, [lastToken]);
+                // special case, everything crashes if StatementNodes doesnt have children
+                statement = new nodes_1.StatementNode(new _statement_1.Empty(), undefined, [lastToken])
+                    .setChildren(this.tokensToNodes([lastToken]));
             }
         }
         return statement;

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

@@ -296,7 +296,7 @@ class CurrentScope {
     }
     findTypePoolConstant(name) {
         var _a;
-        if (name === undefined || name.includes("_") === undefined) {
+        if (name === undefined || name.includes("_") === false) {
             return undefined;
         }
         const typePoolName = name.split("_")[0];
@@ -318,7 +318,7 @@ class CurrentScope {
     }
     findTypePoolType(name) {
         var _a;
-        if (name.includes("_") === undefined) {
+        if (name.includes("_") === false) {
             return undefined;
         }
         const typePoolName = name.split("_")[0];

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

@@ -108,11 +108,9 @@ class ObjectOriented {
     findMethodInInterface(interfaceName, methodName) {
         const idef = this.scope.findInterfaceDefinition(interfaceName);
         if (idef) {
-            const methods = idef.getMethodDefinitions().getAll();
-            for (const method of methods) {
-                if (method.getName().toUpperCase() === methodName.toUpperCase()) {
-                    return { method, def: idef };
-                }
+            const method = idef.getMethodDefinitions().getByName(methodName);
+            if (method) {
+                return { method, def: idef };
             }
             return this.findMethodViaAlias(methodName, idef);
         }
@@ -334,17 +332,14 @@ class ObjectOriented {
         if (defs === undefined) {
             return undefined;
         }
-        for (const method of defs.getAll()) {
-            if (method.getName().toUpperCase() === methodName.toUpperCase()) {
-                if (method.isRedefinition()) {
-                    return this.findMethodInSuper(def, methodName);
-                }
-                else {
-                    return method;
-                }
-            }
+        const method = defs.getByName(methodName);
+        if (method === undefined) {
+            return undefined;
         }
-        return undefined;
+        if (method.isRedefinition()) {
+            return this.findMethodInSuper(def, methodName);
+        }
+        return method;
     }
     findMethodInSuper(child, methodName) {
         let sup = child.getSuperClass();

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

@@ -50,18 +50,25 @@ class DeleteInternal {
         let targetType = undefined;
         const target = node.findDirectExpression(Expressions.Target);
         if (target) {
+            const targetName = target.concatTokens();
             let tabl = undefined;
-            const localVariable = input.scope.findVariable(target.concatTokens());
+            const localVariable = input.scope.findVariable(targetName);
             if (localVariable === undefined && node.getChildren().length === 5 && node.getChildren()[2].concatTokens().toUpperCase() === "FROM") {
                 // it might be a database table
-                const found = (_a = input.scope.getDDIC()) === null || _a === void 0 ? void 0 : _a.lookupTableOrView(target.concatTokens());
+                const found = (_a = input.scope.getDDIC()) === null || _a === void 0 ? void 0 : _a.lookupTableOrView(targetName);
                 if ((found === null || found === void 0 ? void 0 : found.object) !== undefined) {
                     tabl = found;
                     input.scope.getDDICReferences().addUsing(input.scope.getParentObj(), { object: tabl.object });
                 }
             }
             if (tabl === undefined) {
-                targetType = target_1.Target.runSyntax(target, input);
+                const ambigiousVoids = input.scope.getRegistry().getConfig().getSyntaxSetttings().ambigiousVoids || [];
+                if (ambigiousVoids.some(name => name.toUpperCase() === targetName.toUpperCase())) {
+                    targetType = basic_1.VoidType.get(targetName);
+                }
+                else {
+                    targetType = target_1.Target.runSyntax(target, input);
+                }
                 if (node.findDirectTokenByText("TABLE") === undefined
                     && node.findDirectTokenByText("ADJACENT") === undefined
                     && (node.findDirectTokenByText("FROM") || node.findDirectTokenByText("INDEX"))

package/build/src/abap/types/class_attributes.js

@@ -63,6 +63,8 @@ class Attributes {
         this.tlist = [];
         this.filename = input.filename;
         this.parse(node, input);
+        this.all = this.static.concat(this.instance);
+        this.byName = this.buildByName();
         this.types = new type_definitions_1.TypeDefinitions(this.tlist);
     }
     getTypes() {
@@ -75,10 +77,7 @@ class Attributes {
         return this.aliases;
     }
     getAll() {
-        let res = [];
-        res = res.concat(this.static);
-        res = res.concat(this.instance);
-        return res;
+        return this.all;
     }
     getStaticsByVisibility(visibility) {
         const attributes = [];
@@ -113,27 +112,29 @@ class Attributes {
         }
         return attributes;
     }
-    // todo, optimize
     findByName(name) {
-        const upper = name.toUpperCase();
-        for (const a of this.getStatic()) {
-            if (a.getName().toUpperCase() === upper) {
-                return a;
-            }
+        return this.byName[name.toUpperCase()];
+    }
+    /////////////////////////////
+    buildByName() {
+        const ret = {};
+        for (const a of this.static) {
+            ret[a.getName().toUpperCase()] = a;
         }
-        for (const a of this.getInstance()) {
-            if (a.getName().toUpperCase() === upper) {
-                return a;
+        for (const a of this.instance) {
+            const name = a.getName().toUpperCase();
+            if (ret[name] === undefined) {
+                ret[name] = a;
             }
         }
-        for (const a of this.getConstants()) {
-            if (a.getName().toUpperCase() === upper) {
-                return a;
+        for (const a of this.constants) {
+            const name = a.getName().toUpperCase();
+            if (ret[name] === undefined) {
+                ret[name] = a;
             }
         }
-        return undefined;
+        return ret;
     }
-    /////////////////////////////
     parse(node, input) {
         var _a, _b;
         const cdef = node.findDirectStructure(Structures.ClassDefinition);

package/build/src/config.js

@@ -47,10 +47,19 @@ class Config {
         for (const rule of sorted) {
             rules[rule.getMetadata().key] = rule.getConfig();
         }
-        const version = ver !== null && ver !== void 0 ? ver : {
-            release: version_1.Release.Newest.name,
-            language: langVer !== null && langVer !== void 0 ? langVer : version_1.LanguageVersion.Normal,
-        };
+        const version = langVer !== undefined
+            ? {
+                release: ver === undefined || ver === version_1.Version.Cloud
+                    ? version_1.Release.Newest.name
+                    : typeof ver === "string"
+                        ? (0, version_1.versionToABAPRelease)(ver).name
+                        : ver.release,
+                language: langVer,
+            }
+            : ver !== null && ver !== void 0 ? ver : {
+                release: version_1.Release.Newest.name,
+                language: version_1.LanguageVersion.Normal,
+            };
         // defaults: dont skip anything, report everything. The user can decide to skip stuff
         // its difficult to debug errors not being reported
         const config = {
@@ -75,9 +84,9 @@ class Config {
                 }],
             syntax: {
                 version,
-                languageVersion: langVer,
                 errorNamespace: "^(Z|Y|LCL\_|TY\_|LIF\_)",
                 globalConstants: [],
+                ambigiousVoids: [],
                 globalMacros: [],
             },
             rules: rules,
@@ -128,6 +137,12 @@ class Config {
             // remove duplicates,
             this.config.syntax.globalConstants = [...new Set(this.config.syntax.globalConstants)];
         }
+        if (this.config.syntax.ambigiousVoids === undefined) {
+            this.config.syntax.ambigiousVoids = [];
+        }
+        else {
+            this.config.syntax.ambigiousVoids = [...new Set(this.config.syntax.ambigiousVoids)];
+        }
         if (this.config.global.skipIncludesWithoutMain === undefined) {
             this.config.global.skipIncludesWithoutMain = false;
         }
@@ -177,9 +192,6 @@ class Config {
         return v;
     }
     getLanguageVersion() {
-        if (this.config.syntax.languageVersion !== undefined) {
-            return this.config.syntax.languageVersion;
-        }
         const v = this.config.syntax.version;
         if (v !== undefined && typeof v !== "string") {
             return v.language;
@@ -204,7 +216,10 @@ class Config {
             return;
         }
         if (version === version_1.Version.Cloud) {
-            this.config.syntax.languageVersion = version_1.LanguageVersion.Cloud;
+            this.config.syntax.version = {
+                release: version_1.Release.Newest.name,
+                language: version_1.LanguageVersion.Cloud,
+            };
         }
         // OpenABAP keeps its own version identity; open-abap-ness is derived from the
         // release in getOpenABAP() rather than a separate stored flag.

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -342,6 +342,7 @@ Make sure to test the downported code, it might not always be completely correct
         const lowConfig = this.lowReg.getConfig().get();
         highConfig.syntax.errorNamespace = lowConfig.syntax.errorNamespace;
         highConfig.syntax.globalConstants = lowConfig.syntax.globalConstants;
+        highConfig.syntax.ambigiousVoids = lowConfig.syntax.ambigiousVoids;
         highConfig.syntax.globalMacros = lowConfig.syntax.globalMacros;
         this.highReg = new registry_1.Registry();
         for (const o of this.lowReg.getObjects()) {

package/build/src/rules/names_no_dash.js

@@ -39,7 +39,6 @@ const Expressions = __importStar(require("../abap/2_statements/expressions"));
 const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const issue_1 = require("../issue");
-const tokens_1 = require("../abap/1_lexer/tokens");
 const expressions_1 = require("../abap/2_statements/expressions");
 const _irule_1 = require("./_irule");
 class NamesNoDashConf extends _basic_rule_config_1.BasicRuleConfig {
@@ -79,32 +78,26 @@ class NamesNoDash extends _abap_rule_1.ABAPRule {
         if (obj.getType() !== "CLAS" && obj.getType() !== "INTF") {
             for (const form of struc.findAllStatements(Statements.Form)) {
                 const expr = form.findFirstExpression(expressions_1.FormName);
-                for (const token of expr.getTokens()) {
-                    if (token instanceof tokens_1.Dash || token instanceof tokens_1.DashW) {
-                        const issue = issue_1.Issue.atToken(file, token, this.getMessage(), this.getMetadata().key, this.conf.severity);
-                        issues.push(issue);
-                        break;
-                    }
+                const token = expr === null || expr === void 0 ? void 0 : expr.findDirectTokenByText("-");
+                if (token) {
+                    const issue = issue_1.Issue.atToken(file, token, this.getMessage(), this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
                 }
             }
             for (const form of struc.findAllStatements(Statements.Parameter)) {
                 const expr = form.findFirstExpression(Expressions.FieldSub);
-                for (const token of expr.getTokens()) {
-                    if (token instanceof tokens_1.Dash || token instanceof tokens_1.DashW) {
-                        const issue = issue_1.Issue.atToken(file, token, this.getMessage(), this.getMetadata().key, this.conf.severity);
-                        issues.push(issue);
-                        break;
-                    }
+                const token = expr === null || expr === void 0 ? void 0 : expr.findDirectTokenByText("-");
+                if (token) {
+                    const issue = issue_1.Issue.atToken(file, token, this.getMessage(), this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
                 }
             }
             for (const form of struc.findAllStatements(Statements.SelectOption)) {
                 const expr = form.findFirstExpression(Expressions.FieldSub);
-                for (const token of expr.getTokens()) {
-                    if (token instanceof tokens_1.Dash || token instanceof tokens_1.DashW) {
-                        const issue = issue_1.Issue.atToken(file, token, this.getMessage(), this.getMetadata().key, this.conf.severity);
-                        issues.push(issue);
-                        break;
-                    }
+                const token = expr === null || expr === void 0 ? void 0 : expr.findDirectTokenByText("-");
+                if (token) {
+                    const issue = issue_1.Issue.atToken(file, token, this.getMessage(), this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
                 }
             }
         }

package/build/src/rules/unnecessary_pragma.js

@@ -42,6 +42,7 @@ const _basic_rule_config_1 = require("./_basic_rule_config");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
 const _irule_1 = require("./_irule");
 const edit_helper_1 = require("../edit_helper");
+const tokens_1 = require("../abap/1_lexer/tokens");
 class UnnecessaryPragmaConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -110,6 +111,17 @@ DATA: BEGIN OF blah ##NEEDED,
         for (let i = 0; i < statements.length; i++) {
             const statement = statements[i];
             const nextStatement = statements[i + 1];
+            if (statement.get() instanceof _statement_1.Empty
+                && statement.getChildren().length === 1) {
+                const tokens = statement.getTokens();
+                if (tokens.length === 1
+                    && tokens[0] instanceof tokens_1.Pragma) {
+                    const message = "Pragma without a statement can be removed";
+                    const fix = edit_helper_1.EditHelper.deleteToken(file, tokens[0]);
+                    issues.push(issue_1.Issue.atToken(file, tokens[0], message, this.getMetadata().key, this.conf.severity, fix));
+                    continue;
+                }
+            }
             if (statement.get() instanceof Statements.EndTry) {
                 noHandler = false;
             }

package/build/src/skip_logic.js

@@ -6,9 +6,11 @@ const include_graph_1 = require("./utils/include_graph");
 class SkipLogic {
     constructor(reg) {
         this.reg = reg;
+        this.includeGraph = undefined;
         this.tobj = undefined;
     }
     skip(obj) {
+        var _a;
         const global = this.reg.getConfig().getGlobal();
         if (global.skipGeneratedGatewayClasses === true
             && obj instanceof objects_1.Class
@@ -18,9 +20,9 @@ class SkipLogic {
         else if (global.skipIncludesWithoutMain === true
             && obj instanceof objects_1.Program
             && obj.isInclude() === true) {
-            const ig = new include_graph_1.IncludeGraph(this.reg);
+            (_a = this.includeGraph) !== null && _a !== void 0 ? _a : (this.includeGraph = new include_graph_1.IncludeGraph(this.reg));
             const file = obj.getMainABAPFile();
-            if (file && ig.listMainForInclude(file.getFilename()).length === 0) {
+            if (file && this.includeGraph.listMainForInclude(file.getFilename()).length === 0) {
                 return true;
             }
         }

package/package.json

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