@abaplint/core 2.93.32 → 2.93.34

package/build/abaplint.d.ts

@@ -6176,6 +6176,13 @@ declare class View extends AbstractObject {
         maxLength: number;
         allowNamespace: boolean;
     };
+    getJoin(): {
+        LTAB: string;
+        LFIELD: string;
+        OPERATOR: string;
+        RTAB: string;
+        RFIELD: string;
+    }[] | undefined;
     setDirty(): void;
     parseType(reg: IRegistry): AbstractType;
     getDescription(): string | undefined;

package/build/src/objects/view.js

@@ -15,6 +15,13 @@ class View extends _abstract_object_1.AbstractObject {
             allowNamespace: true,
         };
     }
+    getJoin() {
+        var _a;
+        if (this.parsedData === undefined) {
+            this.parseXML();
+        }
+        return (_a = this.parsedData) === null || _a === void 0 ? void 0 : _a.join;
+    }
     setDirty() {
         this.parsedData = undefined;
         super.setDirty();
@@ -69,8 +76,8 @@ class View extends _abstract_object_1.AbstractObject {
     }
     ///////////////
     parseXML() {
-        var _a;
-        this.parsedData = { fields: [] };
+        var _a, _b;
+        this.parsedData = { fields: [], join: [] };
         const parsed = super.parseRaw2();
         if (parsed === undefined || parsed.abapGit === undefined) {
             return;
@@ -83,6 +90,16 @@ class View extends _abstract_object_1.AbstractObject {
                 FIELDNAME: field.FIELDNAME,
             });
         }
+        const join = (_b = parsed.abapGit["asx:abap"]["asx:values"]) === null || _b === void 0 ? void 0 : _b.DD28J_TABLE;
+        for (const j of (0, xml_utils_1.xmlToArray)(join === null || join === void 0 ? void 0 : join.DD28J)) {
+            this.parsedData.join.push({
+                LTAB: j.LTAB,
+                LFIELD: j.LFIELD,
+                OPERATOR: j.OPERATOR,
+                RTAB: j.RTAB,
+                RFIELD: j.RFIELD,
+            });
+        }
     }
 }
 exports.View = View;

package/build/src/pretty_printer/indent.js

@@ -60,7 +60,8 @@ class Indent {
                 || type instanceof Statements.EndCatch
                 || (this.options.selectionScreenBlockIndentation === true
                     && type instanceof Statements.SelectionScreen
-                    && (statement.concatTokens().toUpperCase().includes("END OF BLOCK") ||
+                    && (statement.concatTokens().toUpperCase().includes("END OF SCREEN") ||
+                        statement.concatTokens().toUpperCase().includes("END OF BLOCK") ||
                         statement.concatTokens().toUpperCase().includes("END OF LINE")))
                 || type instanceof Statements.ElseIf
                 || type instanceof Statements.EndFunction
@@ -150,7 +151,8 @@ class Indent {
                 || type instanceof Statements.TestSeam
                 || (this.options.selectionScreenBlockIndentation === true
                     && type instanceof Statements.SelectionScreen
-                    && (statement.concatTokens().toUpperCase().includes("BEGIN OF BLOCK") ||
+                    && (statement.concatTokens().toUpperCase().includes("BEGIN OF SCREEN") ||
+                        statement.concatTokens().toUpperCase().includes("BEGIN OF BLOCK") ||
                         statement.concatTokens().toUpperCase().includes("BEGIN OF LINE")))
                 || type instanceof Statements.StartOfSelection
                 || type instanceof Statements.AtSelectionScreen

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -1106,11 +1106,9 @@ LOOP AT ${groupTargetName}tab ${groupTarget}.`;
             return undefined;
         }
         const fieldChain = (_b = (_a = high.findDirectExpression(Expressions.AssignSource)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Source)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(Expressions.FieldChain);
-        if ((fieldChain === null || fieldChain === void 0 ? void 0 : fieldChain.getChildren().length) !== 2) {
-            return undefined;
-        }
-        const tableExpression = fieldChain === null || fieldChain === void 0 ? void 0 : fieldChain.getChildren()[1];
-        if (!(tableExpression.get() instanceof Expressions.TableExpression)
+        const tableExpression = fieldChain === null || fieldChain === void 0 ? void 0 : fieldChain.getLastChild();
+        if (tableExpression === undefined
+            || !(tableExpression.get() instanceof Expressions.TableExpression)
             || !(tableExpression instanceof nodes_1.ExpressionNode)) {
             return undefined;
         }
@@ -1128,8 +1126,15 @@ LOOP AT ${groupTargetName}tab ${groupTarget}.`;
             concat = concat.substring(0, concat.length - 2);
             condition = `WITH KEY ${concat}`;
         }
+        let pre = "";
+        for (const c of fieldChain.getChildren()) {
+            if (c === tableExpression) {
+                break;
+            }
+            pre += c.concatTokens();
+        }
         const fsTarget = high.findDirectExpression(Expressions.FSTarget);
-        const code = `READ TABLE ${fieldChain === null || fieldChain === void 0 ? void 0 : fieldChain.getChildren()[0].concatTokens()} ${condition} ASSIGNING ${fsTarget === null || fsTarget === void 0 ? void 0 : fsTarget.concatTokens()}.`;
+        const code = `READ TABLE ${pre} ${condition} ASSIGNING ${fsTarget === null || fsTarget === void 0 ? void 0 : fsTarget.concatTokens()}.`;
         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);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.93.32",
+    "version": "2.93.34",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -46,16 +46,16 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.31.2",
+        "@microsoft/api-extractor": "^7.32.0",
         "@types/chai": "^4.3.3",
         "@types/mocha": "^10.0.0",
-        "@types/node": "^18.7.23",
+        "@types/node": "^18.8.1",
         "chai": "^4.3.6",
         "eslint": "^8.24.0",
         "mocha": "^10.0.0",
         "c8": "^7.12.0",
         "source-map-support": "^0.5.21",
-        "ts-json-schema-generator": "^1.1.1",
+        "ts-json-schema-generator": "^1.1.2",
         "typescript": "^4.8.4"
     },
     "dependencies": {