@abaplint/core 2.97.3 → 2.97.5

package/build/abaplint.d.ts

@@ -1262,6 +1262,7 @@ export declare class CurrentScope {
     addListPrefix(identifiers: readonly TypedIdentifier[], prefix: string): void;
     addList(identifiers: readonly TypedIdentifier[]): void;
     addReference(usage: Token | undefined, referencing: Identifier | undefined, type: ReferenceType | undefined, filename: string, extra?: IReferenceExtras): void;
+    findFunctionModule(name: string | undefined): FunctionModuleDefinition | undefined;
     findObjectDefinition(name: string | undefined): IClassDefinition | IInterfaceDefinition | undefined;
     isBadiDef(name: string): boolean;
     existsObject(name: string | undefined): {

package/build/src/abap/2_statements/statements/call_function.js

@@ -6,8 +6,8 @@ const expressions_1 = require("../expressions");
 const version_1 = require("../../../version");
 class CallFunction {
     getMatcher() {
-        const starting = (0, combi_1.seq)("STARTING NEW TASK", expressions_1.SimpleSource2);
-        const update = (0, combi_1.str)("IN UPDATE TASK");
+        const starting = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.seq)("STARTING NEW TASK", expressions_1.SimpleSource2));
+        const update = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.str)("IN UPDATE TASK"));
         const unit = (0, combi_1.seq)("UNIT", expressions_1.Source);
         const background = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.seq)("IN BACKGROUND", (0, combi_1.altPrio)("TASK", unit)));
         const calling = (0, combi_1.seq)("CALLING", expressions_1.MethodName, "ON END OF TASK");

package/build/src/abap/5_syntax/_current_scope.js

@@ -138,6 +138,18 @@ class CurrentScope {
         (_a = this.current) === null || _a === void 0 ? void 0 : _a.getData().references.push({ position, resolved: referencing, referenceType: type, extra });
     }
     ///////////////////////////
