@abaplint/cli 2.119.61 → 2.119.63

package/build/cli.js

@@ -11460,7 +11460,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;
@@ -19849,7 +19851,7 @@ class TypeMesh {
         const on = (0, combi_1.seq)("ON", expressions_1.NamespaceSimpleName, "=", expressions_1.NamespaceSimpleName, (0, combi_1.star)((0, combi_1.seq)("AND", expressions_1.NamespaceSimpleName, "=", expressions_1.NamespaceSimpleName)));
         const using = (0, combi_1.seq)("USING KEY", expressions_1.NamespaceSimpleName);
         const association = (0, combi_1.seq)("ASSOCIATION", expressions_1.NamespaceSimpleName, "TO", expressions_1.NamespaceSimpleName, (0, combi_1.plus)(on));
-        const ret = (0, combi_1.ver)(version_1.Release.v751, (0, combi_1.seq)("TYPES", expressions_1.NamespaceSimpleName, "TYPE", (0, combi_1.opt)("REF TO"), expressions_1.TypeName, (0, combi_1.plus)(association), (0, combi_1.opt)(using)));
+        const ret = (0, combi_1.ver)(version_1.Release.v740sp05, (0, combi_1.seq)("TYPES", expressions_1.NamespaceSimpleName, "TYPE", (0, combi_1.opt)("REF TO"), expressions_1.TypeName, (0, combi_1.plus)(association), (0, combi_1.opt)(using)));
         return ret;
     }
 }
@@ -26251,7 +26253,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];
@@ -26273,7 +26275,7 @@ class CurrentScope {
     }
     findTypePoolType(name) {
         var _a;
-        if (name.includes("_") === undefined) {
+        if (name.includes("_") === false) {
             return undefined;
         }
         const typePoolName = name.split("_")[0];
@@ -26587,11 +26589,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);
         }
