@abaplint/core 2.102.67 → 2.102.69

package/build/src/rules/expand_macros.js

@@ -7,7 +7,7 @@ const _basic_rule_config_1 = require("./_basic_rule_config");
 const _irule_1 = require("./_irule");
 const edit_helper_1 = require("../edit_helper");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
-const position_1 = require("../position");
+const virtual_position_1 = require("../virtual_position");
 class ExpandMacrosConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.ExpandMacrosConf = ExpandMacrosConf;
@@ -51,7 +51,7 @@ _hello.`,
             let replace = "";
             for (let j = i + 1; j < statements.length; j++) {
                 const sub = statements[j];
-                if (sub.getFirstToken().getStart() instanceof position_1.VirtualPosition) {
+                if (sub.getFirstToken().getStart() instanceof virtual_position_1.VirtualPosition) {
                     if (sub.get() instanceof _statement_1.MacroCall) {
                         continue;
                     }

package/build/src/rules/indentation.js

@@ -11,6 +11,7 @@ const Expressions = require("../abap/2_statements/expressions");
 const _irule_1 = require("./_irule");
 const ddic_1 = require("../ddic");
 const position_1 = require("../position");
+const virtual_position_1 = require("../virtual_position");
 const edit_helper_1 = require("../edit_helper");
 class IndentationConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
@@ -72,7 +73,7 @@ class Indentation extends _abap_rule_1.ABAPRule {
         const ret = [];
         for (const statement of file.getStatements()) {
             const position = statement.getFirstToken().getStart();
-            if (position instanceof position_1.VirtualPosition) {
+            if (position instanceof virtual_position_1.VirtualPosition) {
                 continue;
             }
             const indent = expected.shift();

package/build/src/rules/keyword_case.js

@@ -12,7 +12,7 @@ const Statements = require("../abap/2_statements/statements");
 const Expressions = require("../abap/2_statements/expressions");
 const _irule_1 = require("./_irule");
 const ddic_1 = require("../ddic");
-const position_1 = require("../position");
+const virtual_position_1 = require("../virtual_position");
 const edit_helper_1 = require("../edit_helper");
 var KeywordCaseStyle;
 (function (KeywordCaseStyle) {
@@ -48,7 +48,7 @@ class Skip {
         if (get instanceof _statement_1.Unknown
             || get instanceof _statement_1.MacroContent
             || get instanceof _statement_1.MacroCall
-            || statement.getFirstToken().getStart() instanceof position_1.VirtualPosition
+            || statement.getFirstToken().getStart() instanceof virtual_position_1.VirtualPosition
             || get instanceof _statement_1.Comment) {
             return true;
         }

package/build/src/rules/line_break_multiple_parameters.js

@@ -7,7 +7,7 @@ const _basic_rule_config_1 = require("./_basic_rule_config");
 const Expressions = require("../abap/2_statements/expressions");
 const _irule_1 = require("./_irule");
 const edit_helper_1 = require("../edit_helper");
-const position_1 = require("../position");
+const virtual_position_1 = require("../virtual_position");
 class LineBreakMultipleParametersConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -45,7 +45,7 @@ class LineBreakMultipleParameters extends _abap_rule_1.ABAPRule {
         }
         for (const s of file.getStatements()) {
             for (const e of s.findAllExpressions(Expressions.ParameterListS)) {
-                if (s.getFirstToken().getStart() instanceof position_1.VirtualPosition) {
+                if (s.getFirstToken().getStart() instanceof virtual_position_1.VirtualPosition) {
                     continue; // skip macro content
                 }
                 const parameters = e.findDirectExpressions(Expressions.ParameterS);

package/build/src/rules/many_parentheses.js

@@ -65,9 +65,15 @@ ENDIF.
             }
             if (cond[0].getChildren().length === 1) {
                 const message = "Too many parentheses, simple";
-                const fixText = sub.getChildren()[1].concatTokens();
-                const fix = edit_helper_1.EditHelper.replaceRange(file, sub.getFirstToken().getStart(), sub.getLastToken().getEnd(), fixText);
-                const issue = issue_1.Issue.atToken(file, sub.getFirstToken(), message, this.getMetadata().key, this.conf.severity, fix);
+                const children = sub.getChildren();
+                let startToken = sub.getFirstToken();
+                let fixText = sub.getChildren()[1].concatTokens();
+                if (startToken.getStr().toUpperCase() === "NOT") {
+                    startToken = children[1].getFirstToken();
+                    fixText = sub.getChildren()[2].concatTokens();
+                }
+                const fix = edit_helper_1.EditHelper.replaceRange(file, startToken.getStart(), sub.getLastToken().getEnd(), fixText);
+                const issue = issue_1.Issue.atToken(file, startToken, message, this.getMetadata().key, this.conf.severity, fix);
                 issues.push(issue);
             }
         }

package/build/src/rules/max_one_statement.js

@@ -7,7 +7,7 @@ const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const edit_helper_1 = require("../edit_helper");
 const _irule_1 = require("./_irule");
-const position_1 = require("../position");
+const virtual_position_1 = require("../virtual_position");
 class MaxOneStatementConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.MaxOneStatementConf = MaxOneStatementConf;
@@ -53,7 +53,7 @@ https://docs.abapopenchecks.org/checks/11/`,
                 continue;
             }
             const pos = statement.getStart();
-            if (pos instanceof position_1.VirtualPosition) {
+            if (pos instanceof virtual_position_1.VirtualPosition) {
                 continue;
             }
             const row = pos.getRow();

package/build/src/rules/unused_variables.js

@@ -76,6 +76,14 @@ Errors found in INCLUDES are reported for the main program.`,
             tags: [_irule_1.RuleTag.Quickfix],
             pragma: "##NEEDED",
             pseudoComment: "EC NEEDED",
+            badExample: `DATA: BEGIN OF blah1,
+      test  TYPE string,
+      test2 TYPE string,
+    END OF blah1.`,
+            goodExample: `DATA: BEGIN OF blah2 ##NEEDED,
+      test  TYPE string,
+      test2 TYPE string,
+    END OF blah2.`,
         };
     }
     getConfig() {

package/build/src/virtual_position.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VirtualPosition = void 0;
+const position_1 = require("./position");
+/** used for macro calls */
+class VirtualPosition extends position_1.Position {
+    constructor(virtual, row, col) {
+        super(virtual.getRow(), virtual.getCol());
+        this.vrow = row;
+        this.vcol = col;
+    }
+    equals(p) {
+        if (!(p instanceof VirtualPosition)) {
+            return false;
+        }
+        const casted = p;
+        return super.equals(this) && this.vrow === casted.vrow && this.vcol === casted.vcol;
+    }
+}
+exports.VirtualPosition = VirtualPosition;
+//# sourceMappingURL=virtual_position.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.102.67",
+    "version": "2.102.69",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,12 +50,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.38.1",
+        "@microsoft/api-extractor": "^7.38.2",
         "@types/chai": "^4.3.9",
         "@types/mocha": "^10.0.3",
         "@types/node": "^20.8.10",
         "chai": "^4.3.10",
-        "eslint": "^8.52.0",
+        "eslint": "^8.53.0",
         "mocha": "^10.2.0",
         "c8": "^8.0.1",
         "source-map-support": "^0.5.21",