@abaplint/core 2.83.25 → 2.84.3

package/build/abaplint.d.ts

@@ -1155,6 +1155,7 @@ export declare class CurrentScope {
     getType(): ScopeType;
     push(stype: ScopeType, sname: string, start: Position, filename: string): void;
     isOO(): boolean;
+    isTypePool(): boolean;
     setAllowHeaderUse(name: string): void;
     isAllowHeaderUse(name: string): boolean;
     pop(end: Position): SpaghettiScope;
@@ -1286,7 +1287,7 @@ declare class DataEnd implements IStatement {
 
 declare class DataReference extends AbstractType {
     private readonly type;
-    constructor(type: AbstractType, name?: string);
+    constructor(type: AbstractType, qualifiedName?: string);
     toText(level: number): string;
     getType(): AbstractType;
     toABAP(): string;
@@ -1307,7 +1308,7 @@ declare class DDIC {
     private readonly reg;
     constructor(reg: IRegistry);
     isException(def: InfoClassDefinition | undefined, _obj: ABAPObject): boolean;
-    lookupBuiltinType(name: string, length?: number, decimals?: number): AbstractType | undefined;
+    lookupBuiltinType(name: string, length?: number, decimals?: number, qualifiedName?: string): AbstractType | undefined;
     inErrorNamespace(name: string | undefined): boolean;
     lookupObject(name: string): ILookupResult;
     lookupNoVoid(name: string): ILookupResult | undefined;
@@ -1846,6 +1847,7 @@ declare namespace Expressions {
         LoopGroupBy,
         MacroName,
         MessageClass_2 as MessageClass,
+        MessageNumber,
         MessageSource,
         MessageTypeAndNumber,
         MethodCallBody,
@@ -1853,11 +1855,11 @@ declare namespace Expressions {
         MethodCallParam,
         MethodCall,
         MethodDefChanging,
+        MethodDefExceptions,
         MethodDefExporting,
         MethodDefImporting,
         MethodDefRaising,
         MethodDefReturning,
-        MethodDefExceptions,
         MethodName,
         MethodParamName,
         MethodParamOptional,
@@ -3553,6 +3555,10 @@ declare class MessageClass_2 extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class MessageNumber extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class MessageSource extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -4526,6 +4532,7 @@ export declare enum ScopeType {
     Dummy = "_dummy",
     Global = "_global",
     Program = "_program",
+    TypePool = "_type_pool",
     FunctionGroup = "_function_group",
     ClassDefinition = "class_definition",
     Interface = "interface",

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

@@ -94,6 +94,7 @@ __exportStar(require("./let"), exports);
 __exportStar(require("./loop_group_by"), exports);
 __exportStar(require("./macro_name"), exports);
 __exportStar(require("./message_class"), exports);
+__exportStar(require("./message_number"), exports);
 __exportStar(require("./message_source"), exports);
 __exportStar(require("./message_type_and_number"), exports);
 __exportStar(require("./method_call_body"), exports);
@@ -101,11 +102,11 @@ __exportStar(require("./method_call_chain"), exports);
 __exportStar(require("./method_call_param"), exports);
 __exportStar(require("./method_call"), exports);
 __exportStar(require("./method_def_changing"), exports);
+__exportStar(require("./method_def_exceptions"), exports);
 __exportStar(require("./method_def_exporting"), exports);
 __exportStar(require("./method_def_importing"), exports);
 __exportStar(require("./method_def_raising"), exports);
 __exportStar(require("./method_def_returning"), exports);
-__exportStar(require("./method_def_exceptions"), exports);
 __exportStar(require("./method_name"), exports);
 __exportStar(require("./method_param_name"), exports);
 __exportStar(require("./method_param_optional"), exports);

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageNumber = void 0;
+const combi_1 = require("../combi");
+class MessageNumber extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.regex)(/^\d\d\d$/i);
+    }
+}
+exports.MessageNumber = MessageNumber;
+//# sourceMappingURL=message_number.js.map

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

@@ -8,7 +8,7 @@ class MessageSource extends combi_1.Expression {
     getRunnable() {
         const msgid = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeft), _1.MessageClass, (0, combi_1.tok)(tokens_1.ParenRightW));
         const simple = (0, combi_1.seq)(_1.MessageTypeAndNumber, (0, combi_1.opt)(msgid));
-        const mess1 = (0, combi_1.seq)("ID", _1.Source, "TYPE", _1.Source, "NUMBER", _1.Source);
+        const mess1 = (0, combi_1.seq)("ID", _1.Source, "TYPE", _1.Source, "NUMBER", (0, combi_1.altPrio)(_1.MessageNumber, _1.Source));
         return (0, combi_1.altPrio)(simple, mess1);
     }
 }

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

@@ -7,7 +7,7 @@ const expressions_1 = require("../expressions");
 class Raise {
     getMatcher() {
         const mess = (0, combi_1.seq)("MESSAGE", expressions_1.MessageSource, (0, combi_1.opt)(expressions_1.RaiseWith));
-        const messid = (0, combi_1.seq)("MESSAGE ID", expressions_1.Source, "NUMBER", expressions_1.Source, (0, combi_1.optPrio)(expressions_1.RaiseWith));
+        const messid = (0, combi_1.seq)("MESSAGE ID", expressions_1.Source, "NUMBER", (0, combi_1.altPrio)(expressions_1.MessageNumber, expressions_1.Source), (0, combi_1.optPrio)(expressions_1.RaiseWith));
         const exporting = (0, combi_1.seq)("EXPORTING", expressions_1.ParameterListS);
         const from = (0, combi_1.seq)("TYPE", expressions_1.ClassName, (0, combi_1.opt)((0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v750, (0, combi_1.alt)(mess, messid)), (0, combi_1.ver)(version_1.Version.v752, "USING MESSAGE"))), (0, combi_1.optPrio)(exporting));
         const clas = (0, combi_1.seq)((0, combi_1.optPrio)("RESUMABLE"), "EXCEPTION", (0, combi_1.altPrio)(from, (0, combi_1.ver)(version_1.Version.v752, expressions_1.Source), expressions_1.SimpleSource2));

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

@@ -206,6 +206,7 @@ class CurrentScope {
         return undefined;
     }
     findTypePoolConstant(name) {
+        var _a;
         if (name === undefined || name.includes("_") === undefined) {
             return undefined;
         }
@@ -214,12 +215,12 @@ class CurrentScope {
         if (typePool === undefined) {
             return undefined;
         }
-        const spag = new syntax_1.SyntaxLogic(this.reg, typePool).run().spaghetti.getFirstChild();
+        const spag = (_a = new syntax_1.SyntaxLogic(this.reg, typePool).run().spaghetti.getFirstChild()) === null || _a === void 0 ? void 0 : _a.getFirstChild();
         const found = spag === null || spag === void 0 ? void 0 : spag.findVariable(name);
         return found;
     }
     findTypePoolType(name) {
-        var _a;
+        var _a, _b;
         if (name.includes("_") === undefined) {
             return undefined;
         }
@@ -228,8 +229,8 @@ class CurrentScope {
         if (typePool === undefined) {
             return undefined;
         }
-        const spag = new syntax_1.SyntaxLogic(this.reg, typePool).run().spaghetti.getFirstChild();
-        const found = (_a = spag === null || spag === void 0 ? void 0 : spag.findType(name)) === null || _a === void 0 ? void 0 : _a.getType();
+        const spag = (_a = new syntax_1.SyntaxLogic(this.reg, typePool).run().spaghetti.getFirstChild()) === null || _a === void 0 ? void 0 : _a.getFirstChild();
+        const found = (_b = spag === null || spag === void 0 ? void 0 : spag.findType(name)) === null || _b === void 0 ? void 0 : _b.getType();
         return found;
     }
     /** Lookup interface in local and global scope */
@@ -321,6 +322,10 @@ class CurrentScope {
         }
         return false;
     }
+    isTypePool() {
+        var _a;
+        return ((_a = this.current) === null || _a === void 0 ? void 0 : _a.getIdentifier().filename.endsWith(".type.abap")) === true || false;
+    }
     setAllowHeaderUse(name) {
         // workaround for SELECT FOR ALL ENTRIES
         this.allowHeaderUse = name;

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

@@ -7,6 +7,7 @@ var ScopeType;
     ScopeType["Dummy"] = "_dummy";
     ScopeType["Global"] = "_global";
     ScopeType["Program"] = "_program";
+    ScopeType["TypePool"] = "_type_pool";
     ScopeType["FunctionGroup"] = "_function_group";
     ScopeType["ClassDefinition"] = "class_definition";
     ScopeType["Interface"] = "interface";

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

@@ -140,7 +140,7 @@ class BasicTypes {
         }
         return type;
     }
-    resolveTypeName(typeName, length, decimals) {
+    resolveTypeName(typeName, length, decimals, name) {
         if (typeName === undefined) {
             return undefined;
         }
@@ -149,7 +149,7 @@ class BasicTypes {
             return chain;
         }
         const chainText = typeName.concatTokens().toUpperCase();
-        const f = this.scope.getDDIC().lookupBuiltinType(chainText, length, decimals);
+        const f = this.scope.getDDIC().lookupBuiltinType(chainText, length, decimals, name);
         if (f !== undefined) {
             return f;
         }
@@ -196,7 +196,7 @@ class BasicTypes {
         if (nameExpr.countTokens() > 1) { // workaround for names with dashes
             name = new identifier_1.Identifier(name.getStart(), nameExpr.concatTokens());
         }
-        const found = this.parseType(node);
+        const found = this.parseType(node, this.scope.isTypePool() ? name.getStr() : undefined);
         if (found) {
             return new _typed_identifier_1.TypedIdentifier(name, this.filename, found);
         }
@@ -344,7 +344,7 @@ class BasicTypes {
             if (type === undefined) {
                 return new Types.UnknownType("Type error, could not resolve \"" + name + "\", parseType");
             }
-            return new Types.DataReference(type);
+            return new Types.DataReference(type, name);
         }
         else if (text === "TYPE STANDARD TABLE"
             || text === "TYPE SORTED TABLE"
@@ -392,7 +392,7 @@ class BasicTypes {
             found = this.resolveTypeRef(typename);
         }
         else if (text.startsWith("TYPE")) {
-            found = this.resolveTypeName(typename, this.findLength(node), this.findDecimals(node));
+            found = this.resolveTypeName(typename, this.findLength(node), this.findDecimals(node), name);
             const concat = node.concatTokens().toUpperCase();
             if (found && concat.includes(" OCCURS ")) {
                 found = new Types.TableType(found, { withHeader: concat.includes("WITH HEADER LINE") }, name);

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

@@ -297,6 +297,12 @@ class SyntaxLogic {
                 this.scope.push(stype, this.object.getName(), new position_1.Position(1, 1), main.getFilename());
             }
         }
+        else if (this.object instanceof objects_1.TypePool) {
+            const main = this.object.getMainABAPFile();
+            if (main !== undefined) {
+                this.scope.push(_scope_type_1.ScopeType.TypePool, this.object.getName(), new position_1.Position(1, 1), main.getFilename());
+            }
+        }
         for (const file of traversal) {
             this.currentFile = file;
             const structure = this.currentFile.getStructure();

package/build/src/abap/types/basic/data_reference_type.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataReference = void 0;
 const _abstract_type_1 = require("./_abstract_type");
 class DataReference extends _abstract_type_1.AbstractType {
-    constructor(type, name) {
-        super(name);
+    constructor(type, qualifiedName) {
+        super(qualifiedName);
         this.type = type;
     }
     toText(level) {

package/build/src/ddic.js

@@ -43,7 +43,7 @@ class DDIC {
         const isException = ((superClassName === null || superClassName === void 0 ? void 0 : superClassName.match(/^.?cx_.*$/i)) || (superClassName === null || superClassName === void 0 ? void 0 : superClassName.match(/^\/.+\/cx_.*$/i))) ? true : false;
         return isException;
     }
-    lookupBuiltinType(name, length, decimals) {
+    lookupBuiltinType(name, length, decimals, qualifiedName) {
         switch (name) {
             case "STRING":
                 return new Types.StringType(name);
@@ -54,31 +54,31 @@ class DDIC {
             case "T":
                 return new Types.TimeType(name);
             case "XSEQUENCE":
-                return new Types.XSequenceType();
+                return new Types.XSequenceType(qualifiedName);
             case "CLIKE":
-                return new Types.CLikeType();
+                return new Types.CLikeType(qualifiedName);
             case "DECFLOAT":
-                return new Types.DecFloatType();
+                return new Types.DecFloatType(qualifiedName);
             case "ANY":
-                return new Types.AnyType();
+                return new Types.AnyType(qualifiedName);
             case "SIMPLE":
-                return new Types.SimpleType();
+                return new Types.SimpleType(qualifiedName);
             case "%_C_POINTER":
-                return new Types.HexType(8);
+                return new Types.HexType(8, qualifiedName);
             case "TABLE":
                 return new Types.TableType(new Types.AnyType(), { withHeader: false });
             case "DATA":
-                return new Types.AnyType();
+                return new Types.AnyType(qualifiedName);
             case "NUMERIC":
-                return new Types.NumericGenericType();
+                return new Types.NumericGenericType(qualifiedName);
             case "UTCLONG": // todo, take version into account
-                return new Types.UTCLongType();
+                return new Types.UTCLongType(qualifiedName);
             case "DECFLOAT16":
-                return new Types.DecFloat16Type();
+                return new Types.DecFloat16Type(qualifiedName);
             case "DECFLOAT34":
-                return new Types.DecFloat34Type();
+                return new Types.DecFloat34Type(qualifiedName);
             case "CSEQUENCE":
-                return new Types.CSequenceType();
+                return new Types.CSequenceType(qualifiedName);
             case "I":
             case "INT8": // todo, take version into account
                 return new Types.IntegerType(name);
@@ -86,34 +86,34 @@ class DDIC {
                 return new Types.FloatType(name);
             case "P":
                 if (length && decimals) {
-                    return new Types.PackedType(length, decimals);
+                    return new Types.PackedType(length, decimals, qualifiedName);
                 }
                 else if (length) {
-                    return new Types.PackedType(length, 0);
+                    return new Types.PackedType(length, 0, qualifiedName);
                 }
                 else {
-                    return new Types.PackedType(1, 0);
+                    return new Types.PackedType(1, 0, qualifiedName);
                 }
             case "C":
                 if (length) {
-                    return new Types.CharacterType(length);
+                    return new Types.CharacterType(length, qualifiedName);
                 }
                 else {
-                    return new Types.CharacterType(1);
+                    return new Types.CharacterType(1, qualifiedName);
                 }
             case "X":
                 if (length) {
-                    return new Types.HexType(length);
+                    return new Types.HexType(length, qualifiedName);
                 }
                 else {
-                    return new Types.HexType(1);
+                    return new Types.HexType(1, qualifiedName);
                 }
             case "N":
                 if (length) {
-                    return new Types.NumericType(length);
+                    return new Types.NumericType(length, qualifiedName);
                 }
                 else {
-                    return new Types.NumericType(1);
+                    return new Types.NumericType(1, qualifiedName);
                 }
         }
         return undefined;

package/build/src/registry.js

@@ -68,7 +68,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.83.25";
+        return "2.84.3";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/downport.js

@@ -365,10 +365,14 @@ ${indentation}`);
         }
         const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
         const name = ((_c = inlineData.findFirstExpression(Expressions.TargetField)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "error";
-        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getStart(), `TYPES: BEGIN OF ${uniqueName},
+        let fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getStart(), `TYPES: BEGIN OF ${uniqueName},
 ${fieldDefinitions}${indentation}      END OF ${uniqueName}.
 ${indentation}DATA ${name} TYPE STANDARD TABLE OF ${uniqueName} WITH DEFAULT KEY.
 ${indentation}`);
+        if (fieldDefinitions === "") {
+            fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getStart(), `DATA ${name} TYPE STANDARD TABLE OF ${tableName} WITH DEFAULT KEY.
+${indentation}`);
+        }
         const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, inlineData.getFirstToken().getStart(), inlineData.getLastToken().getEnd(), name);
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         return issue_1.Issue.atToken(lowFile, inlineData.getFirstToken(), "Outline SELECT @DATA", this.getMetadata().key, this.conf.severity, fix);
@@ -513,7 +517,14 @@ ${indentation}`);
             }
             const sources = node.findDirectExpressions(Expressions.Source);
             const id = sources[0].concatTokens();
-            const number = sources[1].concatTokens();
+            const numberExpression = node.findExpressionAfterToken("NUMBER");
+            if (numberExpression === undefined) {
+                throw "downport raiseException, could not find number";
+            }
+            let number = numberExpression.concatTokens();
+            if (numberExpression.get() instanceof Expressions.MessageNumber) {
+                number = "'" + number + "'";
+            }
             const className = ((_a = node.findDirectExpression(Expressions.ClassName)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "ERROR";
             const uniqueName1 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const uniqueName2 = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);

package/build/src/rules/index.js

@@ -100,6 +100,7 @@ __exportStar(require("./no_yoda_conditions"), exports);
 __exportStar(require("./object_naming"), exports);
 __exportStar(require("./obsolete_statement"), exports);
 __exportStar(require("./omit_parameter_name"), exports);
+__exportStar(require("./omit_preceding_zeros"), exports);
 __exportStar(require("./omit_receiving"), exports);
 __exportStar(require("./parser_702_chaining"), exports);
 __exportStar(require("./parser_error"), exports);

package/build/src/rules/method_length.js

@@ -38,13 +38,13 @@ class MethodLength {
             tags: [_irule_1.RuleTag.Styleguide, _irule_1.RuleTag.SingleFile],
         };
     }
-    getDescription(issueType, actual) {
+    getDescription(issueType, actual, type) {
         switch (issueType) {
             case IssueType.EmptyMethod: {
-                return "Empty method/form";
+                return "Empty " + type;
             }
             case IssueType.MaxStatements: {
-                return "Reduce method/form length to max " + this.conf.statements + " statements, currently " + actual;
+                return "Reduce " + type + " length to max " + this.conf.statements + " statements, currently " + actual;
             }
             default: {
                 return "";
@@ -62,15 +62,16 @@ class MethodLength {
     }
     run(obj) {
         const methodStats = method_length_stats_1.MethodLengthStats.run(obj);
-        const methodIssues = this.check(methodStats);
+        const methodIssues = this.check(methodStats, "METHOD");
         let formIssues = [];
         if (this.conf.checkForms) {
             const formStats = form_length_stats_1.FormLengthStats.run(obj);
-            formIssues = this.check(formStats);
+            formIssues = this.check(formStats, "FORM");
         }
         return methodIssues.concat(formIssues);
     }
-    check(stats) {
+    // ***********************
+    check(stats, type) {
         const issues = [];
         for (const s of stats) {
             if ((this.conf.ignoreTestClasses === true)
@@ -78,12 +79,12 @@ class MethodLength {
                 continue;
             }
             if (s.count === 0 && this.conf.errorWhenEmpty === true) {
-                const issue = issue_1.Issue.atPosition(s.file, s.pos, this.getDescription(IssueType.EmptyMethod, "0"), this.getMetadata().key, this.conf.severity);
+                const issue = issue_1.Issue.atPosition(s.file, s.pos, this.getDescription(IssueType.EmptyMethod, "0", type), this.getMetadata().key, this.conf.severity);
                 issues.push(issue);
                 continue;
             }
             if (s.count > this.conf.statements) {
-                const message = this.getDescription(IssueType.MaxStatements, s.count.toString());
+                const message = this.getDescription(IssueType.MaxStatements, s.count.toString(), type);
                 const issue = issue_1.Issue.atPosition(s.file, s.pos, message, this.getMetadata().key, this.conf.severity);
                 issues.push(issue);
             }

package/build/src/rules/omit_preceding_zeros.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OmitPrecedingZeros = exports.OmitPrecedingZerosConf = void 0;
+const _abap_rule_1 = require("./_abap_rule");
+const _basic_rule_config_1 = require("./_basic_rule_config");
+const issue_1 = require("../issue");
+const Expressions = require("../abap/2_statements/expressions");
+const _irule_1 = require("./_irule");
+class OmitPrecedingZerosConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.OmitPrecedingZerosConf = OmitPrecedingZerosConf;
+class OmitPrecedingZeros extends _abap_rule_1.ABAPRule {
+    constructor() {
+        super(...arguments);
+        this.conf = new OmitPrecedingZerosConf();
+    }
+    getMetadata() {
+        return {
+            key: "omit_preceding_zeros",
+            title: "Omit preceding zeros",
+            shortDescription: `Omit preceding zeros from integer constants`,
+            tags: [_irule_1.RuleTag.SingleFile],
+            badExample: `int = -001.`,
+            goodExample: `int = -1.`,
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    runParsed(file) {
+        var _a;
+        const issues = [];
+        for (const i of ((_a = file.getStructure()) === null || _a === void 0 ? void 0 : _a.findAllExpressions(Expressions.Integer)) || []) {
+            const token = i.getLastToken();
+            const str = token.getStr();
+            if (str.length > 1 && str.startsWith("0")) {
+                const message = "Omit preceding zeros";
+                const issue = issue_1.Issue.atToken(file, token, message, this.getMetadata().key, this.getConfig().severity);
+                issues.push(issue);
+            }
+        }
+        return issues;
+    }
+}
+exports.OmitPrecedingZeros = OmitPrecedingZeros;
+//# sourceMappingURL=omit_preceding_zeros.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.83.25",
+    "version": "2.84.3",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,7 +48,7 @@
         "@microsoft/api-extractor": "^7.19.4",
         "@types/chai": "^4.3.0",
         "@types/mocha": "^9.0.0",
-        "@types/node": "^17.0.9",
+        "@types/node": "^17.0.10",
         "chai": "^4.3.4",
         "eslint": "^8.7.0",
         "mocha": "^9.1.4",