@@ -26813,17 +26813,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();
@@ -50694,6 +50691,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() {
@@ -50706,10 +50705,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 = [];
@@ -50744,27 +50740,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);
@@ -54541,10 +54539,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 = {
@@ -54569,7 +54576,6 @@ class Config {
                 }],
             syntax: {
                 version,
-                languageVersion: langVer,
                 errorNamespace: "^(Z|Y|LCL\_|TY\_|LIF\_)",
                 globalConstants: [],
                 ambigiousVoids: [],
@@ -54678,9 +54684,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;
@@ -54705,7 +54708,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.
@@ -59633,6 +59639,7 @@ function parseDynpros(parsed) {
                 fields.push({
                     name: f.NAME,
                     type: f.TYPE,
+                    contType: f.CONT_TYPE,
                     length: parseNumber(f.LENGTH),
                     vislength: parseNumber(f.VISLENGTH),
                     line: parseNumber(f.LINE),
@@ -61520,9 +61527,8 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
             }
             if (found === undefined) {
                 // typed virtual element: VIRTUAL <name> : <type>
-                const names = e.findAllExpressions(expressions_1.CDSName);
-                if (e.findDirectTokenByText("VIRTUAL") !== undefined && names.length > 0) {
-                    found = names[0];
+                if (e.findDirectTokenByText("VIRTUAL") !== undefined) {
+                    found = e.findFirstExpression(expressions_1.CDSName);
                 }
             }
             if (found === undefined) {
@@ -68814,7 +68820,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.61";
+        return "2.119.63";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -70985,17 +70991,22 @@ class BeginEndNames extends _abap_rule_1.ABAPRule {
     test(stru, type, b, e, file) {
         const output = [];
         for (const sub of stru.findAllStructuresRecursive(type)) {
-            let begin = sub.findDirectStatements(b)[0].findFirstExpression(Expressions.NamespaceSimpleName);
+            const beginStatement = sub.findDirectStatement(b);
+            const endStatement = sub.findDirectStatement(e);
+            if (beginStatement === undefined || endStatement === undefined) {
+                continue;
+            }
+            let begin = beginStatement.findFirstExpression(Expressions.NamespaceSimpleName);
             if (begin === undefined) {
-                begin = sub.findDirectStatements(b)[0].findFirstExpression(Expressions.DefinitionName);
+                begin = beginStatement.findFirstExpression(Expressions.DefinitionName);
             }
             if (begin === undefined) {
                 continue;
             }
             const first = begin.getFirstToken();
-            let end = sub.findDirectStatements(e)[0].findFirstExpression(Expressions.NamespaceSimpleName);
+            let end = endStatement.findFirstExpression(Expressions.NamespaceSimpleName);
             if (end === undefined) {
-                end = sub.findDirectStatements(e)[0].findFirstExpression(Expressions.DefinitionName);
+                end = endStatement.findFirstExpression(Expressions.DefinitionName);
             }
             if (end === undefined) {
                 continue;
@@ -78207,7 +78218,7 @@ ${indentation}    output = ${uniqueName}.\n`;
                 }
             }
         }
-        if (fix === undefined && high.findAllExpressions(Expressions.NewObject)) {
+        if (fix === undefined) {
             const found = high.findFirstExpression(Expressions.NewObject);
             if (found === undefined) {
                 return undefined;
@@ -78381,12 +78392,13 @@ class DynproChecks {
         const ret = [];
         for (let index = 0; index < dynpro.fields.length; index++) {
             const current = dynpro.fields[index];
-            if (current.name === undefined || current.type === "FRAME") {
+            if (current.name === undefined || current.type === "FRAME" || this.hasContainerRelativeCoordinates(current)) {
                 continue;
             }
             for (let compare = index + 1; compare < dynpro.fields.length; compare++) {
                 const other = dynpro.fields[compare];
-                if (other.name === undefined || other.type === "FRAME" || this.overlaps(current, other) === false) {
+                if (other.name === undefined || other.type === "FRAME" || this.hasContainerRelativeCoordinates(other)
+                    || this.overlaps(current, other) === false) {
                     continue;
                 }
                 const message = `Screen ${dynpro.number}, ${current.type} ${current.name} and ${other.type} ${other.name} are overlapping`;
@@ -78395,6 +78407,9 @@ class DynproChecks {
         }
         return ret;
     }
+    hasContainerRelativeCoordinates(field) {
+        return field.contType === "TABLE_CTRL" || field.contType === "LOOP";
+    }
     overlaps(first, second) {
         if (first.line === 0 || second.line === 0 || first.column === 0 || second.column === 0) {
             return false;
@@ -85844,7 +85859,6 @@ const Expressions = __importStar(__webpack_require__(/*! ../abap/2_statements/ex
 const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "../core/build/src/rules/_abap_rule.js");
 const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "../core/build/src/rules/_basic_rule_config.js");
 const issue_1 = __webpack_require__(/*! ../issue */ "../core/build/src/issue.js");
-const tokens_1 = __webpack_require__(/*! ../abap/1_lexer/tokens */ "../core/build/src/abap/1_lexer/tokens/index.js");
 const expressions_1 = __webpack_require__(/*! ../abap/2_statements/expressions */ "../core/build/src/abap/2_statements/expressions/index.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "../core/build/src/rules/_irule.js");
 class NamesNoDashConf extends _basic_rule_config_1.BasicRuleConfig {
@@ -85884,32 +85898,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);
                 }
             }
         }
@@ -88011,11 +88019,11 @@ ENDIF.`,
                     }
                 }
                 else {
-                    const classNameExpression = staNode.findAllExpressions(Expressions.ClassName);
-                    const methodNameExpression = staNode.findAllExpressions(Expressions.MethodName);
-                    if (classNameExpression.length !== 0 && methodNameExpression.length !== 0) {
-                        const className = classNameExpression[0].concatTokens();
-                        const methodName = methodNameExpression[0].concatTokens();
+                    const classNameExpression = staNode.findFirstExpression(Expressions.ClassName);
+                    const methodNameExpression = staNode.findFirstExpression(Expressions.MethodName);
+                    if (classNameExpression && methodNameExpression) {
+                        const className = classNameExpression.concatTokens();
+                        const methodName = methodNameExpression.concatTokens();
                         if (className === "cl_abap_regex") {
                             if (methodName === "create_posix") {
                                 const issue = issue_1.Issue.atStatement(file, staNode, "create_posix obsolete, use create_pcre", this.getMetadata().key, this.conf.severity);
@@ -92177,12 +92185,12 @@ class ShortCase extends _abap_rule_1.ABAPRule {
             return [];
         }
         for (const c of struc.findAllStructures(Structures.Case)) {
-            const clist = c.findDirectStatements(Statements.Case);
-            if (clist.length > 0 && this.conf.allow && this.conf.allow.find((e) => { return e === clist[0].getTokens()[1].getStr(); })) {
+            const caseStatement = c.findDirectStatement(Statements.Case);
+            if (caseStatement && this.conf.allow && this.conf.allow.find((e) => { return e === caseStatement.getTokens()[1].getStr(); })) {
                 continue;
             }
             if (c.findDirectStructures(Structures.When).length <= this.conf.length) {
-                if (c.findAllExpressions(Expressions.Or).length > 0) {
+                if (c.findFirstExpression(Expressions.Or)) {
                     continue;
                 }
                 const issue = issue_1.Issue.atToken(file, c.getFirstToken(), this.getMessage(), this.getMetadata().key, this.conf.severity);
@@ -94006,9 +94014,9 @@ class TryWithoutCatch extends _abap_rule_1.ABAPRule {
         }
         const tries = stru.findAllStructures(structures_1.Try);
         for (const t of tries) {
-            const clean = t.findDirectStructures(structures_1.Cleanup);
-            const c = t.findDirectStructures(structures_1.Catch);
-            if (c.length === 0 && clean.length === 0) {
+            const clean = t.findDirectStructure(structures_1.Cleanup);
+            const c = t.findDirectStructure(structures_1.Catch);
+            if (c === undefined && clean === undefined) {
                 const issue = issue_1.Issue.atToken(file, t.getFirstToken(), this.getMessage(), this.getMetadata().key, this.conf.severity);
                 issues.push(issue);
             }
@@ -94917,6 +94925,7 @@ const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "..
 const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "../core/build/src/abap/2_statements/statements/_statement.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "../core/build/src/rules/_irule.js");
 const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "../core/build/src/edit_helper.js");
+const tokens_1 = __webpack_require__(/*! ../abap/1_lexer/tokens */ "../core/build/src/abap/1_lexer/tokens/index.js");
 class UnnecessaryPragmaConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -94985,6 +94994,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;
             }
@@ -97698,9 +97718,11 @@ const include_graph_1 = __webpack_require__(/*! ./utils/include_graph */ "../cor
 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
@@ -97710,9 +97732,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/cli",
-    "version": "2.119.61",
+    "version": "2.119.63",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -39,7 +39,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.119.61",
+        "@abaplint/core": "^2.119.63",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",