@abaplint/core 2.89.14 → 2.90.1

package/build/abaplint.d.ts

@@ -1786,6 +1786,7 @@ declare namespace Expressions {
         Color,
         CompareOperator,
         Compare,
+        TestSeamName,
         ComponentChainSimple,
         ComponentChain,
         ComponentCompareSimple,
@@ -5674,6 +5675,10 @@ declare class TestSeam_2 implements IStatement {
     getMatcher(): IStatementRunnable;
 }
 
+declare class TestSeamName extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class TextElement extends Expression {
     getRunnable(): IStatementRunnable;
 }

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

@@ -33,6 +33,7 @@ __exportStar(require("./class_name"), exports);
 __exportStar(require("./color"), exports);
 __exportStar(require("./compare_operator"), exports);
 __exportStar(require("./compare"), exports);
+__exportStar(require("./test_seam_name"), exports);
 __exportStar(require("./component_chain_simple"), exports);
 __exportStar(require("./component_chain"), exports);
 __exportStar(require("./component_compare_simple"), exports);

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

@@ -8,7 +8,9 @@ const version_1 = require("../../../version");
 class SQLCompare extends combi_1.Expression {
     getRunnable() {
         const val = new _1.SQLSource();
-        const list = (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenLeft), (0, combi_1.tok)(tokens_1.WParenLeftW)), val, (0, combi_1.starPrio)((0, combi_1.seq)(",", val)), ")");
+        const listOld = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeft), val, (0, combi_1.starPrio)((0, combi_1.seq)(",", val)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenRight), (0, combi_1.tok)(tokens_1.ParenRightW), (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const listNew = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), val, (0, combi_1.starPrio)((0, combi_1.seq)(",", val)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRight), (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const list = (0, combi_1.alt)(listOld, (0, combi_1.ver)(version_1.Version.v740sp02, listNew)); // version is a guess, https://github.com/abaplint/abaplint/issues/2530
         const subSelect = (0, combi_1.seq)("(", _1.Select, ")");
         const inn = (0, combi_1.seq)("IN", (0, combi_1.altPrio)(_1.SQLSource, list, subSelect));
         const between = (0, combi_1.seq)("BETWEEN", _1.SQLSource, "AND", _1.SQLSource);

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestSeamName = void 0;
+const combi_1 = require("../combi");
+const tokens_1 = require("../../1_lexer/tokens");
+class TestSeamName extends combi_1.Expression {
+    getRunnable() {
+        const ret = (0, combi_1.seq)((0, combi_1.regex)(/^[\w%\$\*]+$/), (0, combi_1.starPrio)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.Dash), (0, combi_1.regex)(/^[\w%\$\*]+$/))));
+        return ret;
+    }
+}
+exports.TestSeamName = TestSeamName;
+//# sourceMappingURL=test_seam_name.js.map

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

@@ -17,7 +17,7 @@ class InsertInternal {
         const fromTo = (0, combi_1.seq)((0, combi_1.opt)(from), (0, combi_1.opt)(to));
         const foo = (0, combi_1.per)(into, ref, index, assigning);
         const lines = (0, combi_1.seq)("LINES OF", target, (0, combi_1.opt)(fromTo));
-        const src = (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source), expressions_1.SimpleSource1);
+        const src = (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source), expressions_1.SimpleSource4);
         const tab = (0, combi_1.seq)("TABLE", expressions_1.Source);
         const ret = (0, combi_1.seq)("INSERT", (0, combi_1.altPrio)(tab, (0, combi_1.seq)((0, combi_1.altPrio)(initial, lines, src), foo)));
         return ret;

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

@@ -5,7 +5,7 @@ const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
 class TestInjection {
     getMatcher() {
-        return (0, combi_1.seq)("TEST-INJECTION", expressions_1.Field);
+        return (0, combi_1.seq)("TEST-INJECTION", expressions_1.TestSeamName);
     }
 }
 exports.TestInjection = TestInjection;

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

@@ -5,7 +5,7 @@ const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
 class TestSeam {
     getMatcher() {
-        return (0, combi_1.seq)("TEST-SEAM", expressions_1.Field);
+        return (0, combi_1.seq)("TEST-SEAM", expressions_1.TestSeamName);
     }
 }
 exports.TestSeam = TestSeam;

package/build/src/registry.js

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

package/build/src/rules/avoid_use.js

@@ -20,6 +20,8 @@ class AvoidUseConf extends _basic_rule_config_1.BasicRuleConfig {
         this.defaultKey = true;
         /** Detects BREAK and BREAK-POINTS */
         this.break = true;
+        /** Detects TEST SEAMS */
+        this.testSeams = true;
         /** Detects DESCRIBE TABLE LINES, use lines() instead */
         this.describeLines = true;
     }
@@ -81,7 +83,7 @@ TEST-SEAMS: https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md
             else if (this.conf.statics && statement instanceof Statements.StaticEnd) {
                 isStaticsBlock = false;
             }