+    findFunctionModule(name) {
+        if (name === undefined) {
+            return undefined;
+        }
+        for (const fugr of this.reg.getObjectsByType("FUGR")) {
+            const func = fugr.getModule(name);
+            if (func !== undefined) {
+                return func;
+            }
+        }
+        return undefined;
+    }
     findObjectDefinition(name) {
         if (name === undefined) {
             return undefined;

package/build/src/abap/5_syntax/statements/call_function.js

@@ -6,6 +6,7 @@ const source_1 = require("../expressions/source");
 const target_1 = require("../expressions/target");
 const field_chain_1 = require("../expressions/field_chain");
 const _reference_1 = require("../_reference");
+const version_1 = require("../../../version");
 class CallFunction {
     runSyntax(node, scope, filename) {
         // todo, lots of work here, similar to receive.ts
@@ -14,6 +15,13 @@ class CallFunction {
         if (chain) {
             new field_chain_1.FieldChain().runSyntax(chain, scope, filename, _reference_1.ReferenceType.DataReadReference);
         }
+        else if (scope.getVersion() === version_1.Version.Cloud
+            && node.findDirectExpression(Expressions.Destination) === undefined) {
+            const functionName = name === null || name === void 0 ? void 0 : name.concatTokens().replace(/'/, "");
+            if (scope.findFunctionModule(functionName) === undefined) {
+                throw new Error(`Function module "${functionName}" not found/released`);
+            }
+        }
         // just recurse
         for (const s of node.findAllExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);

package/build/src/lsp/language_server.js

@@ -49,10 +49,15 @@ class LanguageServer {
         }
         const text = new pretty_printer_1.PrettyPrinter(file, this.reg.getConfig()).run();
         const rows = file.getRawRows();
-        return [{
-                range: LServer.Range.create(0, 0, rows.length, rows[rows.length - 1].length + 1),
-                newText: text,
-            }];
+        if (text === file.getRaw()) {
+            return [];
+        }
+        else {
+            return [{
+                    range: LServer.Range.create(0, 0, rows.length, rows[rows.length - 1].length + 1),
+                    newText: text,
+                }];
+        }
     }
     // https://microsoft.github.io/language-server-protocol/specifications/specification-3-14/#textDocument_publishDiagnostics
     diagnostics(textDocument) {

package/build/src/pretty_printer/pretty_printer.js

@@ -4,7 +4,6 @@ exports.PrettyPrinter = void 0;
 const _statement_1 = require("../abap/2_statements/statements/_statement");
 const fix_keyword_case_1 = require("./fix_keyword_case");
 const indent_1 = require("./indent");
-const remove_sequential_blanks_1 = require("./remove_sequential_blanks");
 const position_1 = require("../position");
 const indentation_1 = require("../rules/indentation");
 class PrettyPrinter {
@@ -34,8 +33,6 @@ class PrettyPrinter {
         }
         const indentation = new indent_1.Indent(this.options);
         this.result = indentation.execute(this.file, this.result);
-        const removeBlanks = new remove_sequential_blanks_1.RemoveSequentialBlanks(this.config);
-        this.result = removeBlanks.execute(this.file, this.result);
         return this.result;
     }
 }

package/build/src/registry.js

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

package/build/src/rules/sql_escape_host_variables.js

@@ -51,7 +51,7 @@ class SQLEscapeHostVariables extends _abap_rule_1.ABAPRule {
                 || s.get() instanceof Statements.SelectLoop
                 || s.get() instanceof Statements.InsertDatabase
                 || s.get() instanceof Statements.DeleteDatabase) {
-                for (const o of s.findAllExpressions(Expressions.SQLSource)) {
+                for (const o of s.findAllExpressionsMulti([Expressions.SQLSource, Expressions.SQLSourceSimple])) {
                     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)) {

package/build/src/rules/strict_sql.js

@@ -53,6 +53,7 @@ Activates from v750 and up`,
                 || s.get() instanceof Statements.SelectLoop) {
                 const expr = s.findDirectExpression(Expressions.Select);
                 const where = expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLCond);
+                const order = expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLOrderBy);
                 const into = (expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLIntoStructure))
                     || (expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLIntoTable));
                 if (into === undefined || where === undefined) {
@@ -62,8 +63,11 @@ Activates from v750 and up`,
                     continue;
                 }
                 const fix1 = edit_helper_1.EditHelper.deleteRange(file, into.getFirstToken().getStart(), into.getLastToken().getEnd());
-                const whereLast = where.getLastToken();
-                const fix2 = edit_helper_1.EditHelper.insertAt(file, whereLast.getEnd(), " " + into.concatTokens());
+                let last = where.getLastToken();
+                if (order && order.getLastToken().getEnd().isAfter(last.getEnd())) {
+                    last = order.getLastToken();
+                }
+                const fix2 = edit_helper_1.EditHelper.insertAt(file, last.getEnd(), " " + into.concatTokens());
                 const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
                 const message = "INTO/APPENDING must be last in strict SQL";
                 const issue = issue_1.Issue.atToken(file, s.getFirstToken(), message, this.getMetadata().key, this.conf.severity, fix);

package/package.json

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

package/build/src/pretty_printer/remove_sequential_blanks.js

@@ -1,50 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoveSequentialBlanks = void 0;
-const rules_1 = require("../rules");
-class RemoveSequentialBlanks {
-    constructor(config) {
-        this.config = config;
-    }
-    execute(file, modified) {
-        const sequentialBlankConfig = this.getSequentialBlankConfig();
-        if (sequentialBlankConfig) {
-            return this.withoutSequentialBlanks(file, modified, sequentialBlankConfig.lines);
-        }
-        return modified;
-    }
-    withoutSequentialBlanks(file, modified, threshold) {
-        const rows = file.getRawRows();
-        let blanks = 0;
-        const rowsToRemove = [];
-        const newBlankCount = (current, row) => {
-            return rules_1.SequentialBlank.isBlankOrWhitespace(row) ? current + 1 : 0;
-        };
-        for (let i = 0; i < rows.length; i++) {
-            blanks = newBlankCount(blanks, rows[i]);
-            if (blanks === threshold) {
-                // count additional blanks
-                for (let j = i; j < rows.length; j++) {
-                    if (rules_1.SequentialBlank.isBlankOrWhitespace(rows[j])) {
-                        rowsToRemove.push(j);
-                    }
-                    else {
-                        break;
-                    }
-                }
-            }
-        }
-        return this.removeRows(modified.split("\n"), rowsToRemove);
-    }
-    removeRows(lines, rowsToRemove) {
-        const withoutRemoved = lines.filter((_, idx) => {
-            return rowsToRemove.indexOf(idx) === -1;
-        });
-        return withoutRemoved.join("\n").trim();
-    }
-    getSequentialBlankConfig() {
-        return this.config.readByRule(new rules_1.SequentialBlank().getMetadata().key);
-    }
-}
-exports.RemoveSequentialBlanks = RemoveSequentialBlanks;
-//# sourceMappingURL=remove_sequential_blanks.js.map