@abaplint/core 2.93.43 → 2.93.45

package/build/src/pretty_printer/indent.js

@@ -75,6 +75,7 @@ class Indent {
                 || type instanceof Statements.Initialization
                 || type instanceof Statements.AtUserCommand
                 || type instanceof Statements.TopOfPage
+                || type instanceof Statements.Get
                 || type instanceof Statements.EndOfSelection
                 || type instanceof Statements.LoadOfProgram) {
                 indent = init;
@@ -156,6 +157,7 @@ class Indent {
                         statement.concatTokens().toUpperCase().includes("BEGIN OF BLOCK") ||
                         statement.concatTokens().toUpperCase().includes("BEGIN OF LINE")))
                 || type instanceof Statements.StartOfSelection
+                || type instanceof Statements.Get
                 || type instanceof Statements.AtSelectionScreen
                 || type instanceof Statements.AtLineSelection
                 || type instanceof Statements.LoadOfProgram

package/build/src/registry.js

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

package/build/src/rules/abapdoc.js

@@ -75,8 +75,8 @@ Plus class and interface definitions.`,
             if (method.isRedefinition === true) {
                 continue;
             }
-            const previousRow = method.identifier.getStart().getRow() - 2;
-            if (!(rows[previousRow].trim().substring(0, 2) === "\"!")) {
+            const previousRowText = this.getPreviousRow(rows, method.identifier.getStart());
+            if (!(previousRowText.substring(0, 2) === "\"!")) {
                 const message = "Missing ABAP Doc for method " + method.identifier.getToken().getStr();
                 const issue = issue_1.Issue.atIdentifier(method.identifier, message, this.getMetadata().key, this.conf.severity);
                 issues.push(issue);
@@ -84,6 +84,16 @@ Plus class and interface definitions.`,
         }
         return issues;
     }
+    getPreviousRow(rows, pos) {
+        const previousRow = pos.getRow() - 2;
+        const text = rows[previousRow].trim().toUpperCase();
+        if (text === "METHODS" || text === "CLASS-METHODS") {
+            const previousRow = pos.getRow() - 3;
+            const text = rows[previousRow].trim().toUpperCase();
+            return text;
+        }
+        return text;
+    }
 }
 exports.Abapdoc = Abapdoc;
 //# sourceMappingURL=abapdoc.js.map

package/build/src/rules/main_file_contents.js

@@ -22,7 +22,11 @@ class MainFileContents {
             key: "main_file_contents",
             title: "Main file contents",
             shortDescription: `Checks related to report declarations.`,
-            extendedInformation: `Does not run if the target version is Cloud`,
+            extendedInformation: `Does not run if the target version is Cloud
+
+* PROGs must begin with "REPORT <name>." or "PROGRAM <name>.
+* TYPEs must begin with "TYPE-POOL <name>."
+`,
         };
     }
     getDescription(details) {
@@ -72,7 +76,26 @@ class MainFileContents {
             }
             else if (name.getFirstToken().getStr().toUpperCase() !== obj.getName()) {
                 const token = name.getFirstToken();
-                const issue = issue_1.Issue.atToken(main, token, this.getDescription("REPORT or PROGRAM name should match filename"), this.getMetadata().key, this.conf.severity);
+                const issue = issue_1.Issue.atToken(main, token, this.getDescription("REPORT or PROGRAM name must match filename"), this.getMetadata().key, this.conf.severity);
+                return [issue];
+            }
+        }
+        else if (obj instanceof Objects.TypePool) {
+            let count = 0;
+            let first = main.getStatements()[count];
+            while (first !== undefined && first.get() instanceof _statement_1.Comment) {
+                count = count + 1;
+                first = main.getStatements()[count];
+            }
+            if (first === undefined || !(first.get() instanceof Statements.TypePool)) {
+                const position = new position_1.Position(1, 1);
+                const issue = issue_1.Issue.atPosition(main, position, this.getDescription("Type pool must begin with TYPE-POOL"), this.getMetadata().key, this.conf.severity);
+                return [issue];
+            }
+            const name = first.getChildren()[3];
+            if (name.getFirstToken().getStr().toUpperCase() !== obj.getName()) {
+                const token = name.getFirstToken();
+                const issue = issue_1.Issue.atToken(main, token, this.getDescription("TYPE-POOL name must match filename"), this.getMetadata().key, this.conf.severity);
                 return [issue];
             }
         }

package/build/src/rules/omit_preceding_zeros.js

@@ -6,6 +6,7 @@ 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");
+const statements_1 = require("../abap/2_statements/statements");
 class OmitPrecedingZerosConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.OmitPrecedingZerosConf = OmitPrecedingZerosConf;
@@ -31,15 +32,19 @@ class OmitPrecedingZeros extends _abap_rule_1.ABAPRule {
         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);
+        for (const s of file.getStatements()) {
+            for (const i of s.findAllExpressions(Expressions.Integer)) {
+                const token = i.getLastToken();
+                const str = token.getStr();
+                if (str.length > 1 && str.startsWith("0")) {
+                    if (s.get() instanceof statements_1.CallScreen || s.get() instanceof statements_1.SetScreen) {
+                        continue;
+                    }
+                    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;

package/build/src/rules/unnecessary_pragma.js

@@ -117,6 +117,7 @@ ENDIF.`,
             && !(statement.get() instanceof Statements.Data)
             && !(statement.get() instanceof Statements.DataEnd)
             && !(statement.get() instanceof Statements.Type)
+            && !(statement.get() instanceof Statements.Form)
             && !(statement.get() instanceof Statements.TypeEnd)
             && !(statement.get() instanceof Statements.Constant)
             && !(statement.get() instanceof Statements.ConstantEnd)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.93.43",
+    "version": "2.93.45",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -46,7 +46,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.33.2",
+        "@microsoft/api-extractor": "^7.33.4",
         "@types/chai": "^4.3.3",
         "@types/mocha": "^10.0.0",
         "@types/node": "^18.11.0",