@abaplint/core 2.95.29 → 2.95.31

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -465,7 +465,7 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         return undefined;
     }
     //////////////////////////////////////////
-    downportSQLExtras(low, high, lowFile, _highSyntax) {
+    downportSQLExtras(low, high, lowFile, highSyntax) {
         if (!(low.get() instanceof _statement_1.Unknown)) {
             return undefined;
         }
@@ -493,7 +493,18 @@ Only one transformation is applied to a statement at a time, so multiple steps m
         for (const c of candidates.reverse()) {
             if (c.getFirstToken() instanceof tokens_1.WAt
                 || c.getFirstToken() instanceof tokens_1.At) {
-                addFix(c.getFirstToken());
+                const tokens = c.getAllTokens();
+                if (tokens[1] instanceof tokens_1.ParenLeftW && tokens[tokens.length - 1] instanceof tokens_1.WParenRightW) {
+                    const source = c.findDirectExpression(Expressions.Source);
+                    const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+                    const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getStart(), `DATA(${uniqueName}) = ${source === null || source === void 0 ? void 0 : source.concatTokens()}.\n`);
+                    const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, c.getFirstToken().getStart(), c.getLastToken().getEnd(), "@" + uniqueName);
+                    const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+                    return issue_1.Issue.atToken(lowFile, low.getFirstToken(), "SQL, outline complex @", this.getMetadata().key, this.conf.severity, fix);
+                }
+                else {
+                    addFix(c.getFirstToken());
+                }
             }
         }
         for (const fieldList of high.findAllExpressionsMulti([Expressions.SQLFieldList, Expressions.SQLFieldListLoop], true)) {
@@ -2205,9 +2216,10 @@ ${indentation}    output = ${topTarget}.`;
             }
             const indent = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             const bodyCode = this.buildCondBody(body, uniqueName, indent, lowFile, highSyntax);
+            const last = i.findDirectTokenByText(")");
             const abap = `DATA ${uniqueName} ${type}.\n` + bodyCode;
             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 fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, i.getFirstToken().getStart(), last.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);
         }
@@ -2250,7 +2262,7 @@ ${indentation}    output = ${topTarget}.`;
                 code += indent + "  " + uniqueName + " = " + c.concatTokens() + ".\n";
             }
             else if (c.get() instanceof Expressions.Throw) {
-                code += indent + "  " + c.concatTokens().replace("THROW", "RAISE EXCEPTION NEW") + ".\n";
+                code += indent + "  " + c.concatTokens().replace(/THROW /i, "RAISE EXCEPTION NEW ") + ".\n";
             }
             else {
                 throw "buildCondBody, unexpected expression, " + c.get().constructor.name;

package/build/src/rules/prefer_raise_exception_new.js

@@ -21,8 +21,10 @@ class PreferRaiseExceptionNew extends _abap_rule_1.ABAPRule {
             title: "Prefer RAISE EXCEPTION NEW to RAISE EXCEPTION TYPE",
             shortDescription: `Prefer RAISE EXCEPTION NEW to RAISE EXCEPTION TYPE`,
             extendedInformation: `
-      https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#prefer-raise-exception-new-to-raise-exception-type`,
-            tags: [_irule_1.RuleTag.Styleguide, _irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Quickfix],
+https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#prefer-raise-exception-new-to-raise-exception-type
+
+From 752 and up`,
+            tags: [_irule_1.RuleTag.Styleguide, _irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Quickfix, _irule_1.RuleTag.Upport],
             goodExample: `RAISE EXCEPTION NEW cx_generation_error( previous = exception ).`,
             badExample: `RAISE EXCEPTION TYPE cx_generation_error
   EXPORTING

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.95.29",
+    "version": "2.95.31",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,7 +50,7 @@
         "@microsoft/api-extractor": "^7.34.4",
         "@types/chai": "^4.3.4",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^18.14.5",
+        "@types/node": "^18.14.6",
         "chai": "^4.3.7",
         "eslint": "^8.35.0",
         "mocha": "^10.2.0",