@abaplint/core 2.102.14 → 2.102.16

package/build/abaplint.d.ts

@@ -2015,7 +2015,6 @@ declare namespace Expressions {
         ComponentCondSub,
         ComponentCond,
         ComponentName,
-        SQLFields,
         ConcatenatedConstant,
         CondBody,
         CondSub,
@@ -2139,8 +2138,8 @@ declare namespace Expressions {
         Source,
         SQLAggregation,
         SQLAliasField,
-        SQLArithmetics,
         SQLArithmeticOperator,
+        SQLArithmetics,
         SQLAsName,
         SQLCase,
         SQLCDSParameters,
@@ -2153,6 +2152,7 @@ declare namespace Expressions {
         SQLFieldList,
         SQLFieldName,
         SQLField,
+        SQLFields,
         SQLForAllEntries,
         SQLFromSource,
         SQLFrom,
@@ -2185,6 +2185,7 @@ declare namespace Expressions {
         TextElementString,
         TextElement,
         Throw,
+        TransportingFields,
         TypeNameOrInfer,
         TypeName,
         TypeParam,
@@ -3706,6 +3707,8 @@ declare interface IStructure {
 declare interface IStructureComponent {
     name: string;
     type: AbstractType;
+    asInclude?: boolean;
+    suffix?: string;
 }
 
 declare interface IStructureRunnable {
@@ -5020,6 +5023,7 @@ export declare enum ScopeType {
     FunctionModule = "function",
     Method = "method",
     MethodInstance = "method_instance",
+    MethodDefinition = "method_definition",
     For = "for",
     Let = "let",
     OpenSQL = "open_sql"
@@ -6324,6 +6328,10 @@ declare class Translate implements IStatement {
     getMatcher(): IStatementRunnable;
 }
 
+declare class TransportingFields extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class TruncateDataset implements IStatement {
     getMatcher(): IStatementRunnable;
 }

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

@@ -43,7 +43,6 @@ __exportStar(require("./component_compare"), exports);
 __exportStar(require("./component_cond_sub"), exports);
 __exportStar(require("./component_cond"), exports);
 __exportStar(require("./component_name"), exports);
-__exportStar(require("./sql_fields"), exports);
 __exportStar(require("./concatenated_constant"), exports);
 __exportStar(require("./cond_body"), exports);
 __exportStar(require("./cond_sub"), exports);
@@ -168,8 +167,8 @@ __exportStar(require("./source_field"), exports);
 __exportStar(require("./source"), exports);
 __exportStar(require("./sql_aggregation"), exports);
 __exportStar(require("./sql_alias_field"), exports);
-__exportStar(require("./sql_arithmetics"), exports);
 __exportStar(require("./sql_arithmetic_operator"), exports);
+__exportStar(require("./sql_arithmetics"), exports);
 __exportStar(require("./sql_as_name"), exports);
 __exportStar(require("./sql_case"), exports);
 __exportStar(require("./sql_cds_parameters"), exports);
@@ -182,6 +181,7 @@ __exportStar(require("./sql_field_list_loop"), exports);
 __exportStar(require("./sql_field_list"), exports);
 __exportStar(require("./sql_field_name"), exports);
 __exportStar(require("./sql_field"), exports);
+__exportStar(require("./sql_fields"), exports);
 __exportStar(require("./sql_for_all_entries"), exports);
 __exportStar(require("./sql_from_source"), exports);
 __exportStar(require("./sql_from"), exports);
@@ -214,6 +214,7 @@ __exportStar(require("./text_element_key"), exports);
 __exportStar(require("./text_element_string"), exports);
 __exportStar(require("./text_element"), exports);
 __exportStar(require("./throw"), exports);
+__exportStar(require("./transporting_fields"), exports);
 __exportStar(require("./type_name_or_infer"), exports);
 __exportStar(require("./type_name"), exports);
 __exportStar(require("./type_param"), exports);

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransportingFields = void 0;
+const combi_1 = require("../combi");
+const dynamic_1 = require("./dynamic");
+const field_sub_1 = require("./field_sub");
+class TransportingFields extends combi_1.Expression {
+    getRunnable() {
+        const fields = (0, combi_1.plus)((0, combi_1.alt)((0, combi_1.seq)("INTO", (0, combi_1.failStar)()), field_sub_1.FieldSub));
+        return (0, combi_1.altPrio)(dynamic_1.Dynamic, fields);
+    }
+}
+exports.TransportingFields = TransportingFields;
+//# sourceMappingURL=transporting_fields.js.map

package/build/src/abap/2_statements/statements/read_table.js

@@ -4,6 +4,7 @@ exports.ReadTable = void 0;
 const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
 const version_1 = require("../../../version");
+const transporting_fields_1 = require("../expressions/transporting_fields");
 class ReadTable {
     getMatcher() {
         const comparing = (0, combi_1.seq)("COMPARING", (0, combi_1.alt)((0, combi_1.plus)(expressions_1.FieldSub), expressions_1.Dynamic));
@@ -12,8 +13,7 @@ class ReadTable {
         const key = (0, combi_1.seq)((0, combi_1.altPrio)("WITH KEY", "WITH TABLE KEY"), (0, combi_1.alt)(expressions_1.ComponentCompareSimple, components, (0, combi_1.seq)((0, combi_1.optPrio)("="), expressions_1.Source)));
         const using = (0, combi_1.seq)("USING KEY", (0, combi_1.alt)(expressions_1.Field, expressions_1.Dynamic));
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
-        const fields = (0, combi_1.plus)((0, combi_1.alt)((0, combi_1.seq)("INTO", (0, combi_1.failStar)()), expressions_1.FieldSub));
-        const perm = (0, combi_1.per)((0, combi_1.alt)(index, key, from), expressions_1.ReadTableTarget, using, comparing, "CASTING", "TRANSPORTING ALL FIELDS", (0, combi_1.seq)("TRANSPORTING", (0, combi_1.altPrio)(expressions_1.Dynamic, fields)), "BINARY SEARCH");
+        const perm = (0, combi_1.per)((0, combi_1.alt)(index, key, from), expressions_1.ReadTableTarget, using, comparing, "CASTING", "TRANSPORTING ALL FIELDS", (0, combi_1.seq)("TRANSPORTING", transporting_fields_1.TransportingFields), "BINARY SEARCH");
         return (0, combi_1.seq)("READ TABLE", (0, combi_1.alt)(expressions_1.SimpleSource2, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source)), (0, combi_1.opt)(perm));
     }
 }

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

@@ -16,6 +16,7 @@ var ScopeType;
     ScopeType["FunctionModule"] = "function";
     ScopeType["Method"] = "method";
     ScopeType["MethodInstance"] = "method_instance";
+    ScopeType["MethodDefinition"] = "method_definition";
     ScopeType["For"] = "for";
     ScopeType["Let"] = "let";
     ScopeType["OpenSQL"] = "open_sql";

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

@@ -5,22 +5,28 @@ const Expressions = require("../../2_statements/expressions");
 const source_1 = require("./source");
 class MessageSource {
     runSyntax(node, scope, filename) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         for (const f of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(f, scope, filename);
         }
         if (node.getFirstToken().getStr().toUpperCase() === "ID") {
             const id = (_a = node.findExpressionAfterToken("ID")) === null || _a === void 0 ? void 0 : _a.concatTokens();
-            const number = (_b = node.findDirectExpression(Expressions.MessageNumber)) === null || _b === void 0 ? void 0 : _b.concatTokens();
+            let number = (_b = node.findDirectExpression(Expressions.MessageNumber)) === null || _b === void 0 ? void 0 : _b.concatTokens();
+            if (number === undefined) {
+                const num = (_c = node.findExpressionAfterToken("NUMBER")) === null || _c === void 0 ? void 0 : _c.concatTokens();
+                if (num === null || num === void 0 ? void 0 : num.startsWith("'")) {
+                    number = num.substring(1, num.length - 1).toUpperCase();
+                }
+            }
             if ((id === null || id === void 0 ? void 0 : id.startsWith("'")) && number) {
                 const messageClass = id.substring(1, id.length - 1).toUpperCase();
                 scope.getMSAGReferences().addUsing(filename, node.getFirstToken(), messageClass, number);
             }
         }
         else {
-            const typeAndNumber = (_c = node.findDirectExpression(Expressions.MessageTypeAndNumber)) === null || _c === void 0 ? void 0 : _c.concatTokens();
+            const typeAndNumber = (_d = node.findDirectExpression(Expressions.MessageTypeAndNumber)) === null || _d === void 0 ? void 0 : _d.concatTokens();
             const messageNumber = typeAndNumber === null || typeAndNumber === void 0 ? void 0 : typeAndNumber.substring(1);
-            const messageClass = (_d = node.findDirectExpression(Expressions.MessageClass)) === null || _d === void 0 ? void 0 : _d.concatTokens().toUpperCase();
+            const messageClass = (_e = node.findDirectExpression(Expressions.MessageClass)) === null || _e === void 0 ? void 0 : _e.concatTokens().toUpperCase();
             if (messageNumber && messageClass) {
                 scope.getMSAGReferences().addUsing(filename, node.getFirstToken(), messageClass, messageNumber);
             }

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

@@ -17,14 +17,18 @@ class IncludeType {
         let ityp = new basic_types_1.BasicTypes(filename, scope).parseType(iname);
         const as = (_a = node.findExpressionAfterToken("AS")) === null || _a === void 0 ? void 0 : _a.concatTokens();
         if (as && ityp instanceof basic_1.StructureType) {
-            ityp = new basic_1.StructureType(ityp.getComponents().concat([{ name: as, type: ityp }]));
+            ityp = new basic_1.StructureType(ityp.getComponents().concat([{
+                    name: as,
+                    type: ityp,
+                    asInclude: true,
+                }]));
         }
         const suffix = (_b = node.findExpressionAfterToken("SUFFIX")) === null || _b === void 0 ? void 0 : _b.concatTokens();
         if (suffix && ityp instanceof basic_1.StructureType) {
             const components = [];
             for (const c of ityp.getComponents()) {
                 if (c.name === as) {
-                    components.push(c);
+                    components.push(Object.assign(Object.assign({}, c), { suffix: suffix, asInclude: c.asInclude }));
                     continue;
                 }
                 components.push({

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

@@ -19,11 +19,12 @@ class MethodImplementation {
         if (methodDefinition === undefined) {
             throw new Error("Method definition \"" + methodName + "\" not found");
         }
+        const start = node.getFirstToken().getStart();
         if (methodDefinition.isStatic() === false) {
-            scope.push(_scope_type_1.ScopeType.MethodInstance, methodName, node.getFirstToken().getStart(), filename);
+            scope.push(_scope_type_1.ScopeType.MethodInstance, methodName, start, filename);
             scope.addList(classDefinition.getAttributes().getInstance());
         }
-        scope.push(_scope_type_1.ScopeType.Method, methodName, node.getFirstToken().getStart(), filename);
+        scope.push(_scope_type_1.ScopeType.Method, methodName, start, filename);
         scope.addReference(methodToken, methodDefinition, _reference_1.ReferenceType.MethodImplementationReference, filename);
         scope.addList(methodDefinition.getParameters().getAll());
         for (const i of helper.findInterfaces(classDefinition)) {

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

@@ -13,7 +13,7 @@ const method_parameters_1 = require("../expressions/method_parameters");
 class Raise {
     runSyntax(node, scope, filename) {
         // todo
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const helper = new _object_oriented_1.ObjectOriented(scope);
         let method;
         const classTok = (_a = node.findDirectExpression(Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
@@ -72,7 +72,13 @@ class Raise {
             new message_source_1.MessageSource().runSyntax(s, scope, filename);
         }
         const id = (_d = node.findExpressionAfterToken("ID")) === null || _d === void 0 ? void 0 : _d.concatTokens();
-        const number = (_e = node.findDirectExpression(Expressions.MessageNumber)) === null || _e === void 0 ? void 0 : _e.concatTokens();
+        let number = (_e = node.findDirectExpression(Expressions.MessageNumber)) === null || _e === void 0 ? void 0 : _e.concatTokens();
+        if (number === undefined) {
+            const num = (_f = node.findExpressionAfterToken("NUMBER")) === null || _f === void 0 ? void 0 : _f.concatTokens();
+            if (num === null || num === void 0 ? void 0 : num.startsWith("'")) {
+                number = num.substring(1, num.length - 1).toUpperCase();
+            }
+        }
         if ((id === null || id === void 0 ? void 0 : id.startsWith("'")) && number) {
             const messageClass = id.substring(1, id.length - 1).toUpperCase();
             scope.getMSAGReferences().addUsing(filename, node.getFirstToken(), messageClass, number);

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

@@ -58,29 +58,19 @@ class ReadTable {
                 rowType = new basic_1.DataReference(rowType);
             }
             const inline = target.findFirstExpression(Expressions.InlineData);
+            const fst = target.findDirectExpression(Expressions.FSTarget);
+            const t = target.findFirstExpression(Expressions.Target);
             if (inline) {
                 new inline_data_1.InlineData().runSyntax(inline, scope, filename, rowType);
-                return;
             }
-            const fst = target.findDirectExpression(Expressions.FSTarget);
-            if (fst) {
+            else if (fst) {
                 new fstarget_1.FSTarget().runSyntax(fst, scope, filename, rowType);
-                return;
             }
-            /*
-                  const inlinefs = target.findFirstExpression(Expressions.InlineFS);
-                  if (inlinefs) {
-                    new InlineFS().runSyntax(inlinefs, scope, filename, sourceType);
-                    return;
-                  }
-            */
-            const t = target.findFirstExpression(Expressions.Target);
-            if (t) {
+            else if (t) {
                 const targetType = new target_1.Target().runSyntax(t, scope, filename);
                 if (new _type_utils_1.TypeUtils(scope).isAssignable(rowType, targetType) === false) {
                     throw new Error("Incompatible types");
                 }
-                return;
             }
         }
         if (target === undefined && concat.includes(" TRANSPORTING NO FIELDS ") === false) {
@@ -89,6 +79,25 @@ class ReadTable {
                 throw new Error("READ TABLE, define INTO or TRANSPORTING NO FIELDS");
             }
         }
+        const transporting = node.findDirectExpression(Expressions.TransportingFields);
+        if (transporting
+            && !(rowType instanceof basic_1.VoidType)
+            && !(rowType instanceof basic_1.UnknownType)
+            && !(rowType instanceof basic_1.AnyType)) {
+            if (!(rowType instanceof basic_1.StructureType)) {
+                throw new Error("READ TABLE, source not structured");
+            }
+            for (const t of (transporting === null || transporting === void 0 ? void 0 : transporting.findDirectExpressions(Expressions.FieldSub)) || []) {
+                const field = t.concatTokens();
+                if (field.includes("-")) {
+                    // todo
+                    continue;
+                }
+                if (rowType.getComponentByName(field) === undefined) {
+                    throw new Error("READ TABLE, field " + field + " not found in source");
+                }
+            }
+        }
     }
 }
 exports.ReadTable = ReadTable;

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

@@ -11,6 +11,7 @@ const method_param_1 = require("../5_syntax/expressions/method_param");
 const _object_oriented_1 = require("../5_syntax/_object_oriented");
 const _reference_1 = require("../5_syntax/_reference");
 const identifier_1 = require("../1_lexer/tokens/identifier");
+const _scope_type_1 = require("../5_syntax/_scope_type");
 // todo:
 // this.exceptions = [];
 // also consider RAISING vs EXCEPTIONS
@@ -28,7 +29,11 @@ class MethodParameters {
         this.preferred = undefined;
         this.exceptions = [];
         this.filename = filename;
-        this.parse(node, scope, filename);
+        // need the scope for LIKE typing inside method parameters
+        const parentName = scope.getName();
+        scope.push(_scope_type_1.ScopeType.MethodDefinition, "method definition", node.getStart(), filename);
+        this.parse(node, scope, filename, parentName);
+        scope.pop(node.getEnd());
     }
     getFilename() {
         return this.filename;
@@ -103,7 +108,7 @@ class MethodParameters {
         return this.defaults[parameter.toUpperCase()];
     }
     ///////////////////
-    parse(node, scope, filename) {
+    parse(node, scope, filename, parentName) {
         var _a, _b;
         const handler = node.findFirstExpression(Expressions.EventHandler);
         if (handler) {
@@ -163,9 +168,9 @@ class MethodParameters {
         if (returning) {
             this.returning = new method_def_returning_1.MethodDefReturning().runSyntax(returning, scope, this.filename, ["returning" /* IdentifierMeta.MethodReturning */]);
         }
-        this.workaroundRAP(node, scope, filename);
+        this.workaroundRAP(node, scope, filename, parentName);
     }
-    workaroundRAP(node, scope, filename) {
+    workaroundRAP(node, _scope, filename, parentName) {
         const resultName = node.findExpressionAfterToken("RESULT");
         const isRap = node.findExpressionAfterToken("IMPORTING");
         if (isRap) {
@@ -190,7 +195,7 @@ class MethodParameters {
             this.importing.push(new _typed_identifier_1.TypedIdentifier(token, filename, new basic_1.VoidType("RapMethodParameter"), ["exporting" /* IdentifierMeta.MethodExporting */]));
         }
         // its some kind of magic
-        if (scope.getName().toUpperCase() === "CL_ABAP_BEHAVIOR_SAVER") {
+        if (parentName.toUpperCase() === "CL_ABAP_BEHAVIOR_SAVER") {
             const tempChanging = this.changing.map(c => new _typed_identifier_1.TypedIdentifier(c.getToken(), filename, new basic_1.VoidType("RapMethodParameter"), c.getMeta()));
             while (this.changing.length > 0) {
                 this.changing.shift();
@@ -217,7 +222,9 @@ class MethodParameters {
             else if (meta.includes("importing" /* IdentifierMeta.MethodImporting */)) {
                 extraMeta.push("read_only" /* IdentifierMeta.ReadOnly */);
             }
-            target.push(new method_param_1.MethodParam().runSyntax(p, scope, this.filename, [...meta, ...extraMeta]));
+            const id = new method_param_1.MethodParam().runSyntax(p, scope, this.filename, [...meta, ...extraMeta]);
+            scope.addIdentifier(id);
+            target.push(id);
             if (opt.getLastToken().getStr().toUpperCase() === "OPTIONAL") {
                 const name = target[target.length - 1].getName().toUpperCase();
                 this.optional.push(name);

package/build/src/lsp/_lookup.js

@@ -55,7 +55,7 @@ class LSPLookup {
             const hover = "Type Definition, " + cursor.token.getStr() + "\n\n" + this.dumpType(type);
             return { hover, definition: found, definitionId: type, scope: bottomScope };
         }
-        const method = this.findMethodDefinition(cursor, bottomScope);
+        const method = this.findMethodDefinition(cursor, bottomScope.getParent());
         if (method !== undefined && method.getStart().equals(cursor.token.getStart())) {
             const found = _lsp_utils_1.LSPUtils.identiferToLocation(method);
             const hover = "Method Definition \"" + method.getName() + "\"";
@@ -272,6 +272,9 @@ class LSPLookup {
     }
     static findMethodDefinition(found, scope) {
         var _a, _b, _c, _d;
+        if (scope === undefined) {
+            return undefined;
+        }
         if (scope.getIdentifier().stype !== _scope_type_1.ScopeType.ClassDefinition
             || !(found.snode.get() instanceof Statements.MethodDef)) {
             return undefined;

package/build/src/msag_references.js

@@ -7,6 +7,9 @@ class MSAGReferences {
         this.filenameIndex = {};
     }
     addUsing(filename, token, messageClass, number) {
+        if (number.length !== 3) {
+            return;
+        }
         if (this.filenameIndex[filename] === undefined) {
             this.filenameIndex[filename] = [];
         }

package/build/src/objects/message_class.js

@@ -13,6 +13,7 @@ class MessageClass extends _abstract_object_1.AbstractObject {
         return "MSAG";
     }
     getDescription() {
+        this.parseXML();
         // todo
         return undefined;
     }
@@ -32,6 +33,7 @@ class MessageClass extends _abstract_object_1.AbstractObject {
         return msg ? msg : [];
     }
     getByNumber(num) {
+        this.parseXML();
         // todo, optimize performance,
         for (const message of this.getMessages()) {
             if (message.getNumber() === num) {

package/build/src/registry.js

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

package/build/src/rules/function_module_recommendations.js

@@ -30,6 +30,7 @@ class FunctionModuleRecommendationsConf extends _basic_rule_config_1.BasicRuleCo
             { name: "POPUP_TO_CONFIRM_STEP", replace: "use POPUP_TO_CONFIRM" },
             { name: "POPUP_TO_DECIDE", replace: "use POPUP_TO_CONFIRM" },
             { name: "POPUP_TO_GET_VALUE", replace: "use POPUP_GET_VALUES" },
+            { name: "QF05_RANDOM_INTEGER", replace: "use CL_ABAP_RANDOM_INT" },
             { name: "REUSE_ALV_GRID_DISPLAY", replace: "use CL_SALV_TABLE=>FACTORY or CL_GUI_ALV_GRID" },
             { name: "ROUND", replace: "use built in function: round()" },
             { name: "SAPGUI_PROGRESS_INDICATOR", replace: "use CL_PROGRESS_INDICATOR" },

package/build/src/rules/message_exists.js

@@ -2,17 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageExistsRule = exports.MessageExistsConf = void 0;
 const Expressions = require("../abap/2_statements/expressions");
+const Statements = require("../abap/2_statements/statements");
 const issue_1 = require("../issue");
-const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const ddic_1 = require("../ddic");
 const _irule_1 = require("./_irule");
+const nodes_1 = require("../abap/nodes");
+const _abap_object_1 = require("../objects/_abap_object");
+const syntax_1 = require("../abap/5_syntax/syntax");
 class MessageExistsConf extends _basic_rule_config_1.BasicRuleConfig {
+    constructor() {
+        super(...arguments);
+        this.checkPlaceholders = true;
+    }
 }
 exports.MessageExistsConf = MessageExistsConf;
-class MessageExistsRule extends _abap_rule_1.ABAPRule {
+class MessageExistsRule {
     constructor() {
-        super(...arguments);
         this.conf = new MessageExistsConf();
     }
     getMetadata() {
@@ -29,58 +35,116 @@ class MessageExistsRule extends _abap_rule_1.ABAPRule {
     setConfig(conf) {
         this.conf = conf;
     }
-    runParsed(file) {
+    initialize(reg) {
+        this.msagReferences = reg.getMSAGReferences();
+        this.reg = reg;
+        // the SyntaxLogic builds the references
+        for (const obj of reg.getObjects()) {
+            if (obj instanceof _abap_object_1.ABAPObject) {
+                new syntax_1.SyntaxLogic(reg, obj).run();
+            }
+        }
+        return this;
+    }
+    run(obj) {
         const issues = [];
-        const struc = file.getStructure();
-        if (struc === undefined) {
-            return [];
+        if (obj instanceof _abap_object_1.ABAPObject) {
+            for (const file of obj.getABAPFiles()) {
+                const struc = file.getStructure();
+                if (struc === undefined) {
+                    return [];
+                }
+                issues.push(...this.checkReportStatement(file));
+                issues.push(...this.checkSource(file));
+            }
         }
-        const expressions = struc.findAllExpressionsMulti([Expressions.MessageClass, Expressions.MessageSource]);
-        for (const node of expressions) {
-            if (node.get() instanceof Expressions.MessageClass) {
-                const token = node.getFirstToken();
-                const name = token.getStr();
-                if (this.reg.getObject("MSAG", name) === undefined
-                    && new ddic_1.DDIC(this.reg).inErrorNamespace(name) === true) {
-                    const message = "Message class \"" + name + "\" not found";
-                    const issue = issue_1.Issue.atToken(file, token, message, this.getMetadata().key, this.conf.severity);
+        return issues;
+    }
+    ////////////////////////////////
+    checkReportStatement(file) {
+        const issues = [];
+        for (const statement of file.getStatements()) {
+            if (!(statement.get() instanceof Statements.Report)) {
+                continue;
+            }
+            const expression = statement.findFirstExpression(Expressions.MessageClass);
+            if (expression) {
+                const issue = this.checkClass(expression, file);
+                if (issue) {
                     issues.push(issue);
                 }
             }
         }
-        for (const node of expressions) {
-            if (node.get() instanceof Expressions.MessageSource) {
-                const clas = node.findFirstExpression(Expressions.MessageClass);
-                if (clas === undefined) {
-                    // todo, handle case where message class is defined on header level instead of in the statement
-                    continue;
-                }
-                const token = clas.getFirstToken();
-                const name = token.getStr();
-                const msag = this.reg.getObject("MSAG", name);
-                if (msag === undefined) {
-                    if (new ddic_1.DDIC(this.reg).inErrorNamespace(name) === true) {
-                        const message = "Message class \"" + token.getStr() + "\" not found";
-                        const issue = issue_1.Issue.atToken(file, token, message, this.getMetadata().key, this.conf.severity);
-                        issues.push(issue);
+        return issues;
+    }
+    checkClass(node, file) {
+        const token = node.getFirstToken();
+        const name = token.getStr();
+        if (this.reg.getObject("MSAG", name) === undefined
+            && new ddic_1.DDIC(this.reg).inErrorNamespace(name) === true) {
+            const message = "Message class \"" + name + "\" not found";
+            return issue_1.Issue.atToken(file, token, message, this.getMetadata().key, this.conf.severity);
+        }
+        return undefined;
+    }
+    checkSource(file) {
+        const issues = [];
+        const references = this.msagReferences.listByFilename(file.getFilename());
+        for (const statement of file.getStatements()) {
+            if (statement.get() instanceof Statements.Raise || statement.get() instanceof Statements.Message) {
+                for (const ref of references) {
+                    // always max one message reference per statement? chained statements?
+                    if (ref.token.getStart().isBetween(statement.getStart(), statement.getEnd())) {
+                        const msag = this.reg.getObject("MSAG", ref.messageClass);
+                        if (msag === undefined) {
+                            if (new ddic_1.DDIC(this.reg).inErrorNamespace(ref.messageClass) === true) {
+                                const message = "Message class \"" + ref.token.getStr() + "\" not found";
+                                issues.push(issue_1.Issue.atToken(file, ref.token, message, this.getMetadata().key, this.conf.severity));
+                            }
+                            continue;
+                        }
+                        const text = msag.getByNumber(ref.number);
+                        if (text === undefined) {
+                            const message = "Message number \"" + ref.number + "\" not found in class \"" + ref.messageClass + "\"";
+                            issues.push(issue_1.Issue.atToken(file, ref.token, message, this.getMetadata().key, this.conf.severity));
+                            continue;
+                        }
+                        if (this.getConfig().checkPlaceholders === true) {
+                            const count = this.countWith(statement);
+                            const textCount = text.getPlaceholderCount();
+                            if (count !== textCount) {
+                                const message = `Message ${ref.number}, expected ${textCount} WITH parameters`;
+                                issues.push(issue_1.Issue.atToken(file, ref.token, message, this.getMetadata().key, this.conf.severity));
+                            }
+                        }
                     }
-                    continue;
                 }
-                const typeNumber = node.findFirstExpression(Expressions.MessageTypeAndNumber);
-                if (typeNumber === undefined) {
-                    continue;
+            }
+        }
+        return issues;
+    }
+    countWith(statement) {
+        const raiseWith = statement.findDirectExpression(Expressions.RaiseWith);
+        if (raiseWith) {
+            return raiseWith.getChildren().length - 1;
+        }
+        let count = 0;
+        let afterWith = false;
+        for (const expression of statement.getChildren()) {
+            if (expression instanceof nodes_1.TokenNode && expression.concatTokens().toUpperCase() === "WITH") {
+                afterWith = true;
+                continue;
+            }
+            if (afterWith === true) {
+                if (expression instanceof nodes_1.ExpressionNode) {
+                    count++;
                 }
-                const numberToken = typeNumber.getFirstToken();
-                const num = numberToken.getStr().substr(1);
-                if (msag.getByNumber(num) === undefined) {
-                    const message = "Message number \"" + num + "\" not found in class \"" + name + "\"";
-                    const issue = issue_1.Issue.atToken(file, numberToken, message, this.getMetadata().key, this.conf.severity);
-                    issues.push(issue);
+                else {
+                    break;
                 }
             }
         }
-        // todo, check number of placeholders in message vs code matches
-        return issues;
+        return count;
     }
 }
 exports.MessageExistsRule = MessageExistsRule;

package/build/src/rules/parser_missing_space.js

@@ -49,15 +49,21 @@ This rule makes sure the spaces are consistently required across the language.`,
         return issues;
     }
     missingSpace(statement) {
-        const found = statement.findAllExpressionsMulti([Expressions.CondSub, Expressions.SQLCond,
-            Expressions.ValueBodyLine, Expressions.NewObject, Expressions.Cond,
-            Expressions.ComponentCond, Expressions.ComponentCondSub, Expressions.MethodCallParam], true);
+        const found = statement.findAllExpressionsMulti([
+            Expressions.CondSub, Expressions.SQLCond, Expressions.ValueBodyLine,
+            Expressions.NewObject, Expressions.Cond, Expressions.ComponentCond,
+            Expressions.Source,
+            Expressions.ComponentCondSub, Expressions.MethodCallParam
+        ], true);
         let pos = undefined;
         for (const f of found) {
             const type = f.get();
             if (type instanceof Expressions.Cond) {
                 pos = this.checkCond(f);
             }
+            else if (type instanceof Expressions.Source) {
+                pos = this.checkSource(f);
+            }
             else if (type instanceof Expressions.CondSub) {
                 pos = this.checkCondSub(f);
             }
@@ -210,6 +216,20 @@ This rule makes sure the spaces are consistently required across the language.`,
         }
         return undefined;
     }
+    checkSource(cond) {
+        const children = cond.getAllTokens();
+        if (children.length < 2) {
+            return undefined;
+        }
+        const nextLast = children[children.length - 2];
+        const last = children[children.length - 1];
+        if (nextLast.getStr().startsWith("'")
+            && nextLast.getRow() === last.getRow()
+            && nextLast.getEnd().getCol() === last.getStart().getCol()) {
+            return last.getEnd();
+        }
+        return undefined;
+    }
     checkMethodCallParam(call) {
         const children = call.getChildren();
         {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.102.14",
+    "version": "2.102.16",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -53,7 +53,7 @@
         "@microsoft/api-extractor": "^7.36.3",
         "@types/chai": "^4.3.5",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^20.4.5",
+        "@types/node": "^20.4.8",
         "chai": "^4.3.7",
         "eslint": "^8.46.0",
         "mocha": "^10.2.0",