@abaplint/core 2.90.0 → 2.90.1

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/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/registry.js

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

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.90.0",
+    "version": "2.90.1",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,7 +50,7 @@
         "@types/mocha": "^9.1.1",
         "@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",