@abaplint/runtime 2.3.58 → 2.3.60

package/build/src/abap_regex.d.ts

@@ -1,3 +1,4 @@
 export declare class ABAPRegExp {
     static convert(input: string): string;
+    static escapeRegExp(text: string): string;
 }

package/build/src/abap_regex.js

@@ -11,6 +11,9 @@ class ABAPRegExp {
         ret = ret.replace("[[:space:]]", "\\s");
         return ret;
     }
+    static escapeRegExp(text) {
+        return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+    }
 }
 exports.ABAPRegExp = ABAPRegExp;
 //# sourceMappingURL=abap_regex.js.map

package/build/src/statements/replace.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replace = void 0;
+const abap_regex_1 = require("../abap_regex");
 const offset_length_1 = require("../offset_length");
-function escapeRegExp(text) {
-    return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-}
+const types_1 = require("../types");
 function replace(input) {
     let temp = input.target.get();
     const ignoreCase = input.ignoringCase === true ? "i" : "";
@@ -17,15 +16,16 @@ function replace(input) {
             throw "REPLACE, zero length input";
         }
         found = temp.indexOf(inp) >= 0;
-        inp = escapeRegExp(inp);
+        inp = abap_regex_1.ABAPRegExp.escapeRegExp(inp);
         search = new RegExp(inp, ignoreCase + allOccurrences);
     }
     else if (input.regex) {
-        if (input.regex.get().length === 0 && input.all === true) {
+        const regex = abap_regex_1.ABAPRegExp.convert(input.regex.get());
+        if (regex.length === 0 && input.all === true) {
             throw "REPLACE, zero length input";
         }
-        found = temp.match(input.regex.get()) !== null;
-        search = new RegExp(input.regex.get(), ignoreCase + allOccurrences);
+        found = temp.match(regex) !== null;
+        search = new RegExp(regex, ignoreCase + allOccurrences);
     }
     else if (input.sectionLength && input.sectionOffset) {
         new offset_length_1.OffsetLength(input.target, { length: input.sectionLength, offset: input.sectionOffset }).set(input.with);
@@ -41,7 +41,12 @@ function replace(input) {
         replace = input.with;
     }
     else {
-        replace = input.with.get();
+        if (input.with instanceof types_1.Character) {
+            replace = input.with.getTrimEnd();
+        }
+        else {
+            replace = input.with.get();
+        }
         replace = replace.replace(/\\\$/g, "$");
         replace = replace.replace(/\\\{/g, "{");
         replace = replace.replace(/\\\}/g, "}");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/runtime",
-  "version": "2.3.58",
+  "version": "2.3.60",
   "description": "Transpiler - Runtime",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",