@abaplint/core 2.119.15 → 2.119.17

package/build/abaplint.d.ts

@@ -4619,6 +4619,7 @@ declare class MethodDefinitions implements IMethodDefinitions {
     getByName(name: string | undefined): IMethodDefinition | undefined;
     private parseInterface;
     private parse;
+    private add;
 }
 
 declare class MethodDefRaising extends Expression {
@@ -4684,6 +4685,7 @@ declare class MethodParameters_2 implements IMethodParameters {
     getExceptions(): string[];
     getParameterDefault(parameter: string): ExpressionNode;
     private parse;
+    private checkDuplicateNames;
     private workaroundRAP;
     private add;
 }

package/build/src/abap/2_statements/expressions/parameter_exception.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParameterException = void 0;
 const combi_1 = require("../combi");
+const tokens_1 = require("../../1_lexer/tokens");
 const _1 = require(".");
 class ParameterException extends combi_1.Expression {
     getRunnable() {
-        const name = (0, combi_1.altPrio)("OTHERS", _1.ParameterName);
+        const name = (0, combi_1.altPrio)("OTHERS", (0, combi_1.seq)(_1.ParameterName, (0, combi_1.tok)(tokens_1.Dash), _1.ComponentName), _1.ParameterName);
         return (0, combi_1.seq)(name, (0, combi_1.optPrio)((0, combi_1.seq)("=", (0, combi_1.altPrio)(_1.Integer, _1.SimpleFieldChain), (0, combi_1.optPrio)((0, combi_1.seq)("MESSAGE", _1.Target)))));
     }
 }

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

@@ -7,6 +7,7 @@ const table_type_1 = require("../types/basic/table_type");
 const enum_type_1 = require("../types/basic/enum_type");
 const cgeneric_type_1 = require("../types/basic/cgeneric_type");
 const Expressions = require("../2_statements/expressions");
+const nodes_1 = require("../nodes");
 // todo: refactor to static? for performance
 class TypeUtils {
     constructor(scope) {
@@ -257,6 +258,18 @@ class TypeUtils {
           return false;
         }
         */
+        var _a;
+        if (node.getChildren().length === 4
+            && node.getFirstChild() instanceof nodes_1.TokenNodeRegex
+            && ((_a = node.getFirstChild()) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase()) === "BOOLC") {
+            return true;
+        }
+        if (node.getChildren().length >= 3) {
+            const second = node.getChildren()[1];
+            if (second.getFirstToken().getStr() === "&&") {
+                return true;
+            }
+        }
         const calculated = node.findFirstExpression(Expressions.MethodCallChain) !== undefined
             || node.findFirstExpression(Expressions.StringTemplate) !== undefined
             || node.findFirstExpression(Expressions.ArithOperator) !== undefined;
@@ -270,7 +283,7 @@ class TypeUtils {
         return this.isAssignable(source, target);
     }
     isAssignableStrict(source, target, node) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const calculated = node ? this.isCalculated(node) : false;
         /*
             console.dir(source);
@@ -329,16 +342,15 @@ class TypeUtils {
         else if (source instanceof basic_1.StringType) {
             if (target instanceof basic_1.StructureType && this.structureContainsString(target)) {
                 return false;
-                /*
-              } else if (target instanceof CharacterType) {
-                if (source.getAbstractTypeData()?.derivedFromConstant === true) {
-                  return true;
+            }
+            else if (target instanceof basic_1.CharacterType) {
+                if (((_g = source.getAbstractTypeData()) === null || _g === void 0 ? void 0 : _g.derivedFromConstant) === true) {
+                    return true;
                 }
                 return false;
-                */
             }
             else if (target instanceof basic_1.IntegerType) {
-                if (((_g = source.getAbstractTypeData()) === null || _g === void 0 ? void 0 : _g.derivedFromConstant) === true) {
+                if (((_h = source.getAbstractTypeData()) === null || _h === void 0 ? void 0 : _h.derivedFromConstant) === true) {
                     return true;
                 }
                 return false;
@@ -348,7 +360,7 @@ class TypeUtils {
                 return false;
             }
             else if (target instanceof basic_1.XSequenceType || target instanceof basic_1.XStringType) {
-                if (((_h = source.getAbstractTypeData()) === null || _h === void 0 ? void 0 : _h.derivedFromConstant) === true) {
+                if (((_j = source.getAbstractTypeData()) === null || _j === void 0 ? void 0 : _j.derivedFromConstant) === true) {
                     return true;
                 }
                 return false;
@@ -392,7 +404,7 @@ class TypeUtils {
                 return false;
             }
             else if (target instanceof basic_1.Integer8Type || target instanceof basic_1.PackedType) {
-                if (((_j = source.getAbstractTypeData()) === null || _j === void 0 ? void 0 : _j.derivedFromConstant) === true) {
+                if (((_k = source.getAbstractTypeData()) === null || _k === void 0 ? void 0 : _k.derivedFromConstant) === true) {
                     return true;
                 }
                 return false;

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

@@ -24,8 +24,8 @@ class FieldChain {
             && node.findDirectExpression(Expressions.ComponentName)) {
             // workaround for names with dashes, eg. "sy-repid"
             const concat = node.concatTokens().replace(/ /g, "");
-            const offset = ((_b = node.findDirectExpression(Expressions.FieldOffset)) === null || _b === void 0 ? void 0 : _b.concatTokens()) || "";
-            const length = ((_c = node.findDirectExpression(Expressions.FieldLength)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "";
+            const offset = ((_b = node.findDirectExpression(Expressions.FieldOffset)) === null || _b === void 0 ? void 0 : _b.concatTokens().replace(/ /g, "")) || "";
+            const length = ((_c = node.findDirectExpression(Expressions.FieldLength)) === null || _c === void 0 ? void 0 : _c.concatTokens().replace(/ /g, "")) || "";
             const found = input.scope.findVariable(concat.replace(offset, "").replace(length, ""));
             if (found) {
                 if (refType) {

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

@@ -41,7 +41,8 @@ class ClassDefinition extends _identifier_1.Identifier {
         for (const e of events) {
             const eventName = (_a = e.findDirectExpression(Expressions.EventName)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
             if (this.events.find(ev => ev.getName().toUpperCase() === eventName) !== undefined) {
-                throw new Error("Event " + eventName + " already defined");
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, e.getFirstToken(), "Event " + eventName + " already defined"));
+                continue;
             }
             this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, input)); // todo, all these are not Public
         }
@@ -61,8 +62,8 @@ class ClassDefinition extends _identifier_1.Identifier {
             this.createVisibilityValue = visibility_1.Visibility.Public;
         }
         // perform checks after everything has been initialized
-        this.checkMethodsFromSuperClasses(input.scope);
-        this.checkMethodNameLength();
+        this.checkMethodsFromSuperClasses(input);
+        this.checkMethodNameLength(input);
     }
     getFriends() {
         return this.friends;
@@ -118,18 +119,20 @@ class ClassDefinition extends _identifier_1.Identifier {
         const name = token === null || token === void 0 ? void 0 : token.getStr();
         return name;
     }
-    checkMethodNameLength() {
+    checkMethodNameLength(input) {
         for (const m of this.methodDefs.getAll()) {
             if (m.getName().length > 30 && m.getName().includes("~") === false) {
                 const message = `Method name "${m.getName()}" is too long, maximum length is 30 characters`;
-                throw new Error(message);
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, m.getToken(), message));
             }
         }
     }
-    checkMethodsFromSuperClasses(scope) {
+    checkMethodsFromSuperClasses(input) {
         var _a;
+        const scope = input.scope;
         let sup = this.getSuperClass();
         const names = new Set();
+        const methods = new Map();
         while (sup !== undefined) {
             const cdef = scope.findClassDefinition(sup);
             for (const m of ((_a = cdef === null || cdef === void 0 ? void 0 : cdef.getMethodDefinitions()) === null || _a === void 0 ? void 0 : _a.getAll()) || []) {
@@ -143,6 +146,9 @@ class ClassDefinition extends _identifier_1.Identifier {
                     continue;
                 }
                 names.add(name);
+                if (methods.has(name) === false) {
+                    methods.set(name, m.getVisibility());
+                }
             }
             for (const a of (cdef === null || cdef === void 0 ? void 0 : cdef.getAliases()) || []) {
                 names.add(a.getName().toUpperCase());
@@ -152,7 +158,13 @@ class ClassDefinition extends _identifier_1.Identifier {
         for (const m of this.getMethodDefinitions().getAll()) {
             if (names.has(m.getName().toUpperCase())
                 && m.isRedefinition() === false) {
-                throw new Error(`${m.getName().toUpperCase()} already declared in superclass`);
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, m.getToken(), `${m.getName().toUpperCase()} already declared in superclass`));
+            }
+            const superVisibility = methods.get(m.getName().toUpperCase());
+            if (m.isRedefinition() === true
+                && superVisibility !== undefined
+                && m.getVisibility() !== superVisibility) {
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, m.getToken(), `${m.getName().toUpperCase()} redefinition visibility cannot be changed`));
             }
         }
     }

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

@@ -11,6 +11,7 @@ const _scope_type_1 = require("../5_syntax/_scope_type");
 const event_definition_1 = require("./event_definition");
 const method_definitions_1 = require("./method_definitions");
 const _reference_1 = require("../5_syntax/_reference");
+const _syntax_input_1 = require("../5_syntax/_syntax_input");
 const _object_oriented_1 = require("../5_syntax/_object_oriented");
 class InterfaceDefinition extends _identifier_1.Identifier {
     constructor(node, input) {
@@ -27,7 +28,7 @@ class InterfaceDefinition extends _identifier_1.Identifier {
         this.parse(input, node);
         input.scope.pop(node.getLastToken().getEnd());
         // perform checks after everything has been initialized
-        this.checkMethodNameLength();
+        this.checkMethodNameLength(input);
     }
     getSuperClass() {
         return undefined;
@@ -57,11 +58,11 @@ class InterfaceDefinition extends _identifier_1.Identifier {
         return this.methodDefinitions;
     }
     /////////////////
-    checkMethodNameLength() {
+    checkMethodNameLength(input) {
         for (const m of this.methodDefinitions.getAll()) {
             if (m.getName().length > 30) {
                 const message = `Method name "${m.getName()}" is too long, maximum length is 30 characters`;
-                throw new Error(message);
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, m.getToken(), message));
             }
         }
     }
@@ -86,6 +87,7 @@ class InterfaceDefinition extends _identifier_1.Identifier {
         }
     }
     parse(input, node) {
+        var _a;
         this.checkInterfacesExists(input, node);
         const helper = new _object_oriented_1.ObjectOriented(input.scope);
         helper.fromInterfaces(this);
@@ -95,11 +97,17 @@ class InterfaceDefinition extends _identifier_1.Identifier {
         this.aliases = this.attributes.getAliases();
         const events = node.findAllStatements(Statements.Events);
         for (const e of events) {
+            const eventName = (_a = e.findDirectExpression(Expressions.EventName)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
+            if (this.events.find(ev => ev.getName().toUpperCase() === eventName) !== undefined) {
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, e.getFirstToken(), "Event " + eventName + " already defined"));
+                continue;
+            }
             this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, input));
         }
         this.methodDefinitions = new method_definitions_1.MethodDefinitions(node, input);
         if (this.methodDefinitions.getByName("CONSTRUCTOR") !== undefined) {
-            throw new Error("Interfaces cannot have constructor methods");
+            const constructor = this.methodDefinitions.getByName("CONSTRUCTOR");
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, constructor.getToken(), "Interfaces cannot have constructor methods"));
         }
     }
 }

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

@@ -5,6 +5,7 @@ const method_definition_1 = require("./method_definition");
 const Structures = require("../3_structures/structures");
 const statements_1 = require("../2_statements/statements");
 const visibility_1 = require("../4_file_information/visibility");
+const _syntax_input_1 = require("../5_syntax/_syntax_input");
 class MethodDefinitions {
     constructor(node, input) {
         this.all = {};
@@ -26,8 +27,7 @@ class MethodDefinitions {
     parseInterface(node, input) {
         const defs = node.findAllStatements(statements_1.MethodDef);
         for (const def of defs) {
-            const m = new method_definition_1.MethodDefinition(def, visibility_1.Visibility.Public, input);
-            this.all[m.getName().toUpperCase()] = m;
+            this.add(def, visibility_1.Visibility.Public, input);
         }
     }
     parse(node, input) {
@@ -41,19 +41,25 @@ class MethodDefinitions {
         }
         const pri = cdef.findDirectStructure(Structures.PrivateSection);
         for (const def of (pri === null || pri === void 0 ? void 0 : pri.findAllStatements(statements_1.MethodDef)) || []) {
-            const m = new method_definition_1.MethodDefinition(def, visibility_1.Visibility.Private, input);
-            this.all[m.getName().toUpperCase()] = m;
+            this.add(def, visibility_1.Visibility.Private, input);
         }
         const pro = node.findDirectStructure(Structures.ProtectedSection);
         for (const def of (pro === null || pro === void 0 ? void 0 : pro.findAllStatements(statements_1.MethodDef)) || []) {
-            const m = new method_definition_1.MethodDefinition(def, visibility_1.Visibility.Protected, input);
-            this.all[m.getName().toUpperCase()] = m;
+            this.add(def, visibility_1.Visibility.Protected, input);
         }
         const pub = node.findDirectStructure(Structures.PublicSection);
         for (const def of (pub === null || pub === void 0 ? void 0 : pub.findAllStatements(statements_1.MethodDef)) || []) {
-            const m = new method_definition_1.MethodDefinition(def, visibility_1.Visibility.Public, input);
+            this.add(def, visibility_1.Visibility.Public, input);
+        }
+    }
+    add(def, visibility, input) {
+        try {
+            const m = new method_definition_1.MethodDefinition(def, visibility, input);
             this.all[m.getName().toUpperCase()] = m;
         }
+        catch (e) {
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, def.getFirstToken(), e.message));
+        }
     }
 }
 exports.MethodDefinitions = MethodDefinitions;

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

@@ -32,8 +32,13 @@ class MethodParameters {
         // need the scope for LIKE typing inside method parameters
         const parentName = input.scope.getName();
         input.scope.push(_scope_type_1.ScopeType.MethodDefinition, "method definition", node.getStart(), input.filename);
-        this.parse(node, input, parentName, abstractMethod);
-        input.scope.pop(node.getEnd());
+        try {
+            this.parse(node, input, parentName, abstractMethod);
+            this.checkDuplicateNames();
+        }
+        finally {
+            input.scope.pop(node.getEnd());
+        }
     }
     getFilename() {
         return this.filename;
@@ -170,6 +175,16 @@ class MethodParameters {
         }
         this.workaroundRAP(node, input, parentName);
     }
+    checkDuplicateNames() {
+        const names = new Set();
+        for (const parameter of this.getAll()) {
+            const name = parameter.getName().toUpperCase();
+            if (names.has(name)) {
+                throw new Error(`Method parameter "${name}" already defined`);
+            }
+            names.add(name);
+        }
+    }
     workaroundRAP(node, input, parentName) {
         const resultName = node.findExpressionAfterToken("RESULT");
         const isRap = node.findExpressionAfterToken("IMPORTING");

package/build/src/registry.js

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

package/build/src/rules/parser_bad_exceptions.js

@@ -22,10 +22,6 @@ class ParserBadExceptions extends _abap_rule_1.ABAPRule {
             title: "Parser Error, bad EXCEPTIONS in CALL FUNCTION",
             shortDescription: `Checks for syntax not recognized by abaplint, related to EXCEPTIONS in CALL FUNCTION.`,
             tags: [_irule_1.RuleTag.Syntax, _irule_1.RuleTag.SingleFile],
-            /*
-            badExample: `IF ( foo = 'bar').`,
-            goodExample: `IF ( foo = 'bar' ).`,
-            */
         };
     }
     getConfig() {
@@ -40,6 +36,15 @@ class ParserBadExceptions extends _abap_rule_1.ABAPRule {
             if (!(statement.get() instanceof Statements.CallFunction)) {
                 continue;
             }
+            const exceptionTokens = this.findExceptionTokens(statement);
+            if (exceptionTokens !== undefined
+                && this.containsMixedExceptionSyntax(statement.findAllExpressions(Expressions.ParameterException))) {
+                const message = "Bad EXCEPTIONS syntax in CALL FUNCTION";
+                for (const token of exceptionTokens) {
+                    issues.push(issue_1.Issue.atToken(file, token, message, this.getMetadata().key, this.conf.severity));
+                }
+                continue;
+            }
             for (const e of statement.findAllExpressions(Expressions.ParameterException)) {
                 if (e.findDirectTokenByText("=") === undefined) {
                     const message = "Bad EXCEPTIONS syntax in CALL FUNCTION";
@@ -49,6 +54,18 @@ class ParserBadExceptions extends _abap_rule_1.ABAPRule {
         }
         return issues;
     }
+    containsMixedExceptionSyntax(exceptions) {
+        return exceptions.some(e => e.findDirectTokenByText("=") === undefined)
+            && exceptions.some(e => e.findDirectTokenByText("=") !== undefined);
+    }
+    findExceptionTokens(statement) {
+        const tokens = statement.getTokens();
+        const index = tokens.findIndex(t => t.getStr().toUpperCase() === "EXCEPTIONS");
+        if (index === -1) {
+            return undefined;
+        }
+        return tokens.slice(index).filter(t => t.getStr() !== ".");
+    }
 }
 exports.ParserBadExceptions = ParserBadExceptions;
 //# sourceMappingURL=parser_bad_exceptions.js.map

package/build/src/rules/superclass_final.js

@@ -6,6 +6,7 @@ const _abap_rule_1 = require("./_abap_rule");
 const Objects = require("../objects");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const _irule_1 = require("./_irule");
+const include_graph_1 = require("../utils/include_graph");
 class SuperclassFinalConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.SuperclassFinalConf = SuperclassFinalConf;
@@ -13,6 +14,7 @@ class SuperclassFinal extends _abap_rule_1.ABAPRule {
     constructor() {
         super(...arguments);
         this.conf = new SuperclassFinalConf();
+        this.graph = undefined;
     }
     getMetadata() {
         return {
@@ -51,6 +53,9 @@ class SuperclassFinal extends _abap_rule_1.ABAPRule {
                     }
                 }
             }
+            if (found === undefined && obj instanceof Objects.Program) {
+                found = this.findInRelatedProgramIncludes(file, sup);
+            }
             if (found === undefined) {
                 const clas = this.reg.getObject("CLAS", sup);
                 if (clas) {
@@ -70,6 +75,33 @@ class SuperclassFinal extends _abap_rule_1.ABAPRule {
         }
         return output;
     }
+    findInRelatedProgramIncludes(file, superClassName) {
+        if (this.graph === undefined) {
+            this.graph = new include_graph_1.IncludeGraph(this.reg);
+        }
+        const mainFilenames = this.graph.listMainForInclude(file.getFilename());
+        if (mainFilenames.length === 0) {
+            return undefined;
+        }
+        for (const object of this.reg.getObjectsByType("PROG")) {
+            if (!(object instanceof Objects.Program)) {
+                continue;
+            }
+            const programFile = object.getMainABAPFile();
+            if (programFile === undefined) {
+                continue;
+            }
+            const programMainFilenames = this.graph.listMainForInclude(programFile.getFilename());
+            if (mainFilenames.some(filename => programMainFilenames.includes(filename)) === false) {
+                continue;
+            }
+            const found = programFile.getInfo().getClassDefinitionByName(superClassName);
+            if (found !== undefined) {
+                return found;
+            }
+        }
+        return undefined;
+    }
 }
 exports.SuperclassFinal = SuperclassFinal;
 //# sourceMappingURL=superclass_final.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.119.15",
+    "version": "2.119.17",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,7 +50,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.58.5",
+        "@microsoft/api-extractor": "^7.58.7",
         "@types/chai": "^4.3.20",
         "@types/mocha": "^10.0.10",
         "@types/node": "^24.12.2",
@@ -63,7 +63,7 @@
         "typescript": "^5.9.3"
     },
     "dependencies": {
-        "fast-xml-parser": "^5.7.1",
+        "fast-xml-parser": "^5.8.0",
         "json5": "^2.2.3",
         "vscode-languageserver-types": "^3.17.5"
     }