@abaplint/core 2.119.34 → 2.119.36

package/build/src/abap/2_statements/expressions/sql_compare.js

@@ -10,17 +10,17 @@ const _select_core_1 = require("./_select_core");
 class SQLCompare extends combi_1.Expression {
     getRunnable() {
         const subSelect = (0, combi_1.ver)(version_1.Version.v750, sql_set_op_group_1.SQLSetOpGroup, version_1.Version.OpenABAP);
+        const simpleSubSelect = (0, combi_1.seq)("(", "SELECT", (0, _select_core_1.buildSelectCore)(undefined, false), ")");
+        const simpleScalarSubSelect = (0, combi_1.ver)(version_1.Version.v740sp08, simpleSubSelect, version_1.Version.OpenABAP);
         const between = (0, combi_1.seq)("BETWEEN", _1.SQLSource, "AND", _1.SQLSource);
         const like = (0, combi_1.seq)("LIKE", _1.SQLSource, (0, combi_1.optPrio)((0, combi_1.seq)("ESCAPE", _1.SQLSource)));
         const nul = (0, combi_1.seq)("IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("NULL", (0, combi_1.ver)(version_1.Version.v753, "INITIAL")));
-        const sub = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("ALL", "ANY", "SOME")), subSelect);
+        const sub = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("ALL", "ANY", "SOME")), (0, combi_1.altPrio)(subSelect, simpleScalarSubSelect));
         const source = new _1.SQLSource();
         const arith = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/"), _1.SQLFieldName)), version_1.Version.OpenABAP);
         const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), _1.Source, (0, combi_1.tok)(tokens_1.WParenRightW));
         const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.altPrio)(_1.SimpleSource3, paren)), version_1.Version.OpenABAP);
         const rett = (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLCase, _1.SQLAggregation, _1.SQLFunction, _1.ConstantString, (0, combi_1.seq)((0, combi_1.altPrio)(_1.SQLPath, _1.SQLFieldName), (0, combi_1.optPrio)(arith)), at), (0, combi_1.altPrio)((0, combi_1.seq)(_1.SQLCompareOperator, (0, combi_1.altPrio)(sub, _1.SQLCase, _1.SQLAggregation, _1.SQLFunction, (0, combi_1.seq)(source, (0, combi_1.optPrio)(arith)))), (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(_1.SQLIn, like, between)), nul));
-        // simple subquery for pre-v750 versions: EXISTS ( SELECT ... )
-        const simpleSubSelect = (0, combi_1.seq)("(", "SELECT", (0, _select_core_1.buildSelectCore)(undefined, false), ")");
         const exists = (0, combi_1.seq)("EXISTS", (0, combi_1.altPrio)(subSelect, simpleSubSelect));
         return (0, combi_1.altPrio)(exists, _1.Dynamic, rett);
     }

package/build/src/objects/function_group.js

@@ -169,9 +169,10 @@ class FunctionGroup extends _abap_object_1.ABAPObject {
         }
     }
     findTextFile() {
-        const search = this.getName() + ".fugr.sapl" + this.getName() + ".xml";
+        const name = this.getName().replace(/\//g, "#");
+        const regex = new RegExp(name + "\\.fugr\\.(#\\w+#)?sapl" + name.replace(/^#\w+#/, "") + "\\.xml", "i");
         for (const f of this.getFiles()) {
-            if (f.getFilename().includes(search.toLowerCase())) {
+            if (regex.test(f.getFilename())) {
                 return f;
             }
         }

package/build/src/registry.js

@@ -74,7 +74,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.34";
+        return "2.119.36";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/prefer_inline.js

@@ -41,6 +41,7 @@ const _irule_1 = require("./_irule");
 const version_1 = require("../version");
 const _abap_object_1 = require("../objects/_abap_object");
 const syntax_1 = require("../abap/5_syntax/syntax");
+const _typed_identifier_1 = require("../abap/types/_typed_identifier");
 const _scope_type_1 = require("../abap/5_syntax/_scope_type");
 const _reference_1 = require("../abap/5_syntax/_reference");
 const edit_helper_1 = require("../edit_helper");
@@ -141,10 +142,16 @@ DATA(percentage) = CONV decfloat34( comment_number / abs_statement_number ) * 10
             }
             const file = obj.getABAPFileByName(identifier.getFilename());
             const writeStatement = edit_helper_1.EditHelper.findStatement(next, file);
+            if (writeStatement === undefined) {
+                continue;
+            }
             const statementType = writeStatement === null || writeStatement === void 0 ? void 0 : writeStatement.get();
             if (statementType === undefined) {
                 continue;
             }
+            else if (this.statementHasGenericRead(node, writeStatement)) {
+                continue;
+            }
             // for now only allow some specific target statements, todo refactor
             if (!(statementType instanceof Statements.Move
                 || statementType instanceof Statements.Catch
@@ -232,6 +239,21 @@ DATA(percentage) = CONV decfloat34( comment_number / abs_statement_number ) * 10
         }
         return undefined;
     }
+    statementHasGenericRead(node, statement) {
+        for (const ref of node.getData().references) {
+            if (ref.referenceType !== _reference_1.ReferenceType.DataReadReference
+                || ref.resolved === undefined
+                || statement.includesToken(ref.position.getToken()) === false
+                || !(ref.resolved instanceof _typed_identifier_1.TypedIdentifier)) {
+                continue;
+            }
+            else if (ref.resolved.getType().isGeneric() === true
+                || ref.resolved.getType().containsVoid() === true) {
+                return true;
+            }
+        }
+        return false;
+    }
     isLocalDefinition(node, identifier) {
         const { start, end } = node.calcCoverage();
         if (identifier.getStart().isAfter(start) && identifier.getStart().isBefore(end)) {

package/package.json

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