@abaplint/core 2.102.66 → 2.102.68

package/build/abaplint.d.ts

@@ -1001,6 +1001,7 @@ declare class ClassDefinition_3 extends Identifier implements IClassDefinition {
     isAbstract(): boolean;
     isSharedMemory(): boolean;
     private findSuper;
+    private checkMethodsFromSuperClasses;
     private findFriends;
     private addReference;
     private parse;
@@ -6314,8 +6315,8 @@ declare class TokenNodeRegex extends TokenNode {
 declare namespace Tokens {
     export {
         At_3 as At,
-        WAt,
         AtW,
+        WAt,
         WAtW,
         BracketLeft,
         WBracketLeft,

package/build/src/abap/1_lexer/lexer.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Lexer = void 0;
 const position_1 = require("../../position");
+const virtual_position_1 = require("../../virtual_position");
 const tokens_1 = require("./tokens");
 class Buffer {
     constructor() {
@@ -127,7 +128,7 @@ class Lexer {
             }
             let pos = new position_1.Position(row, col - s.length);
             if (this.virtual) {
-                pos = new position_1.VirtualPosition(this.virtual, pos.getRow(), pos.getCol());
+                pos = new virtual_position_1.VirtualPosition(this.virtual, pos.getRow(), pos.getCol());
             }
             let tok = undefined;
             if (this.m === this.ModeComment) {

package/build/src/abap/1_lexer/tokens/{_token.js → abstract_token.js}

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Token = void 0;
+exports.AbstractToken = void 0;
 const position_1 = require("../../../position");
-class Token {
-    [Symbol.for("debug.description")]() {
-        return `${this.constructor.name} ${this.str}`;
-    }
+class AbstractToken {
     constructor(start, str) {
         this.start = start;
         this.str = str;
     }
+    // special function, for debugging purposes, see https://github.com/abaplint/abaplint/pull/3137
+    [Symbol.for("debug.description")]() {
+        return `${this.constructor.name} ${this.str}`;
+    }
     getStr() {
         return this.str;
     }
@@ -26,5 +27,5 @@ class Token {
         return new position_1.Position(this.start.getRow(), this.start.getCol() + this.str.length);
     }
 }
-exports.Token = Token;
-//# sourceMappingURL=_token.js.map
+exports.AbstractToken = AbstractToken;
+//# sourceMappingURL=abstract_token.js.map

package/build/src/abap/1_lexer/tokens/at.js

@@ -1,29 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WAtW = exports.AtW = exports.WAt = exports.At = void 0;
-const _token_1 = require("./_token");
-class At extends _token_1.Token {
+exports.At = void 0;
+const abstract_token_1 = require("./abstract_token");
+class At extends abstract_token_1.AbstractToken {
     static railroad() {
         return "@";
     }
 }
 exports.At = At;
-class WAt extends _token_1.Token {
-    static railroad() {
-        return " @";
-    }
-}
-exports.WAt = WAt;
-class AtW extends _token_1.Token {
-    static railroad() {
-        return "@ ";
-    }
-}
-exports.AtW = AtW;
-class WAtW extends _token_1.Token {
-    static railroad() {
-        return " @ ";
-    }
-}
-exports.WAtW = WAtW;
 //# sourceMappingURL=at.js.map

package/build/src/abap/1_lexer/tokens/atw.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AtW = void 0;
+const abstract_token_1 = require("./abstract_token");
+class AtW extends abstract_token_1.AbstractToken {
+    static railroad() {
+        return "@ ";
+    }
+}
+exports.AtW = AtW;
+//# sourceMappingURL=atw.js.map

package/build/src/abap/1_lexer/tokens/bracket_left.js

@@ -1,26 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WBracketLeftW = exports.BracketLeftW = exports.WBracketLeft = exports.BracketLeft = void 0;
-const _token_1 = require("./_token");
-class BracketLeft extends _token_1.Token {
+const abstract_token_1 = require("./abstract_token");
+class BracketLeft extends abstract_token_1.AbstractToken {
     static railroad() {
         return "[";
     }
 }
 exports.BracketLeft = BracketLeft;
-class WBracketLeft extends _token_1.Token {
+class WBracketLeft extends abstract_token_1.AbstractToken {
     static railroad() {
         return " [";
     }
 }
 exports.WBracketLeft = WBracketLeft;
-class BracketLeftW extends _token_1.Token {
+class BracketLeftW extends abstract_token_1.AbstractToken {
     static railroad() {
         return "[ ";
     }
 }
 exports.BracketLeftW = BracketLeftW;
-class WBracketLeftW extends _token_1.Token {
+class WBracketLeftW extends abstract_token_1.AbstractToken {
     static railroad() {
         return " [ ";
     }

package/build/src/abap/1_lexer/tokens/bracket_right.js

@@ -1,26 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WBracketRightW = exports.BracketRightW = exports.WBracketRight = exports.BracketRight = void 0;
-const _token_1 = require("./_token");
-class BracketRight extends _token_1.Token {
+const abstract_token_1 = require("./abstract_token");
+class BracketRight extends abstract_token_1.AbstractToken {
     static railroad() {
         return "]";
     }
 }
 exports.BracketRight = BracketRight;
-class WBracketRight extends _token_1.Token {
+class WBracketRight extends abstract_token_1.AbstractToken {
     static railroad() {
         return " ]";
     }
 }
 exports.WBracketRight = WBracketRight;
-class BracketRightW extends _token_1.Token {
+class BracketRightW extends abstract_token_1.AbstractToken {
     static railroad() {
         return "] ";
     }
 }
 exports.BracketRightW = BracketRightW;
-class WBracketRightW extends _token_1.Token {
+class WBracketRightW extends abstract_token_1.AbstractToken {
     static railroad() {
         return " ] ";
     }

package/build/src/abap/1_lexer/tokens/colon.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Colon = void 0;
-const _token_1 = require("./_token");
-class Colon extends _token_1.Token {
+const abstract_token_1 = require("./abstract_token");
+class Colon extends abstract_token_1.AbstractToken {
 }
 exports.Colon = Colon;
 //# sourceMappingURL=colon.js.map

package/build/src/abap/1_lexer/tokens/comment.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Comment = void 0;
-const _token_1 = require("./_token");
-class Comment extends _token_1.Token {
+const abstract_token_1 = require("./abstract_token");
+class Comment extends abstract_token_1.AbstractToken {
 }
 exports.Comment = Comment;
 //# sourceMappingURL=comment.js.map

package/build/src/abap/1_lexer/tokens/dash.js

@@ -1,26 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WDashW = exports.DashW = exports.WDash = exports.Dash = void 0;
-const _token_1 = require("./_token");
-class Dash extends _token_1.Token {
+const abstract_token_1 = require("./abstract_token");
+class Dash extends abstract_token_1.AbstractToken {
     static railroad() {
         return "-";
     }
 }
 exports.Dash = Dash;
-class WDash extends _token_1.Token {
+class WDash extends abstract_token_1.AbstractToken {
     static railroad() {
         return " -";
     }
 }
 exports.WDash = WDash;
-class DashW extends _token_1.Token {
+class DashW extends abstract_token_1.AbstractToken {
     static railroad() {
         return "- ";
     }
 }
 exports.DashW = DashW;
-class WDashW extends _token_1.Token {
+class WDashW extends abstract_token_1.AbstractToken {
     static railroad() {
         return " - ";
     }

package/build/src/abap/1_lexer/tokens/identifier.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Identifier = void 0;
-const _token_1 = require("./_token");
-class Identifier extends _token_1.Token {
+const abstract_token_1 = require("./abstract_token");
+class Identifier extends abstract_token_1.AbstractToken {
 }
 exports.Identifier = Identifier;
 //# sourceMappingURL=identifier.js.map

package/build/src/abap/1_lexer/tokens/index.js

@@ -15,6 +15,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./at"), exports);
+__exportStar(require("./atw"), exports);
+__exportStar(require("./wat"), exports);
+__exportStar(require("./watw"), exports);
 __exportStar(require("./bracket_left"), exports);
 __exportStar(require("./bracket_right"), exports);
 __exportStar(require("./colon"), exports);

package/build/src/abap/1_lexer/tokens/instance_arrow.js

@@ -1,26 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WInstanceArrowW = exports.InstanceArrowW = exports.WInstanceArrow = exports.InstanceArrow = void 0;
-const _token_1 = require("./_token");
-class InstanceArrow extends _token_1.Token {
+const abstract_token_1 = require("./abstract_token");
+class InstanceArrow extends abstract_token_1.AbstractToken {
     static railroad() {
         return "->";
     }
 }
 exports.InstanceArrow = InstanceArrow;
-class WInstanceArrow extends _token_1.Token {
+class WInstanceArrow extends abstract_token_1.AbstractToken {
     static railroad() {
         return " ->";
     }
 }
 exports.WInstanceArrow = WInstanceArrow;
-class InstanceArrowW extends _token_1.Token {
+class InstanceArrowW extends abstract_token_1.AbstractToken {
     static railroad() {
         return "-> ";
     }
 }
 exports.InstanceArrowW = InstanceArrowW;
-class WInstanceArrowW extends _token_1.Token {
+class WInstanceArrowW extends abstract_token_1.AbstractToken {
     static railroad() {
         return " -> ";
     }

package/build/src/abap/1_lexer/tokens/paren_left.js

@@ -1,26 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WParenLeftW = exports.ParenLeftW = exports.WParenLeft = exports.ParenLeft = void 0;
-const _token_1 = require("./_token");
-class ParenLeft extends _token_1.Token {
+const abstract_token_1 = require("./abstract_token");
+class ParenLeft extends abstract_token_1.AbstractToken {
     static railroad() {
         return "(";
     }
 }
 exports.ParenLeft = ParenLeft;
-class WParenLeft extends _token_1.Token {
+class WParenLeft extends abstract_token_1.AbstractToken {
     static railroad() {
         return " (";
     }
 }
 exports.WParenLeft = WParenLeft;
-class ParenLeftW extends _token_1.Token {
+class ParenLeftW extends abstract_token_1.AbstractToken {
     static railroad() {
         return "( ";
     }
 }
 exports.ParenLeftW = ParenLeftW;
-class WParenLeftW extends _token_1.Token {
+class WParenLeftW extends abstract_token_1.AbstractToken {
     static railroad() {
         return " ( ";
     }

package/build/src/abap/1_lexer/tokens/paren_right.js

@@ -1,26 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WParenRightW = exports.ParenRightW = exports.WParenRight = exports.ParenRight = void 0;
-const _token_1 = require("./_token");
-class ParenRight extends _token_1.Token {
+const abstract_token_1 = require("./abstract_token");
+class ParenRight extends abstract_token_1.AbstractToken {
     static railroad() {
         return ")";
     }
 }
 exports.ParenRight = ParenRight;
-class WParenRight extends _token_1.Token {
+class WParenRight extends abstract_token_1.AbstractToken {
     static railroad() {
         return " )";
     }
 }
 exports.WParenRight = WParenRight;
-class ParenRightW extends _token_1.Token {
+class ParenRightW extends abstract_token_1.AbstractToken {
     static railroad() {
         return ") ";
     }
 }
 exports.ParenRightW = ParenRightW;
-class WParenRightW extends _token_1.Token {
+class WParenRightW extends abstract_token_1.AbstractToken {
     static railroad() {
         return " ) ";
     }

package/build/src/abap/1_lexer/tokens/plus.js

@@ -1,26 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WPlusW = exports.PlusW = exports.WPlus = exports.Plus = void 0;
-const _token_1 = require("./_token");
-class Plus extends _token_1.Token {
+const abstract_token_1 = require("./abstract_token");
+class Plus extends abstract_token_1.AbstractToken {
     static railroad() {
         return "+";
     }
 }
 exports.Plus = Plus;
-class WPlus extends _token_1.Token {
+class WPlus extends abstract_token_1.AbstractToken {
     static railroad() {
         return " +";
     }
 }
 exports.WPlus = WPlus;
-class PlusW extends _token_1.Token {
+class PlusW extends abstract_token_1.AbstractToken {
     static railroad() {
         return "+ ";
     }
 }
 exports.PlusW = PlusW;
-class WPlusW extends _token_1.Token {
+class WPlusW extends abstract_token_1.AbstractToken {
     static railroad() {
         return " + ";
     }

package/build/src/abap/1_lexer/tokens/pragma.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Pragma = void 0;
-const _token_1 = require("./_token");
-class Pragma extends _token_1.Token {
+const abstract_token_1 = require("./abstract_token");
+class Pragma extends abstract_token_1.AbstractToken {
 }
 exports.Pragma = Pragma;
 //# sourceMappingURL=pragma.js.map

package/build/src/abap/1_lexer/tokens/punctuation.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Punctuation = void 0;
-const _token_1 = require("./_token");
-class Punctuation extends _token_1.Token {
+const abstract_token_1 = require("./abstract_token");
+class Punctuation extends abstract_token_1.AbstractToken {
 }
 exports.Punctuation = Punctuation;
 //# sourceMappingURL=punctuation.js.map

package/build/src/abap/1_lexer/tokens/static_arrow.js

@@ -1,26 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WStaticArrowW = exports.StaticArrowW = exports.WStaticArrow = exports.StaticArrow = void 0;
-const _token_1 = require("./_token");
-class StaticArrow extends _token_1.Token {
+const abstract_token_1 = require("./abstract_token");
+class StaticArrow extends abstract_token_1.AbstractToken {
     static railroad() {
         return "=>";
     }
 }
 exports.StaticArrow = StaticArrow;
-class WStaticArrow extends _token_1.Token {
+class WStaticArrow extends abstract_token_1.AbstractToken {
     static railroad() {
         return " =>";
     }
 }
 exports.WStaticArrow = WStaticArrow;
-class StaticArrowW extends _token_1.Token {
+class StaticArrowW extends abstract_token_1.AbstractToken {
     static railroad() {
         return "=> ";
     }
 }
 exports.StaticArrowW = StaticArrowW;
-class WStaticArrowW extends _token_1.Token {
+class WStaticArrowW extends abstract_token_1.AbstractToken {
     static railroad() {
         return " => ";
     }

package/build/src/abap/1_lexer/tokens/string.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StringTemplateMiddle = exports.StringTemplateEnd = exports.StringTemplateBegin = exports.StringTemplate = exports.StringToken = void 0;
-const _token_1 = require("./_token");
-class StringToken extends _token_1.Token {
+const abstract_token_1 = require("./abstract_token");
+class StringToken extends abstract_token_1.AbstractToken {
 }
 exports.StringToken = StringToken;
-class StringTemplate extends _token_1.Token {
+class StringTemplate extends abstract_token_1.AbstractToken {
 }
 exports.StringTemplate = StringTemplate;
-class StringTemplateBegin extends _token_1.Token {
+class StringTemplateBegin extends abstract_token_1.AbstractToken {
 }
 exports.StringTemplateBegin = StringTemplateBegin;
-class StringTemplateEnd extends _token_1.Token {
+class StringTemplateEnd extends abstract_token_1.AbstractToken {
 }
 exports.StringTemplateEnd = StringTemplateEnd;
-class StringTemplateMiddle extends _token_1.Token {
+class StringTemplateMiddle extends abstract_token_1.AbstractToken {
 }
 exports.StringTemplateMiddle = StringTemplateMiddle;
 //# sourceMappingURL=string.js.map

package/build/src/abap/1_lexer/tokens/wat.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WAt = void 0;
+const abstract_token_1 = require("./abstract_token");
+class WAt extends abstract_token_1.AbstractToken {
+    static railroad() {
+        return " @";
+    }
+}
+exports.WAt = WAt;
+//# sourceMappingURL=wat.js.map

package/build/src/abap/1_lexer/tokens/watw.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WAtW = void 0;
+const abstract_token_1 = require("./abstract_token");
+class WAtW extends abstract_token_1.AbstractToken {
+    static railroad() {
+        return " @ ";
+    }
+}
+exports.WAtW = WAtW;
+//# sourceMappingURL=watw.js.map

package/build/src/abap/2_statements/expand_macros.js

@@ -10,7 +10,7 @@ const token_node_1 = require("../nodes/token_node");
 const statement_parser_1 = require("./statement_parser");
 const memory_file_1 = require("../../files/memory_file");
 const lexer_1 = require("../1_lexer/lexer");
-const position_1 = require("../../position");
+const virtual_position_1 = require("../../virtual_position");
 class Macros {
     constructor(globalMacros) {
         this.macros = {};
@@ -149,8 +149,8 @@ class ExpandMacros {
             }
             // argh, macros is a nightmare
             let end = now.getStart();
-            if (end instanceof position_1.VirtualPosition) {
-                end = new position_1.VirtualPosition(end, end.vrow, end.vcol + now.getStr().length);
+            if (end instanceof virtual_position_1.VirtualPosition) {
+                end = new virtual_position_1.VirtualPosition(end, end.vrow, end.vcol + now.getStr().length);
             }
             else {
                 end = now.getEnd();

package/build/src/abap/5_syntax/expressions/reduce_body.js

@@ -25,7 +25,12 @@ class ReduceBody {
                 scope.push(_scope_type_1.ScopeType.Let, "LET", node.getFirstToken().getStart(), filename);
                 scoped = true;
             }
-            const found = new inline_field_definition_1.InlineFieldDefinition().runSyntax(i, scope, filename, targetType);
+            let foundType = targetType;
+            const source = i.findDirectExpression(Expressions.Source);
+            if (source) {
+                foundType = new source_1.Source().runSyntax(source, scope, filename, targetType);
+            }
+            const found = new inline_field_definition_1.InlineFieldDefinition().runSyntax(i, scope, filename, foundType);
             if (found && first === undefined) {
                 first = found;
             }

package/build/src/abap/5_syntax/expressions/string_template.js

@@ -17,7 +17,7 @@ class StringTemplate {
             }
             else if ((typeUtils.isCharLike(type) === false && typeUtils.isHexLike(type) === false)
                 || type instanceof basic_1.StructureType) {
-                throw new Error("Not character like, " + type.constructor.name);
+                throw new Error("String template, not character like, " + type.constructor.name);
             }
             const format = templateSource.findDirectExpression(Expressions.StringTemplateFormatting);
             const formatConcat = format === null || format === void 0 ? void 0 : format.concatTokens();

package/build/src/abap/types/class_definition.js

@@ -46,6 +46,8 @@ class ClassDefinition extends _identifier_1.Identifier {
         this.testing = concat.includes(" FOR TESTING");
         this.sharedMemory = concat.includes(" SHARED MEMORY ENABLED");
         this.abstract = (cdef === null || cdef === void 0 ? void 0 : cdef.findDirectTokenByText("ABSTRACT")) !== undefined;
+        // perform checks after everything has been initialized
+        this.checkMethodsFromSuperClasses(scope);
     }
     getFriends() {
         return this.friends;
@@ -98,6 +100,29 @@ class ClassDefinition extends _identifier_1.Identifier {
         const name = token === null || token === void 0 ? void 0 : token.getStr();
         return name;
     }
+    checkMethodsFromSuperClasses(scope) {
+        var _a;
+        let sup = this.getSuperClass();
+        const names = new Set();
+        while (sup !== undefined) {
+            const cdef = scope.findClassDefinition(sup);
+            for (const m of ((_a = cdef === null || cdef === void 0 ? void 0 : cdef.getMethodDefinitions()) === null || _a === void 0 ? void 0 : _a.getAll()) || []) {
+                if (m.getVisibility() === visibility_1.Visibility.Private) {
+                    continue;
+                }
+                else if (m.getName().toUpperCase() === "CONSTRUCTOR") {
+                    continue;
+                }
+                names.add(m.getName().toUpperCase());
+            }
+            sup = cdef === null || cdef === void 0 ? void 0 : cdef.getSuperClass();
+        }
+        for (const m of this.getMethodDefinitions().getAll()) {
+            if (names.has(m.getName().toUpperCase()) && m.isRedefinition() === false) {
+                throw new Error(`Method ${m.getName().toUpperCase()} already declared in superclass`);
+            }
+        }
+    }
     findFriends(def, filename, scope) {
         var _a;
         const result = [];

package/build/src/files/_abstract_file.js

@@ -9,10 +9,17 @@ class AbstractFile {
         return this.filename;
     }
     baseName() {
-        const first = this.getFilename().split("\\");
-        const base1 = first[first.length - 1];
-        const base2 = base1.split("/");
-        return base2[base2.length - 1];
+        let name = this.getFilename();
+        let index = name.lastIndexOf("\\");
+        if (index) {
+            index = index + 1;
+        }
+        name = name.substring(index);
+        index = name.lastIndexOf("/");
+        if (index) {
+            index = index + 1;
+        }
+        return name.substring(index);
     }
     getObjectType() {
         var _a;

package/build/src/index.js

@@ -39,8 +39,8 @@ const _current_scope_1 = require("./abap/5_syntax/_current_scope");
 Object.defineProperty(exports, "CurrentScope", { enumerable: true, get: function () { return _current_scope_1.CurrentScope; } });
 const Objects = require("./objects");
 exports.Objects = Objects;
-const _token_1 = require("./abap/1_lexer/tokens/_token");
-Object.defineProperty(exports, "Token", { enumerable: true, get: function () { return _token_1.Token; } });
+const abstract_token_1 = require("./abap/1_lexer/tokens/abstract_token");
+Object.defineProperty(exports, "Token", { enumerable: true, get: function () { return abstract_token_1.AbstractToken; } });
 const Statements = require("./abap/2_statements/statements");
 exports.Statements = Statements;
 const Expressions = require("./abap/2_statements/expressions");
@@ -59,7 +59,8 @@ const Tokens = require("./abap/1_lexer/tokens");
 exports.Tokens = Tokens;
 const position_1 = require("./position");
 Object.defineProperty(exports, "Position", { enumerable: true, get: function () { return position_1.Position; } });
-Object.defineProperty(exports, "VirtualPosition", { enumerable: true, get: function () { return position_1.VirtualPosition; } });
+const virtual_position_1 = require("./virtual_position");
+Object.defineProperty(exports, "VirtualPosition", { enumerable: true, get: function () { return virtual_position_1.VirtualPosition; } });
 const _abstract_file_1 = require("./files/_abstract_file");
 Object.defineProperty(exports, "AbstractFile", { enumerable: true, get: function () { return _abstract_file_1.AbstractFile; } });
 const pretty_printer_1 = require("./pretty_printer/pretty_printer");

package/build/src/issue.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Issue = void 0;
 const position_1 = require("./position");
+const virtual_position_1 = require("./virtual_position");
 const severity_1 = require("./severity");
 class Issue {
     //////////////////////////
@@ -87,7 +88,7 @@ class Issue {
     }
     constructor(data) {
         this.data = data;
-        if (this.data.start instanceof position_1.VirtualPosition) {
+        if (this.data.start instanceof virtual_position_1.VirtualPosition) {
             // no quick fixes inside macros
             this.data.fix = undefined;
         }

package/build/src/lsp/semantic.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SemanticHighlighting = void 0;
 const LServer = require("vscode-languageserver-types");
 const position_1 = require("../position");
+const virtual_position_1 = require("../virtual_position");
 const tokens_1 = require("../abap/1_lexer/tokens");
 const nodes_1 = require("../abap/nodes");
 const Statements = require("../abap/2_statements/statements");
@@ -46,7 +47,7 @@ class SemanticHighlighting {
         const rangeEndPosition = new position_1.Position(range.end.line + 1, range.end.character + 1);
         const tokens = [];
         for (const s of file.getStatements()) {
-            if (s.getFirstToken().getStart() instanceof position_1.VirtualPosition) {
+            if (s.getFirstToken().getStart() instanceof virtual_position_1.VirtualPosition) {
                 continue;
             }
             else if (s.getFirstToken().getStart().isAfter(rangeEndPosition)) {

package/build/src/objects/rename/renamer_helper.js

@@ -5,7 +5,7 @@ const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 const __1 = require("../..");
 const syntax_1 = require("../../abap/5_syntax/syntax");
 const _scope_type_1 = require("../../abap/5_syntax/_scope_type");
-const position_1 = require("../../position");
+const virtual_position_1 = require("../../virtual_position");
 const _abap_object_1 = require("../_abap_object");
 class RenamerHelper {
     constructor(reg) {
@@ -149,7 +149,7 @@ class RenamerHelper {
             for (const r of node.getData().references) {
                 if (((_a = r.resolved) === null || _a === void 0 ? void 0 : _a.equals(identifier))
                     && r.referenceType !== __1.ReferenceType.InferredType
-                    && !(r.position.getStart() instanceof position_1.VirtualPosition)) {
+                    && !(r.position.getStart() instanceof virtual_position_1.VirtualPosition)) {
                     ret.push(r.position);
                 }
             }

package/build/src/position.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VirtualPosition = exports.Position = void 0;
+exports.Position = void 0;
 // first position is (1,1)
 class Position {
     constructor(row, col) {
@@ -27,20 +27,4 @@ class Position {
     }
 }
 exports.Position = Position;
-/** used for macro calls */
-class VirtualPosition extends 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=position.js.map

package/build/src/pretty_printer/indent.js

@@ -4,7 +4,7 @@ exports.Indent = void 0;
 const Statements = require("../abap/2_statements/statements");
 const Expressions = require("../abap/2_statements/expressions");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
-const position_1 = require("../position");
+const virtual_position_1 = require("../virtual_position");
 // todo, will break if there is multiple statements per line?
 class Indent {
     constructor(options) {
@@ -16,7 +16,7 @@ class Indent {
         const expected = this.getExpectedIndents(original);
         const lines = modified.split("\n");
         for (const statement of statements) {
-            if (statement.getFirstToken().getStart() instanceof position_1.VirtualPosition) {
+            if (statement.getFirstToken().getStart() instanceof virtual_position_1.VirtualPosition) {
                 continue; // macro contents
             }
             const exp = expected.shift();
@@ -40,7 +40,7 @@ class Indent {
         let parentIsEvent = false;
         let previousStatement = undefined;
         for (const statement of file.getStatements()) {
-            if (statement.getFirstToken().getStart() instanceof position_1.VirtualPosition) {
+            if (statement.getFirstToken().getStart() instanceof virtual_position_1.VirtualPosition) {
                 continue; // skip macro contents
             }
             const type = statement.get();

package/build/src/pretty_printer/pretty_printer.js

@@ -4,7 +4,7 @@ exports.PrettyPrinter = void 0;
 const _statement_1 = require("../abap/2_statements/statements/_statement");
 const fix_keyword_case_1 = require("./fix_keyword_case");
 const indent_1 = require("./indent");
-const position_1 = require("../position");
+const virtual_position_1 = require("../virtual_position");
 const indentation_1 = require("../rules/indentation");
 class PrettyPrinter {
     constructor(file, config) {
@@ -23,7 +23,7 @@ class PrettyPrinter {
             if (statement.get() instanceof _statement_1.Unknown
                 || statement.get() instanceof _statement_1.MacroContent
                 || statement.get() instanceof _statement_1.MacroCall
-                || statement.getFirstToken().getStart() instanceof position_1.VirtualPosition
+                || statement.getFirstToken().getStart() instanceof virtual_position_1.VirtualPosition
                 || statement.get() instanceof _statement_1.Comment) {
                 continue;
             }

package/build/src/registry.js

@@ -65,7 +65,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.66";
+        return "2.102.68";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/downport.js

@@ -12,6 +12,7 @@ const _statement_1 = require("../abap/2_statements/statements/_statement");
 const nodes_1 = require("../abap/nodes");
 const edit_helper_1 = require("../edit_helper");
 const position_1 = require("../position");
+const virtual_position_1 = require("../virtual_position");
 const _abap_object_1 = require("../objects/_abap_object");
 const version_1 = require("../version");
 const registry_1 = require("../registry");
@@ -324,7 +325,7 @@ Make sure to test the downported code, it might not always be completely correct
     }
     /** applies one rule at a time, multiple iterations are required to transform complex statements */
     checkStatement(low, high, lowFile, highSyntax, highFile) {
-        if (low.getFirstToken().getStart() instanceof position_1.VirtualPosition) {
+        if (low.getFirstToken().getStart() instanceof virtual_position_1.VirtualPosition) {
             return undefined;
         }
         // downport XSDBOOL() early, as it is valid 702 syntax

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/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.66",
+    "version": "2.102.68",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",