@abaplint/core 2.102.8 → 2.102.9

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -287,13 +287,12 @@ Make sure to test the downported code, it might not always be completely correct
                     }
                 }
             }
-            else if (ret.length === 0 && / xsdbool\(/i.test(lowFile.getRaw())) {
+            if (ret.length === 0 && lowFile.getRaw().includes(" xsdbool( ")) {
                 for (let i = 0; i < lowStatements.length; i++) {
                     const high = highStatements[i];
                     const issue = this.replaceXsdBool(high, lowFile, highSyntax);
                     if (issue) {
                         ret.push(issue);
-                        break;
                     }
                 }
             }
@@ -328,11 +327,13 @@ Make sure to test the downported code, it might not always be completely correct
             return undefined;
         }
         // downport XSDBOOL() early, as it is valid 702 syntax
+        /*
         let found = this.replaceXsdBool(high, lowFile, highSyntax);
         if (found) {
-            return found;
+          return found;
         }
-        found = this.downportEnum(low, high, lowFile, highSyntax, highFile);
+        */
+        let found = this.downportEnum(low, high, lowFile, highSyntax, highFile);
         if (found) {
             return found;
         }
@@ -2570,7 +2571,20 @@ ${indentation}    output = ${uniqueName}.\n`;
             if (r.referenceType === _reference_1.ReferenceType.BuiltinMethodReference
                 && r.position.getName().toUpperCase() === "XSDBOOL") {
                 const token = r.position.getToken();
-                const fix = edit_helper_1.EditHelper.replaceRange(lowFile, token.getStart(), token.getEnd(), "boolc");
+                let source = undefined;
+                for (const s of node.findAllExpressions(Expressions.Source)) {
+                    if (s.getFirstToken().getStart().equals(token.getStart())) {
+                        source = s;
+                        break;
+                    }
+                }
+                const children = source === null || source === void 0 ? void 0 : source.getChildren();
+                if (source === undefined || (children === null || children === void 0 ? void 0 : children.length) !== 4) {
+                    continue;
+                }
+                // make sure to convert to the correct type, RTTI might be used on the result of XSDBOOL
+                const code = "CONV xsdboolean( boolc( " + children[2].concatTokens() + " ) )";
+                const fix = edit_helper_1.EditHelper.replaceRange(lowFile, source.getFirstToken().getStart(), source.getLastToken().getEnd(), code);
                 return issue_1.Issue.atToken(lowFile, token, "Use BOOLC", this.getMetadata().key, this.conf.severity, fix);
             }
         }

package/package.json

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