@abaplint/core 2.96.0 → 2.96.2

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

@@ -15,8 +15,10 @@ class MethodDefReturning {
         if (type === undefined) {
             throw new Error("method_parameter.ts, unexpected structure");
         }
-        const found = new basic_types_1.BasicTypes(filename, scope).parseType(type);
-        //    console.dir(found);
+        let found = new basic_types_1.BasicTypes(filename, scope).parseType(type);
+        if ((found === null || found === void 0 ? void 0 : found.isGeneric()) === true) {
+            found = new basic_1.UnknownType("RETURNING parameter must be fully specified");
+        }
         if (found) {
             return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, found, meta);
         }

package/build/src/registry.js

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

package/build/src/rules/sql_escape_host_variables.js

@@ -8,6 +8,7 @@ const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const version_1 = require("../version");
 const _irule_1 = require("./_irule");
+const edit_helper_1 = require("../edit_helper");
 class SQLEscapeHostVariablesConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.SQLEscapeHostVariablesConf = SQLEscapeHostVariablesConf;
@@ -22,7 +23,7 @@ class SQLEscapeHostVariables extends _abap_rule_1.ABAPRule {
             title: "Escape SQL host variables",
             shortDescription: `Escape SQL host variables, from 740sp05`,
             extendedInformation: `https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#avoid-obsolete-language-elements`,
-            tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Styleguide],
+            tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Styleguide, _irule_1.RuleTag.Quickfix],
             badExample: `SELECT * FROM tab INTO TABLE res WHERE field = val.`,
             goodExample: `SELECT * FROM tab INTO TABLE @res WHERE field = @val.`,
         };
@@ -35,52 +36,45 @@ class SQLEscapeHostVariables extends _abap_rule_1.ABAPRule {
     }
     runParsed(file, obj) {
         const issues = [];
-        if (obj.getType() === "INTF") {
+        const type = obj.getType();
+        if (type === "INTF" || type === "TYPE") {
             return [];
         }
-        if (this.reg.getConfig().getVersion() < version_1.Version.v740sp02 && this.reg.getConfig().getVersion() !== version_1.Version.Cloud) {
+        if (this.reg.getConfig().getVersion() < version_1.Version.v740sp02
+            && this.reg.getConfig().getVersion() !== version_1.Version.Cloud) {
             return [];
         }
         for (const s of file.getStatements()) {
-            const str = s.concatTokens().toUpperCase();
-            if (s.get() instanceof Statements.Select
-                || s.get() instanceof Statements.SelectLoop) {
-                // this is not completely correct and does not catch all, but okay for now
-                // todo: replace with logic from "else if" branch below, when/if it proves to work
-                if (str.includes(" INTO ( @")
-                    || str.includes(" INTO (@")
-                    || str.includes(" INTO @")
-                    || str.includes(" INTO TABLE @")
-                    || str.includes(" INTO CORRESPONDING FIELDS OF @")
-                    || str.includes(" INTO CORRESPONDING FIELDS OF TABLE @")
-                    || str.includes(" APPENDING TABLE @")
-                    || (str.includes(" APPENDING ") === false && str.includes(" INTO ") === false)
-                    || str.includes(" APPENDING CORRESPONDING FIELDS OF TABLE @")) {
-                    continue;
-                }
-                else {
-                    const message = "Escape SQL host variables";
-                    const issue = issue_1.Issue.atToken(file, s.getFirstToken(), message, this.getMetadata().key, this.conf.severity);
-                    issues.push(issue);
-                }
-            }
-            else if (s.get() instanceof Statements.UpdateDatabase
+            if (s.get() instanceof Statements.UpdateDatabase
                 || s.get() instanceof Statements.ModifyDatabase
+                || s.get() instanceof Statements.Select
+                || s.get() instanceof Statements.SelectLoop
                 || s.get() instanceof Statements.InsertDatabase
                 || s.get() instanceof Statements.DeleteDatabase) {
-                if (str.startsWith("MODIFY SCREEN FROM ")) {
-                    continue;
-                }
                 for (const o of s.findAllExpressions(Expressions.SQLSource)) {
                     const first = o.getFirstChild();
                     if (((first === null || first === void 0 ? void 0 : first.get()) instanceof Expressions.Source && first.getChildren()[0].get() instanceof Expressions.FieldChain)
                         || ((first === null || first === void 0 ? void 0 : first.get()) instanceof Expressions.SimpleSource3 && first.getChildren()[0].get() instanceof Expressions.FieldChain)) {
                         const message = "Escape SQL host variables";
-                        const issue = issue_1.Issue.atToken(file, first.getFirstToken(), message, this.getMetadata().key, this.conf.severity);
+                        const firstToken = o.getFirstChild().getFirstToken();
+                        const fix = edit_helper_1.EditHelper.replaceToken(file, firstToken, "@" + (firstToken === null || firstToken === void 0 ? void 0 : firstToken.getStr()));
+                        const issue = issue_1.Issue.atToken(file, first.getFirstToken(), message, this.getMetadata().key, this.conf.severity, fix);
                         issues.push(issue);
                         break;
                     }
                 }
+                for (const o of s.findAllExpressions(Expressions.SQLTarget)) {
+                    const escaped = o.findDirectTokenByText("@");
+                    if (escaped !== undefined) {
+                        continue;
+                    }
+                    const message = "Escape SQL host variables";
+                    const firstToken = o.getFirstChild().getFirstToken();
+                    const fix = edit_helper_1.EditHelper.replaceToken(file, firstToken, "@" + (firstToken === null || firstToken === void 0 ? void 0 : firstToken.getStr()));
+                    const issue = issue_1.Issue.atToken(file, o.getFirstToken(), message, this.getMetadata().key, this.conf.severity, fix);
+                    issues.push(issue);
+                    break;
+                }
             }
         }
         return issues;

package/package.json

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