@abaplint/core 2.93.37 → 2.93.38

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

@@ -17,7 +17,7 @@ class FilterBody {
                 new source_1.Source().runSyntax(s, scope, filename);
             }
         }
-        return targetType ? targetType : type;
+        return type ? type : targetType;
     }
 }
 exports.FilterBody = FilterBody;

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

@@ -108,7 +108,14 @@ class Source {
                 case "FILTER":
                     {
                         const foundType = this.determineType(node, scope, filename, targetType);
-                        return new filter_body_1.FilterBody().runSyntax(node.findDirectExpression(Expressions.FilterBody), scope, filename, foundType);
+                        const bodyType = new filter_body_1.FilterBody().runSyntax(node.findDirectExpression(Expressions.FilterBody), scope, filename, foundType);
+                        if (foundType === undefined || foundType.isGeneric()) {
+                            this.addIfInferred(node, scope, filename, bodyType);
+                        }
+                        else {
+                            this.addIfInferred(node, scope, filename, foundType);
+                        }
+                        return foundType ? foundType : bodyType;
                     }
                 case "CORRESPONDING":
                     {

package/build/src/abap/types/basic/table_type.js

@@ -42,7 +42,7 @@ class TableType extends _abstract_type_1.AbstractType {
         }
     }
     isGeneric() {
-        return false;
+        return this.rowType.isGeneric();
     }
     containsVoid() {
         return this.rowType.containsVoid();

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -1544,7 +1544,7 @@ ${indentation}    output = ${topTarget}.`;
         return { body, end };
     }
     outlineFilter(low, high, lowFile, highSyntax) {
-        var _a, _b, _c;
+        var _a;
         if (!(low.get() instanceof _statement_1.Unknown)) {
             return undefined;
         }
@@ -1557,32 +1557,25 @@ ${indentation}    output = ${topTarget}.`;
             if (filterBody === undefined) {
                 continue;
             }
+            const sourceName = (_a = filterBody.findDirectExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
+            if (sourceName === undefined) {
+                continue;
+            }
             let type = this.findType(i, lowFile, highSyntax);
             if (type === undefined) {
-                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;
-                }
+                type = "LIKE " + sourceName;
             }
             else {
                 type = "TYPE " + type;
             }
-            const sourceName = (_c = filterBody.findDirectExpression(Expressions.Source)) === null || _c === void 0 ? void 0 : _c.concatTokens();
-            if (sourceName === undefined) {
-                continue;
-            }
             const uniqueName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
             const loopName = this.uniqueName(firstToken.getStart(), lowFile.getFilename(), highSyntax);
             const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             let body = "";
-            body += `${indentation}DATA ${uniqueName} ${type}.\n`;
+            body += `DATA ${uniqueName} ${type}.\n`;
             body += `${indentation}LOOP AT ${sourceName} INTO DATA(${loopName}) ${filterBody.concatTokens().substring(sourceName.length + 1)}.\n`;
             body += `${indentation}  INSERT ${loopName} INTO TABLE ${uniqueName}.\n`;
-            body += `${indentation}ENDLOOP.\n`;
+            body += `${indentation}ENDLOOP.\n${indentation}`;
             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);

package/package.json

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