-            else if (this.conf.statics && statement instanceof Statements.TestSeam) {
+            else if (this.conf.testSeams && statement instanceof Statements.TestSeam) {
                 message = "TEST-SEAM";
             }
             else if (this.conf.statics && statement instanceof Statements.Static && isStaticsBlock === false) {

package/build/src/rules/double_space.js

@@ -114,7 +114,9 @@ class DoubleSpace extends _abap_rule_1.ABAPRule {
                 const issueStartPos = new position_1.Position(prev.getRow(), prev.getCol() + 2);
                 const issueEndPos = new position_1.Position(t.getRow(), t.getCol());
                 const fix = edit_helper_1.EditHelper.deleteRange(file, issueStartPos, issueEndPos);
-                issues.push(issue_1.Issue.atRange(file, issueStartPos, issueEndPos, this.getMessage(), this.getMetadata().key, this.conf.severity, fix));
+                if (this.pragmaInRange(s.getPragmas(), issueStartPos, issueEndPos) === false) {
+                    issues.push(issue_1.Issue.atRange(file, issueStartPos, issueEndPos, this.getMessage(), this.getMetadata().key, this.conf.severity, fix));
+                }
             }
             if (this.getConfig().endParen === true
                 && prev.getRow() === t.getRow()
@@ -124,12 +126,23 @@ class DoubleSpace extends _abap_rule_1.ABAPRule {
                 const issueStartPos = new position_1.Position(prev.getEnd().getRow(), prev.getEnd().getCol() + 1);
                 const issueEndPos = new position_1.Position(t.getRow(), t.getCol());
                 const fix = edit_helper_1.EditHelper.deleteRange(file, issueStartPos, issueEndPos);
-                issues.push(issue_1.Issue.atRange(file, issueStartPos, issueEndPos, this.getMessage(), this.getMetadata().key, this.conf.severity, fix));
+                if (this.pragmaInRange(s.getPragmas(), issueStartPos, issueEndPos) === false) {
+                    issues.push(issue_1.Issue.atRange(file, issueStartPos, issueEndPos, this.getMessage(), this.getMetadata().key, this.conf.severity, fix));
+                }
             }
             prev = t;
         }
         return issues;
     }
+    pragmaInRange(pragmas, start, end) {
+        let ret = false;
+        for (const p of pragmas) {
+            if (p.getStart().isBetween(start, end)) {
+                ret = true;
+            }
+        }
+        return ret;
+    }
     checkKeywords(s, file) {
         const issues = [];
         let prev = undefined;

package/build/src/rules/downport.js

@@ -1143,8 +1143,12 @@ ${indentation}    output = ${topTarget}.`;
             if (letNode) {
                 body += this.outlineLet(letNode, indentation, highSyntax, lowFile);
             }
+            let firstName = "";
             for (const init of reduceBody.findDirectExpressions(Expressions.InlineFieldDefinition)) {
                 name = init.getFirstToken().getStr();
+                if (firstName === "") {
+                    firstName = name;
+                }
                 const s = (_a = init.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
                 const t = (_b = init.findFirstExpression(Expressions.TypeName)) === null || _b === void 0 ? void 0 : _b.concatTokens();
                 if (s) {
@@ -1180,7 +1184,7 @@ ${indentation}    output = ${topTarget}.`;
                 }
             }
             body += indentation + end;
-            body += indentation + `${uniqueName} = ${name}.\n`;
+            body += indentation + `${uniqueName} = ${firstName}.\n`;
             const abap = `DATA ${uniqueName} TYPE ${type}.\n` +
                 body +
                 indentation;

package/build/src/rules/index.js

@@ -31,6 +31,7 @@ __exportStar(require("./check_comments"), exports);
 __exportStar(require("./check_ddic"), exports);
 __exportStar(require("./check_include"), exports);
 __exportStar(require("./check_subrc"), exports);
+__exportStar(require("./no_external_form_calls"), exports);
 __exportStar(require("./check_syntax"), exports);
 __exportStar(require("./classic_exceptions_overlap"), exports);
 __exportStar(require("./check_text_elements"), exports);

package/build/src/rules/no_external_form_calls.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NoExternalFormCalls = exports.NoExternalFormCallsConf = void 0;
+const Statements = require("../abap/2_statements/statements");
+const Expressions = require("../abap/2_statements/expressions");
+const _abap_rule_1 = require("./_abap_rule");
+const _basic_rule_config_1 = require("./_basic_rule_config");
+const issue_1 = require("../issue");
+const _irule_1 = require("./_irule");
+class NoExternalFormCallsConf extends _basic_rule_config_1.BasicRuleConfig {
+}
+exports.NoExternalFormCallsConf = NoExternalFormCallsConf;
+class NoExternalFormCalls extends _abap_rule_1.ABAPRule {
+    constructor() {
+        super(...arguments);
+        this.conf = new NoExternalFormCallsConf();
+    }
+    getMetadata() {
+        return {
+            key: "no_external_form_calls",
+            title: "No external FORM calls",
+            shortDescription: `Detect external form calls`,
+            badExample: `PERFORM foo IN PROGRAM bar.
+
+PERFORM foo(bar).`,
+            tags: [_irule_1.RuleTag.SingleFile],
+        };
+    }
+    getConfig() {
+        return this.conf;
+    }
+    setConfig(conf) {
+        this.conf = conf;
+    }
+    runParsed(file) {
+        const issues = [];
+        const stru = file.getStructure();
+        if (stru === undefined) {
+            return issues; // parser error
+        }
+        for (const p of stru.findAllStatements(Statements.Perform)) {
+            if (p.findDirectExpression(Expressions.IncludeName) || p.findDirectTokenByText("PROGRAM")) {
+                const message = "No external FORM calls";
+                issues.push(issue_1.Issue.atStatement(file, p, message, this.getMetadata().key, this.conf.severity));
+            }
+        }
+        return issues;
+    }
+}
+exports.NoExternalFormCalls = NoExternalFormCalls;
+//# sourceMappingURL=no_external_form_calls.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.89.14",
+    "version": "2.90.1",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -45,12 +45,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.23.0",
+        "@microsoft/api-extractor": "^7.23.1",
         "@types/chai": "^4.3.1",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^17.0.30",
+        "@types/node": "^17.0.31",
         "chai": "^4.3.6",
-        "eslint": "^8.14.0",
+        "eslint": "^8.15.0",
         "mocha": "^10.0.0",
         "c8": "^7.11.2",
         "source-map-support": "^0.5.21",