@abaplint/core 2.93.1 → 2.93.2

package/build/abaplint.d.ts

@@ -5516,6 +5516,7 @@ declare class StructureNode extends AbstractNode<StructureNode | StatementNode>
     findAllStatements(type: new () => IStatement): StatementNode[];
     findAllStatementNodes(): StatementNode[];
     findAllStructuresRecursive(type: new () => IStructure): StructureNode[];
+    findAllStructuresMulti(type: (new () => IStructure)[]): StructureNode[];
     findAllStructures(type: new () => IStructure): StructureNode[];
     findDirectStructure(type: new () => IStructure): StructureNode | undefined;
     findFirstStructure(type: new () => IStructure): StructureNode | undefined;

package/build/src/abap/nodes/structure_node.js

@@ -174,6 +174,30 @@ class StructureNode extends _abstract_node_1.AbstractNode {
         }
         return ret;
     }
+    findAllStructuresMulti(type) {
+        const ret = [];
+        for (const t of type) {
+            if (this.get() instanceof t) {
+                return [this];
+            }
+        }
+        for (const child of this.getChildren()) {
+            if (child instanceof statement_node_1.StatementNode) {
+                continue;
+            }
+            let found = false;
+            for (const t of type) {
+                if (this.get() instanceof t) {
+                    ret.push(child);
+                    found = true;
+                }
+            }
+            if (found === false) {
+                ret.push(...child.findAllStructuresMulti(type));
+            }
+        }
+        return ret;
+    }
     findAllStructures(type) {
         const ret = [];
         if (this.get() instanceof type) {

package/build/src/registry.js

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

package/build/src/rules/begin_end_names.js

@@ -24,11 +24,11 @@ class BeginEndNames extends _abap_rule_1.ABAPRule {
             shortDescription: `Check BEGIN OF and END OF names match, plus there must be statements between BEGIN and END`,
             tags: [_irule_1.RuleTag.Syntax, _irule_1.RuleTag.Quickfix, _irule_1.RuleTag.SingleFile],
             badExample: `DATA: BEGIN OF stru,
-      field TYPE i,
-    END OF structure_not_the_same.`,
+        field TYPE i,
+      END OF structure_not_the_same.`,
             goodExample: `DATA: BEGIN OF stru,
-      field TYPE i,
-    END OF stru.`,
+        field TYPE i,
+      END OF stru.`,
         };
     }
     getConfig() {

package/build/src/rules/definitions_top.js

@@ -56,16 +56,15 @@ https://docs.abapopenchecks.org/checks/17/`,
         if (containsUnknown === true) {
             return [];
         }
-        const routines = structure.findAllStructures(Structures.Form).concat(structure.findAllStructures(Structures.Method));
+        const routines = structure.findAllStructuresMulti([Structures.Form, Structures.Method]);
         for (const r of routines) {
             // one fix per routine
             this.fixed = false;
             this.mode = DEFINITION;
             this.moveTo = (_a = r.getFirstStatement()) === null || _a === void 0 ? void 0 : _a.getLastToken().getEnd();
-            if (this.reg.getConfig().getVersion() !== version_1.Version.v702) {
-                if (r.findFirstExpression(Expressions.InlineData)) {
-                    continue;
-                }
+            if (this.reg.getConfig().getVersion() !== version_1.Version.v702
+                && r.findFirstExpression(Expressions.InlineData)) {
+                continue;
             }
             const found = this.walk(r, file);
             if (found) {
@@ -79,20 +78,23 @@ https://docs.abapopenchecks.org/checks/17/`,
         var _a, _b, _c, _d, _e, _f;
         let previous = undefined;
         for (const c of r.getChildren()) {
-            if (c instanceof nodes_1.StatementNode && c.get() instanceof _statement_1.Comment) {
-                continue;
-            }
-            else if (c instanceof nodes_1.StatementNode && c.get() instanceof Statements.Form) {
-                continue;
-            }
-            else if (c instanceof nodes_1.StatementNode && c.get() instanceof Statements.MethodImplementation) {
-                continue;
+            const get = c.get();
+            if (c instanceof nodes_1.StatementNode) {
+                if (get instanceof _statement_1.Comment) {
+                    continue;
+                }
+                else if (get instanceof Statements.Form) {
+                    continue;
+                }
+                else if (get instanceof Statements.MethodImplementation) {
+                    continue;
+                }
             }
             if (c instanceof nodes_1.StructureNode
-                && (c.get() instanceof Structures.Data
-                    || c.get() instanceof Structures.Types
-                    || c.get() instanceof Structures.Constants
-                    || c.get() instanceof Structures.Statics)) {
+                && (get instanceof Structures.Data
+                    || get instanceof Structures.Types
+                    || get instanceof Structures.Constants
+                    || get instanceof Structures.Statics)) {
                 if (this.mode === AFTER) {
                     // These are chained structured statements
                     let fix = undefined;
@@ -118,11 +120,11 @@ https://docs.abapopenchecks.org/checks/17/`,
                 }
             }
             else if (c instanceof nodes_1.StatementNode
-                && (c.get() instanceof Statements.Data
-                    || c.get() instanceof Statements.Type
-                    || c.get() instanceof Statements.Constant
-                    || c.get() instanceof Statements.Static
-                    || c.get() instanceof Statements.FieldSymbol)) {
+                && (get instanceof Statements.Data
+                    || get instanceof Statements.Type
+                    || get instanceof Statements.Constant
+                    || get instanceof Statements.Static
+                    || get instanceof Statements.FieldSymbol)) {
                 if (this.mode === AFTER) {
                     // only one fix per routine, as it reorders a lot
                     let fix = undefined;
@@ -136,11 +138,11 @@ https://docs.abapopenchecks.org/checks/17/`,
                     this.moveTo = c.getLastToken().getEnd();
                 }
             }
-            else if (c instanceof nodes_1.StructureNode && c.get() instanceof Structures.Define) {
+            else if (c instanceof nodes_1.StructureNode && get instanceof Structures.Define) {
                 this.mode = IGNORE;
                 return undefined;
             }
-            else if (c instanceof nodes_1.StatementNode && c.get() instanceof _statement_1.Unknown) {
+            else if (c instanceof nodes_1.StatementNode && get instanceof _statement_1.Unknown) {
                 this.mode = IGNORE;
                 return undefined;
             }

package/build/src/rules/downport.js

@@ -197,23 +197,23 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.emptyKey(high, lowFile);
+        found = this.emptyKey(low, high, lowFile);
         if (found) {
             return found;
         }
-        found = this.stringTemplateAlpha(high, lowFile, highSyntax);
+        found = this.stringTemplateAlpha(low, high, lowFile, highSyntax);
         if (found) {
             return found;
         }
-        found = this.moveWithOperator(high, lowFile);
+        found = this.moveWithOperator(low, high, lowFile);
         if (found) {
             return found;
         }
-        found = this.moveWithSimpleValue(high, lowFile);
+        found = this.moveWithSimpleValue(low, high, lowFile);
         if (found) {
             return found;
         }
-        found = this.assignWithTable(high, lowFile);
+        found = this.assignWithTable(low, high, lowFile);
         if (found) {
             return found;
         }
@@ -221,7 +221,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.downportRef(high, lowFile, highSyntax);
+        found = this.downportRef(low, high, lowFile, highSyntax);
         if (found) {
             return found;
         }
@@ -245,7 +245,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.outlineLoopInput(high, lowFile, highSyntax);
+        found = this.outlineLoopInput(low, high, lowFile, highSyntax);
         if (found) {
             return found;
         }
@@ -253,27 +253,27 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.outlineValue(high, lowFile, highSyntax);
+        found = this.outlineValue(low, high, lowFile, highSyntax);
         if (found) {
             return found;
         }
-        found = this.outlineReduce(high, lowFile, highSyntax);
+        found = this.outlineReduce(low, high, lowFile, highSyntax);
         if (found) {
             return found;
         }
-        found = this.outlineSwitch(high, lowFile, highSyntax);
+        found = this.outlineSwitch(low, high, lowFile, highSyntax);
         if (found) {
             return found;
         }
-        found = this.outlineCast(high, lowFile, highSyntax);
+        found = this.outlineCast(low, high, lowFile, highSyntax);
         if (found) {
             return found;
         }
-        found = this.outlineConv(high, lowFile, highSyntax);
+        found = this.outlineConv(low, high, lowFile, highSyntax);
         if (found) {
             return found;
         }
-        found = this.outlineCond(high, lowFile, highSyntax);
+        found = this.outlineCond(low, high, lowFile, highSyntax);
         if (found) {
             return found;
         }
@@ -289,11 +289,11 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.outlineFS(high, lowFile, highSyntax);
+        found = this.outlineFS(low, high, lowFile, highSyntax);
         if (found) {
             return found;
         }
-        found = this.newToCreateObject(high, lowFile, highSyntax);
+        found = this.newToCreateObject(low, high, lowFile, highSyntax);
         if (found) {
             return found;
         }
@@ -313,11 +313,11 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         if (found) {
             return found;
         }
-        found = this.replaceMethodConditional(high, lowFile, highSyntax);
+        found = this.replaceMethodConditional(low, high, lowFile, highSyntax);
         if (found) {
             return found;
         }
-        found = this.replaceTableExpression(high, lowFile, highSyntax);
+        found = this.replaceTableExpression(low, high, lowFile, highSyntax);
         if (found) {
             return found;
         }
@@ -415,8 +415,11 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         }
         return undefined;
     }
-    downportSelectSingleInline(_low, high, lowFile, _highSyntax) {
+    downportSelectSingleInline(low, high, lowFile, _highSyntax) {
         var _a, _b, _c, _d;
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
         const targets = ((_a = high.findFirstExpression(Expressions.SQLIntoStructure)) === null || _a === void 0 ? void 0 : _a.findDirectExpressions(Expressions.SQLTarget)) || [];
         if (targets.length !== 1) {
             return undefined;
@@ -474,8 +477,11 @@ ${indentation}`);
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         return issue_1.Issue.atToken(lowFile, inlineData.getFirstToken(), "Outline SELECT @DATA", this.getMetadata().key, this.conf.severity, fix);
     }
-    downportSelectTableInline(_low, high, lowFile, highSyntax) {
+    downportSelectTableInline(low, high, lowFile, highSyntax) {
         var _a, _b, _c;
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
         const targets = ((_a = high.findFirstExpression(Expressions.SQLIntoTable)) === null || _a === void 0 ? void 0 : _a.findDirectExpressions(Expressions.SQLTarget)) || [];
         if (targets.length !== 1) {
             return undefined;
@@ -589,13 +595,16 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
         }
         return undefined;
     }
-    replaceTableExpression(node, lowFile, highSyntax) {
-        for (const fieldChain of node.findAllExpressionsRecursive(Expressions.FieldChain)) {
+    replaceTableExpression(low, high, lowFile, highSyntax) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        for (const fieldChain of high.findAllExpressionsRecursive(Expressions.FieldChain)) {
             const tableExpression = fieldChain.findDirectExpression(Expressions.TableExpression);
             if (tableExpression === undefined) {
                 continue;
             }
-            const concat = node.concatTokens().toUpperCase();
+            const concat = high.concatTokens().toUpperCase();
             if (concat.includes(" LINE_EXISTS( ") || concat.includes(" LINE_INDEX( ")) {
                 // note: line_exists() must be replaced before handling table expressions
                 continue;
@@ -615,10 +624,10 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
                 continue;
             }
             const condition = this.tableCondition(tableExpression);
-            const uniqueName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
-            const tabixBackup = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
-            const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
-            const firstToken = node.getFirstToken();
+            const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+            const tabixBackup = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+            const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+            const firstToken = high.getFirstToken();
             // note that the tabix restore should be done before throwing the exception
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), `DATA ${uniqueName} LIKE LINE OF ${pre}.
 ${indentation}DATA ${tabixBackup} LIKE sy-tabix.
@@ -631,7 +640,7 @@ ${indentation}ENDIF.
 ${indentation}`);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, startToken.getStart(), tableExpression.getLastToken().getEnd(), uniqueName);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
-            return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Outline table expression", this.getMetadata().key, this.conf.severity, fix);
+            return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Outline table expression", this.getMetadata().key, this.conf.severity, fix);
         }
         return undefined;
     }
@@ -813,7 +822,10 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, node.getStart(), node.getEnd(), abap);
         return issue_1.Issue.atToken(lowFile, startToken, "Downport RAISE MESSAGE", this.getMetadata().key, this.conf.severity, fix);
     }
-    emptyKey(node, lowFile) {
+    emptyKey(low, node, lowFile) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
         for (let i of node.findAllExpressions(Expressions.TypeTable)) {
             const key = i.findDirectExpression(Expressions.TypeTableKey);
             if (key === undefined) {
@@ -962,7 +974,10 @@ LOOP AT ${groupTargetName}tab ${groupTarget}.`;
         }
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, LOOP GROUP", this.getMetadata().key, this.conf.severity, fix);
     }
-    downportRef(high, lowFile, highSyntax) {
+    downportRef(low, high, lowFile, highSyntax) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
         let found = undefined;
         for (const s of high.findAllExpressionsRecursive(Expressions.Source)) {
             if (s.getFirstToken().getStr().toUpperCase() === "REF"
@@ -980,8 +995,11 @@ LOOP AT ${groupTargetName}tab ${groupTarget}.`;
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, REF", this.getMetadata().key, this.conf.severity, fix);
     }
-    assignWithTable(high, lowFile) {
+    assignWithTable(low, high, lowFile) {
         var _a, _b;
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
         if (!(high.get() instanceof Statements.Assign)) {
             return undefined;
         }
@@ -1016,7 +1034,10 @@ LOOP AT ${groupTargetName}tab ${groupTarget}.`;
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, high.getFirstToken().getStart(), high.getLastToken().getEnd(), code);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, ASSIGN table expr", this.getMetadata().key, this.conf.severity, fix);
     }
-    moveWithSimpleValue(high, lowFile) {
+    moveWithSimpleValue(low, high, lowFile) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
         if (!(high.get() instanceof Statements.Move)
             || high.getChildren().length !== 4) {
             return undefined;
@@ -1081,8 +1102,11 @@ CONSTANTS: BEGIN OF ${structureName},\n`;
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport ENUM", this.getMetadata().key, this.conf.severity, fix);
     }
-    moveWithTableTarget(node, high, lowFile, highSyntax) {
+    moveWithTableTarget(low, high, lowFile, highSyntax) {
         var _a;
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
         if (!(high.get() instanceof Statements.Move)) {
             return undefined;
         }
@@ -1098,11 +1122,11 @@ CONSTANTS: BEGIN OF ${structureName},\n`;
         if (index === undefined) {
             return undefined;
         }
-        let uniqueName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        let uniqueName = this.uniqueName(low.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
         uniqueName = `<${uniqueName}>`;
         const tName = target.concatTokens().split("[")[0];
         const condition = this.tableCondition(tableExpression);
-        const tabixBackup = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const tabixBackup = this.uniqueName(low.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
         const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
         // restore tabix before exeption
         const code = `FIELD-SYMBOLS ${uniqueName} LIKE LINE OF ${tName}.
@@ -1122,9 +1146,12 @@ ${indentation}${uniqueName}`;
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, start, end, code);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, move with table target", this.getMetadata().key, this.conf.severity, fix);
     }
-    moveWithOperator(high, lowFile) {
+    moveWithOperator(low, high, lowFile) {
         var _a, _b, _c;
-        if (!(high.get() instanceof Statements.Move)) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        else if (!(high.get() instanceof Statements.Move)) {
             return undefined;
         }
         const children = high.getChildren();
@@ -1165,12 +1192,15 @@ ${indentation}${uniqueName}`;
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Expand operator", this.getMetadata().key, this.conf.severity, fix);
     }
     // must be very simple string templates, like "|{ ls_line-no ALPHA = IN }|"
-    stringTemplateAlpha(node, lowFile, highSyntax) {
+    stringTemplateAlpha(low, high, lowFile, highSyntax) {
         var _a, _b, _c;
-        if (!(node.get() instanceof Statements.Move)) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
             return undefined;
         }
-        const topSource = node.findDirectExpression(Expressions.Source);
+        else if (!(high.get() instanceof Statements.Move)) {
+            return undefined;
+        }
+        const topSource = high.findDirectExpression(Expressions.Source);
         if (topSource === undefined || topSource.getChildren().length !== 1) {
             return undefined;
         }
@@ -1202,10 +1232,10 @@ ${indentation}${uniqueName}`;
             default:
                 return undefined;
         }
-        const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+        const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
         const source = (_b = templateSource === null || templateSource === void 0 ? void 0 : templateSource.findDirectExpression(Expressions.Source)) === null || _b === void 0 ? void 0 : _b.concatTokens();
-        const topTarget = (_c = node.findDirectExpression(Expressions.Target)) === null || _c === void 0 ? void 0 : _c.concatTokens();
-        const uniqueName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const topTarget = (_c = high.findDirectExpression(Expressions.Target)) === null || _c === void 0 ? void 0 : _c.concatTokens();
+        const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
         if (top === false) {
             const code = `DATA ${uniqueName} TYPE string.
 ${indentation}CALL FUNCTION '${functionName}'
@@ -1213,10 +1243,10 @@ ${indentation}  EXPORTING
 ${indentation}    input  = ${source}
 ${indentation}  IMPORTING
 ${indentation}    output = ${uniqueName}.\n`;
-            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), code);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, child.getFirstToken().getStart(), child.getLastToken().getEnd(), uniqueName);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
-            return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Downport ALPHA", this.getMetadata().key, this.conf.severity, fix);
+            return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport ALPHA", this.getMetadata().key, this.conf.severity, fix);
         }
         else {
             const code = `CALL FUNCTION '${functionName}'
@@ -1224,29 +1254,32 @@ ${indentation}  EXPORTING
 ${indentation}    input  = ${source}
 ${indentation}  IMPORTING
 ${indentation}    output = ${topTarget}.`;
-            const fix = edit_helper_1.EditHelper.replaceRange(lowFile, node.getFirstToken().getStart(), node.getLastToken().getEnd(), code);
-            return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Downport ALPHA", this.getMetadata().key, this.conf.severity, fix);
+            const fix = edit_helper_1.EditHelper.replaceRange(lowFile, high.getFirstToken().getStart(), high.getLastToken().getEnd(), code);
+            return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport ALPHA", this.getMetadata().key, this.conf.severity, fix);
         }
     }
-    outlineLoopInput(node, lowFile, highSyntax) {
-        if (!(node.get() instanceof Statements.Loop)) {
+    outlineLoopInput(low, high, lowFile, highSyntax) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
             return undefined;
         }
-        else if (node.findDirectExpression(Expressions.SimpleSource2)) {
+        else if (!(high.get() instanceof Statements.Loop)) {
+            return undefined;
+        }
+        else if (high.findDirectExpression(Expressions.SimpleSource2)) {
             return undefined;
         }
         // the first Source must be outlined
-        const s = node.findDirectExpression(Expressions.Source);
+        const s = high.findDirectExpression(Expressions.Source);
         if (s === undefined) {
             return undefined;
         }
-        const uniqueName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
         const code = `DATA(${uniqueName}) = ${s.concatTokens()}.\n` +
-            " ".repeat(node.getFirstToken().getStart().getCol() - 1);
-        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
+            " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), code);
         const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, s.getFirstToken().getStart(), s.getLastToken().getEnd(), uniqueName);
         const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
-        return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Outline LOOP input", this.getMetadata().key, this.conf.severity, fix);
+        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Outline LOOP input", this.getMetadata().key, this.conf.severity, fix);
     }
     outlineLoopTarget(node, lowFile, _highSyntax) {
         var _a, _b, _c, _d, _e, _f, _g;
@@ -1335,19 +1368,22 @@ ${indentation}    output = ${topTarget}.`;
         }
         return { body, end };
     }
-    outlineSwitch(node, lowFile, highSyntax) {
+    outlineSwitch(low, high, lowFile, highSyntax) {
         var _a, _b, _c, _d;
-        for (const i of node.findAllExpressionsRecursive(Expressions.Source)) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        for (const i of high.findAllExpressionsRecursive(Expressions.Source)) {
             const firstToken = i.getFirstToken();
             if (firstToken.getStr().toUpperCase() !== "SWITCH") {
                 continue;
             }
             let type = this.findType(i, lowFile, highSyntax);
             if (type === undefined) {
-                if (node.get() instanceof Statements.Move
-                    && node.findDirectExpression(Expressions.Source) === i
-                    && ((_a = node.findDirectExpression(Expressions.Target)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.TargetField)) !== undefined) {
-                    type = "LIKE " + ((_b = node.findDirectExpression(Expressions.Target)) === null || _b === void 0 ? void 0 : _b.concatTokens());
+                if (high.get() instanceof Statements.Move
+                    && high.findDirectExpression(Expressions.Source) === i
+                    && ((_a = high.findDirectExpression(Expressions.Target)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.TargetField)) !== undefined) {
+                    type = "LIKE " + ((_b = high.findDirectExpression(Expressions.Target)) === null || _b === void 0 ? void 0 : _b.concatTokens());
                 }
                 if (type === undefined) {
                     continue;
@@ -1357,7 +1393,7 @@ ${indentation}    output = ${topTarget}.`;
                 type = "TYPE " + type;
             }
             const uniqueName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
-            const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+            const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             let body = "";
             let name = "";
             const switchBody = i.findDirectExpression(Expressions.SwitchBody);
@@ -1399,16 +1435,19 @@ ${indentation}    output = ${topTarget}.`;
                 }
             }
             body += "\n" + indentation + "ENDCASE.\n" + indentation;
-            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), body);
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), body);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, firstToken.getStart(), i.getLastToken().getEnd(), uniqueName);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
             return issue_1.Issue.atToken(lowFile, firstToken, "Downport SWITCH", this.getMetadata().key, this.conf.severity, fix);
         }
         return undefined;
     }
-    outlineReduce(node, lowFile, highSyntax) {
+    outlineReduce(low, high, lowFile, highSyntax) {
         var _a, _b;
-        for (const i of node.findAllExpressionsRecursive(Expressions.Source)) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        for (const i of high.findAllExpressionsRecursive(Expressions.Source)) {
             const firstToken = i.getFirstToken();
             if (firstToken.getStr().toUpperCase() !== "REDUCE") {
                 continue;
@@ -1418,7 +1457,7 @@ ${indentation}    output = ${topTarget}.`;
                 continue;
             }
             const uniqueName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
-            const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+            const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             let body = "";
             let name = "";
             const reduceBody = i.findDirectExpression(Expressions.ReduceBody);
@@ -1474,16 +1513,19 @@ ${indentation}    output = ${topTarget}.`;
             const abap = `DATA ${uniqueName} TYPE ${type}.\n` +
                 body +
                 indentation;
-            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), abap);
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), abap);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, firstToken.getStart(), i.getLastToken().getEnd(), uniqueName);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
             return issue_1.Issue.atToken(lowFile, firstToken, "Downport REDUCE", this.getMetadata().key, this.conf.severity, fix);
         }
         return undefined;
     }
-    outlineValue(node, lowFile, highSyntax) {
+    outlineValue(low, high, lowFile, highSyntax) {
         var _a, _b, _c;
-        const allSources = node.findAllExpressionsRecursive(Expressions.Source);
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        const allSources = high.findAllExpressionsRecursive(Expressions.Source);
         for (const s of allSources) {
             const firstToken = s.getFirstToken();
             if (firstToken.getStr().toUpperCase() !== "VALUE") {
@@ -1491,8 +1533,8 @@ ${indentation}    output = ${topTarget}.`;
             }
             let type = this.findType(s, lowFile, highSyntax);
             if (type === undefined) {
-                if (node.get() instanceof Statements.Move && node.findDirectExpression(Expressions.Source) === s) {
-                    type = "LIKE " + ((_a = node.findDirectExpression(Expressions.Target)) === null || _a === void 0 ? void 0 : _a.concatTokens());
+                if (high.get() instanceof Statements.Move && high.findDirectExpression(Expressions.Source) === s) {
+                    type = "LIKE " + ((_a = high.findDirectExpression(Expressions.Target)) === null || _a === void 0 ? void 0 : _a.concatTokens());
                 }
                 if (type === undefined) {
                     continue;
@@ -1503,7 +1545,7 @@ ${indentation}    output = ${topTarget}.`;
             }
             const valueBody = s.findDirectExpression(Expressions.ValueBody);
             const uniqueName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
-            let indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+            let indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             let body = "";
             const base = valueBody === null || valueBody === void 0 ? void 0 : valueBody.findExpressionAfterToken("BASE");
             if (base) {
@@ -1610,7 +1652,7 @@ ${indentation}    output = ${topTarget}.`;
                 indentation + `CLEAR ${uniqueName}.\n` + // might be called inside a loop
                 body +
                 indentation;
-            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), abap);
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), abap);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, firstToken.getStart(), s.getLastToken().getEnd(), uniqueName);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
             return issue_1.Issue.atToken(lowFile, firstToken, "Downport VALUE", this.getMetadata().key, this.conf.severity, fix);
@@ -1682,17 +1724,20 @@ ${indentation}    output = ${topTarget}.`;
             return (_a = inferred.getType().getQualifiedName()) === null || _a === void 0 ? void 0 : _a.toLowerCase();
         }
     }
-    outlineFS(node, lowFile, highSyntax) {
+    outlineFS(low, high, lowFile, highSyntax) {
         var _a, _b;
-        for (const i of node.findAllExpressionsRecursive(Expressions.InlineFS)) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        for (const i of high.findAllExpressionsRecursive(Expressions.InlineFS)) {
             const nameToken = (_a = i.findDirectExpression(Expressions.TargetFieldSymbol)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
             if (nameToken === undefined) {
                 continue;
             }
             const name = nameToken.getStr();
             let type = "";
-            if (node.concatTokens().toUpperCase().startsWith("APPEND INITIAL LINE TO ")) {
-                type = "LIKE LINE OF " + ((_b = node.findFirstExpression(Expressions.Target)) === null || _b === void 0 ? void 0 : _b.concatTokens());
+            if (high.concatTokens().toUpperCase().startsWith("APPEND INITIAL LINE TO ")) {
+                type = "LIKE LINE OF " + ((_b = high.findFirstExpression(Expressions.Target)) === null || _b === void 0 ? void 0 : _b.concatTokens());
             }
             else {
                 const spag = highSyntax.spaghetti.lookupPosition(nameToken.getStart(), lowFile.getFilename());
@@ -1710,8 +1755,8 @@ ${indentation}    output = ${topTarget}.`;
                 type += found.getType().getQualifiedName() ? found.getType().getQualifiedName().toLowerCase() : found.getType().toABAP();
             }
             const code = `FIELD-SYMBOLS ${name} ${type}.\n` +
-                " ".repeat(node.getFirstToken().getStart().getCol() - 1);
-            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), code);
+                " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), code);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, i.getFirstToken().getStart(), i.getLastToken().getEnd(), name);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
             return issue_1.Issue.atToken(lowFile, i.getFirstToken(), "Outline FIELD-SYMBOL", this.getMetadata().key, this.conf.severity, fix);
@@ -1719,6 +1764,7 @@ ${indentation}    output = ${topTarget}.`;
         return undefined;
     }
     outlineData(node, lowFile, highSyntax) {
+        // hmm, no guard here, as DATA(SDF) is valid in 702
         var _a, _b;
         for (const i of node.findAllExpressionsRecursive(Expressions.InlineData)) {
             const nameToken = (_a = i.findDirectExpression(Expressions.TargetField)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
@@ -1750,9 +1796,12 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
-    outlineCond(node, lowFile, highSyntax) {
+    outlineCond(low, high, lowFile, highSyntax) {
         var _a, _b;
-        for (const i of node.findAllExpressionsRecursive(Expressions.Source)) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        for (const i of high.findAllExpressionsRecursive(Expressions.Source)) {
             if (i.getFirstToken().getStr().toUpperCase() !== "COND") {
                 continue;
             }
@@ -1763,10 +1812,10 @@ ${indentation}    output = ${topTarget}.`;
             const uniqueName = this.uniqueName(i.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             let type = this.findType(i, lowFile, highSyntax);
             if (type === undefined) {
-                if (node.get() instanceof Statements.Move
-                    && node.findDirectExpression(Expressions.Source) === i
-                    && ((_a = node.findDirectExpression(Expressions.Target)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.TargetField)) !== undefined) {
-                    type = "LIKE " + ((_b = node.findDirectExpression(Expressions.Target)) === null || _b === void 0 ? void 0 : _b.concatTokens());
+                if (high.get() instanceof Statements.Move
+                    && high.findDirectExpression(Expressions.Source) === i
+                    && ((_a = high.findDirectExpression(Expressions.Target)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.TargetField)) !== undefined) {
+                    type = "LIKE " + ((_b = high.findDirectExpression(Expressions.Target)) === null || _b === void 0 ? void 0 : _b.concatTokens());
                 }
                 if (type === undefined) {
                     continue;
@@ -1775,10 +1824,10 @@ ${indentation}    output = ${topTarget}.`;
             else {
                 type = "TYPE " + type;
             }
-            const indent = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+            const indent = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             const bodyCode = this.buildCondBody(body, uniqueName, indent, lowFile, highSyntax);
             const abap = `DATA ${uniqueName} ${type}.\n` + bodyCode;
-            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), abap);
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), abap);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, i.getFirstToken().getStart(), i.getLastToken().getEnd(), uniqueName);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
             return issue_1.Issue.atToken(lowFile, i.getFirstToken(), "Downport COND", this.getMetadata().key, this.conf.severity, fix);
@@ -1834,9 +1883,12 @@ ${indentation}    output = ${topTarget}.`;
         code += indent;
         return code;
     }
-    outlineConv(node, lowFile, highSyntax) {
+    outlineConv(low, high, lowFile, highSyntax) {
         var _a;
-        for (const i of node.findAllExpressionsRecursive(Expressions.Source)) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        for (const i of high.findAllExpressionsRecursive(Expressions.Source)) {
             if (i.getFirstToken().getStr().toUpperCase() !== "CONV") {
                 continue;
             }
@@ -1850,11 +1902,11 @@ ${indentation}    output = ${topTarget}.`;
             }
             const uniqueName = this.uniqueName(i.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const type = this.findType(i, lowFile, highSyntax);
-            const indent = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+            const indent = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             const abap = `DATA ${uniqueName} TYPE ${type}.\n` +
                 indent + `${uniqueName} = ${body}.\n` +
                 indent;
-            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), abap);
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), abap);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, i.getFirstToken().getStart(), end.getEnd(), uniqueName);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
             return issue_1.Issue.atToken(lowFile, i.getFirstToken(), "Downport CONV", this.getMetadata().key, this.conf.severity, fix);
@@ -1862,17 +1914,20 @@ ${indentation}    output = ${topTarget}.`;
         return undefined;
     }
     // "CAST" to "?="
-    outlineCast(node, lowFile, highSyntax) {
+    outlineCast(low, high, lowFile, highSyntax) {
         var _a;
-        for (const i of node.findAllExpressionsRecursive(Expressions.Cast)) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        for (const i of high.findAllExpressionsRecursive(Expressions.Cast)) {
             const uniqueName = this.uniqueName(i.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const type = this.findType(i, lowFile, highSyntax, true);
             const body = (_a = i.findDirectExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
             const abap = `DATA ${uniqueName} TYPE ${type}.\n` +
-                " ".repeat(node.getFirstToken().getStart().getCol() - 1) +
+                " ".repeat(high.getFirstToken().getStart().getCol() - 1) +
                 `${uniqueName} ?= ${body}.\n` +
-                " ".repeat(node.getFirstToken().getStart().getCol() - 1);
-            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), abap);
+                " ".repeat(high.getFirstToken().getStart().getCol() - 1);
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), abap);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, i.getFirstToken().getStart(), i.getLastToken().getEnd(), uniqueName);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
             return issue_1.Issue.atToken(lowFile, i.getFirstToken(), "Downport CAST", this.getMetadata().key, this.conf.severity, fix);
@@ -1916,14 +1971,17 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
-    replaceMethodConditional(node, lowFile, highSyntax) {
-        for (const c of node.findAllExpressionsRecursive(Expressions.Compare)) {
+    replaceMethodConditional(low, high, lowFile, highSyntax) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        for (const c of high.findAllExpressionsRecursive(Expressions.Compare)) {
             const chain = c.findDirectExpression(Expressions.MethodCallChain);
             if (chain === undefined) {
                 continue;
             }
             let predicate = false;
-            const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
+            const spag = highSyntax.spaghetti.lookupPosition(high.getFirstToken().getStart(), lowFile.getFilename());
             for (const r of (spag === null || spag === void 0 ? void 0 : spag.getData().references) || []) {
                 if (r.referenceType === _reference_1.ReferenceType.BuiltinMethodReference &&
                     new _builtin_1.BuiltIn().isPredicate(chain.getFirstToken().getStr().toUpperCase())) {
@@ -2044,13 +2102,16 @@ ${indentation}    output = ${topTarget}.`;
         }
         return undefined;
     }
-    newToCreateObject(node, lowFile, highSyntax) {
-        const source = node.findDirectExpression(Expressions.Source);
+    newToCreateObject(low, high, lowFile, highSyntax) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        const source = high.findDirectExpression(Expressions.Source);
         let fix = undefined;
-        if (node.get() instanceof Statements.Move
+        if (high.get() instanceof Statements.Move
             && source
             && source.getFirstToken().getStr().toUpperCase() === "NEW") {
-            const target = node.findDirectExpression(Expressions.Target);
+            const target = high.findDirectExpression(Expressions.Target);
             const found = source === null || source === void 0 ? void 0 : source.findFirstExpression(Expressions.NewObject);
             // must be at top level of the source for quickfix to work(todo: handle more scenarios)
             if (target
@@ -2059,12 +2120,12 @@ ${indentation}    output = ${topTarget}.`;
                 && target.findDirectExpression(Expressions.InlineData) === undefined) {
                 const abap = this.newParameters(found, target.concatTokens(), highSyntax, lowFile);
                 if (abap !== undefined) {
-                    fix = edit_helper_1.EditHelper.replaceRange(lowFile, node.getFirstToken().getStart(), node.getLastToken().getEnd(), abap);
+                    fix = edit_helper_1.EditHelper.replaceRange(lowFile, high.getFirstToken().getStart(), high.getLastToken().getEnd(), abap);
                 }
             }
         }
-        if (fix === undefined && node.findAllExpressions(Expressions.NewObject)) {
-            const found = node.findFirstExpression(Expressions.NewObject);
+        if (fix === undefined && high.findAllExpressions(Expressions.NewObject)) {
+            const found = high.findFirstExpression(Expressions.NewObject);
             if (found === undefined) {
                 return undefined;
             }
@@ -2074,16 +2135,16 @@ ${indentation}    output = ${topTarget}.`;
                 return undefined;
             }
             const type = this.findType(found, lowFile, highSyntax);
-            const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
+            const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             const data = `DATA ${name} TYPE REF TO ${type}.\n` +
                 indentation + abap + "\n" +
                 indentation;
-            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, node.getFirstToken().getStart(), data);
+            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), data);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, found.getFirstToken().getStart(), found.getLastToken().getEnd(), name);
             fix = edit_helper_1.EditHelper.merge(fix2, fix1);
         }
         if (fix) {
-            return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Use CREATE OBJECT instead of NEW", this.getMetadata().key, this.conf.severity, fix);
+            return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Use CREATE OBJECT instead of NEW", this.getMetadata().key, this.conf.severity, fix);
         }
         else {
             return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.93.1",
+    "version": "2.93.2",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",