@abaplint/core 2.119.42 → 2.119.44

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

@@ -277,9 +277,23 @@ class Select {
             }
         }
     }
+    static countResultType(scope) {
+        if ((0, version_1.releaseAtLeast)(scope.getRelease(), version_1.Release.v750)
+            || scope.getOpenABAP()
+            || scope.getLanguageVersion() === version_1.LanguageVersion.Cloud) {
+            return new basic_1.Integer8Type();
+        }
+        else {
+            return basic_1.IntegerType.get();
+        }
+    }
     static buildStructureType(fields, dbSources, scope) {
         var _a, _b, _c, _d, _e, _f;
         if (fields.length === 1 && dbSources.length === 1) {
+            // COUNT( * ) yields an integer regardless of the (possibly dynamic) table
+            if (/^count\(\s*\*\s*\)$/i.test(fields[0].code)) {
+                return this.countResultType(scope);
+            }
             const dbType = (_a = dbSources[0]) === null || _a === void 0 ? void 0 : _a.parseType(scope.getRegistry());
             if (dbType === undefined) {
                 const name = ((_b = dbSources[0]) === null || _b === void 0 ? void 0 : _b.getName()) || "buildStructureTypeError";
@@ -300,9 +314,9 @@ class Select {
                         return field;
                     }
                     else if (fields[0].code === "COUNT(*)") {
-                        if (scope.getVersion() >= version_1.Version.v750
-                            || scope.getVersion() === version_1.Version.OpenABAP
-                            || scope.getVersion() === version_1.Version.Cloud) {
+                        if ((0, version_1.releaseAtLeast)(scope.getRelease(), version_1.Release.v750)
+                            || scope.getOpenABAP()
+                            || scope.getLanguageVersion() === version_1.LanguageVersion.Cloud) {
                             return new basic_1.Integer8Type();
                         }
                         else {

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

@@ -49,7 +49,7 @@ class CallFunction {
         if (chain) {
             field_chain_1.FieldChain.runSyntax(chain, input, _reference_1.ReferenceType.DataReadReference);
         }
-        else if (input.scope.getVersion() === version_1.Version.Cloud
+        else if (input.scope.getLanguageVersion() === version_1.LanguageVersion.Cloud
             && node.findDirectExpression(Expressions.Destination) === undefined) {
             const functionName = name === null || name === void 0 ? void 0 : name.concatTokens().replace(/'/g, "");
             if (input.scope.findFunctionModule(functionName) === undefined) {

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

@@ -131,7 +131,7 @@ class Loop {
                     input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                     return;
                 }
-                if (input.scope.getRegistry().getConfig().getVersion() <= version_1.Version.v740sp02) {
+                if (!(0, version_1.releaseAtLeast)(input.scope.getRelease(), version_1.Release.v740sp02)) {
                     const compares = cond.findAllExpressionsRecursive(Expressions.ComponentCompare).map(c => c.concatTokens().toUpperCase());
                     for (const keyField of key.keyFields) {
                         if (compares.find(c => c === keyField.toUpperCase() + " IS INITIAL") !== undefined) {

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

@@ -51,9 +51,9 @@ class MoveCorresponding {
         }
         const sourceType = source_1.Source.runSyntax(s, input);
         const targetType = target_1.Target.runSyntax(t, input);
-        if (input.scope.getVersion() < version_1.Version.v740sp05
-            && input.scope.getVersion() !== version_1.Version.Cloud
-            && input.scope.getVersion() !== version_1.Version.OpenABAP) {
+        if (!(0, version_1.releaseAtLeast)(input.scope.getRelease(), version_1.Release.v740sp05)
+            && input.scope.getLanguageVersion() !== version_1.LanguageVersion.Cloud
+            && !input.scope.getOpenABAP()) {
             if (sourceType instanceof basic_1.TableType && sourceType.isWithHeader() === false) {
                 const message = "MOVE-CORRESPONDING with tables possible from v740sp05";
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));

package/build/src/abap/abap_parser.js

@@ -9,10 +9,25 @@ const statement_parser_1 = require("./2_statements/statement_parser");
 const structure_parser_1 = require("./3_structures/structure_parser");
 const version_1 = require("../version");
 class ABAPParser {
-    constructor(version, globalMacros, reg) {
-        this.version = version ? version : version_1.defaultVersion;
-        this.globalMacros = globalMacros ? globalMacros : [];
-        this.reg = reg;
+    constructor(optionsOrRelease, globalMacros, reg) {
+        var _a, _b, _c, _d;
+        if (optionsOrRelease === undefined || ABAPParser.isRelease(optionsOrRelease)) {
+            this.release = optionsOrRelease !== null && optionsOrRelease !== void 0 ? optionsOrRelease : version_1.defaultRelease;
+            this.languageVersion = version_1.LanguageVersion.Normal;
+            this.openABAP = false;
+            this.globalMacros = globalMacros !== null && globalMacros !== void 0 ? globalMacros : [];
+            this.reg = reg;
+        }
+        else {
+            this.release = (_a = optionsOrRelease.release) !== null && _a !== void 0 ? _a : version_1.defaultRelease;
+            this.languageVersion = (_b = optionsOrRelease.languageVersion) !== null && _b !== void 0 ? _b : version_1.LanguageVersion.Normal;
+            this.openABAP = (_c = optionsOrRelease.openABAP) !== null && _c !== void 0 ? _c : false;
+            this.globalMacros = (_d = optionsOrRelease.globalMacros) !== null && _d !== void 0 ? _d : [];
+            this.reg = optionsOrRelease.reg;
+        }
+    }
+    static isRelease(o) {
+        return typeof o.ordinal === "number";
     }
     // files is input for a single object
     parse(files) {
@@ -25,7 +40,8 @@ class ABAPParser {
         const lexingRuntime = Date.now() - b1;
         // 2: statements
         const b2 = Date.now();
-        const statementResult = new statement_parser_1.StatementParser(this.version, this.reg).run(lexerResult, this.globalMacros);
+        const statementResult = new statement_parser_1.StatementParser(this.release, this.reg, this.languageVersion, this.openABAP)
+            .run(lexerResult, this.globalMacros);
         const statementsRuntime = Date.now() - b2;
         // 3: structures
         const b3 = Date.now();

package/build/src/abap/nodes/expression_node.js

@@ -9,6 +9,9 @@ class ExpressionNode extends _abstract_node_1.AbstractNode {
         super();
         this.expression = expression;
     }
+    addChild(_n) {
+        throw new Error("ExpressionNode: addChild() must not be called, nodes are immutable after setChildren()");
+    }
     get() {
         return this.expression;
     }

package/build/src/cds/expressions/cds_define_projection.js

@@ -6,7 +6,7 @@ const __1 = require("../..");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSDefineProjection extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), (0, combi_1.opt)("TRANSIENT"), "VIEW", (0, combi_1.ver)(__1.Version.v755, (0, combi_1.opt)("ENTITY")), _1.CDSName, (0, combi_1.opt)(_1.CDSProviderContract), (0, combi_1.opt)(_1.CDSWithParameters), "AS PROJECTION ON", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs), (0, combi_1.star)(_1.CDSAssociation), (0, combi_1.str)("{"), (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(",")), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), "DEFINE", (0, combi_1.opt)("ROOT"), (0, combi_1.opt)("TRANSIENT"), "VIEW", (0, combi_1.ver)(__1.Release.v755, (0, combi_1.opt)("ENTITY")), _1.CDSName, (0, combi_1.opt)(_1.CDSProviderContract), (0, combi_1.opt)(_1.CDSWithParameters), "AS PROJECTION ON", _1.CDSName, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs), (0, combi_1.star)(_1.CDSAssociation), (0, combi_1.str)("{"), (0, combi_1.seq)(_1.CDSElement, (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.opt)(",")), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineProjection = CDSDefineProjection;

package/build/src/cds/expressions/cds_define_view.js

@@ -10,7 +10,7 @@ const cds_with_parameters_1 = require("./cds_with_parameters");
 class CDSDefineView extends combi_1.Expression {
     getRunnable() {
         const columnAlias = (0, combi_1.seq)("(", cds_name_1.CDSName, (0, combi_1.star)((0, combi_1.seq)(",", cds_name_1.CDSName)), ")");
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), "VIEW", (0, combi_1.ver)(__1.Version.v755, (0, combi_1.opt)("ENTITY")), cds_name_1.CDSName, (0, combi_1.opt)(columnAlias), (0, combi_1.opt)(cds_with_parameters_1.CDSWithParameters), "AS", cds_select_1.CDSSelect, (0, combi_1.opt)(";"));
+        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.opt)("DEFINE"), (0, combi_1.opt)("ROOT"), "VIEW", (0, combi_1.ver)(__1.Release.v755, (0, combi_1.opt)("ENTITY")), cds_name_1.CDSName, (0, combi_1.opt)(columnAlias), (0, combi_1.opt)(cds_with_parameters_1.CDSWithParameters), "AS", cds_select_1.CDSSelect, (0, combi_1.opt)(";"));
     }
 }
 exports.CDSDefineView = CDSDefineView;

package/build/src/config.js

@@ -39,7 +39,7 @@ const artifacts_rules_1 = require("./artifacts_rules");
 const JSON5 = __importStar(require("json5"));
 // assumption: this class is immutable
 class Config {
-    static getDefault(ver) {
+    static getDefault(ver, langVer, openABAP) {
         const rules = {};
         const sorted = artifacts_rules_1.ArtifactsRules.getRules().sort((a, b) => {
             return a.getMetadata().key.localeCompare(b.getMetadata().key);
@@ -75,6 +75,8 @@ class Config {
                 }],
             syntax: {
                 version,
+                languageVersion: langVer,
+                openABAP,
                 errorNamespace: "^(Z|Y|LCL\_|TY\_|LIF\_)",
                 globalConstants: [],
                 globalMacros: [],
@@ -155,12 +157,22 @@ class Config {
     getSyntaxSetttings() {
         return this.config.syntax;
     }
+    getRelease() {
+        return (0, version_1.versionToABAPRelease)(this.getVersion());
+    }
+    getOpenABAP() {
+        return this.config.syntax.openABAP === true;
+    }
     getVersion() {
         if (this.config.global === undefined || this.config.syntax.version === undefined) {
             return version_1.defaultVersion;
         }
         return this.config.syntax.version;
     }
+    getLanguageVersion() {
+        var _a;
+        return (_a = this.config.syntax.languageVersion) !== null && _a !== void 0 ? _a : version_1.LanguageVersion.Normal;
+    }
     checkVersion() {
         if (this.config.syntax.version === undefined) {
             return; // handled in getVersion
@@ -175,6 +187,15 @@ class Config {
         }
         if (match === false) {
             this.config.syntax.version = version_1.defaultVersion;
+            return;
+        }
+        if (this.config.syntax.version === version_1.Version.Cloud) {
+            this.config.syntax.version = version_1.Version.Newest;
+            this.config.syntax.languageVersion = version_1.LanguageVersion.Cloud;
+        }
+        else if (this.config.syntax.version === version_1.Version.OpenABAP) {
+            this.config.syntax.version = version_1.Version.v702;
+            this.config.syntax.openABAP = true;
         }
     }
 }

package/build/src/index.js

@@ -33,14 +33,18 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Position = exports.CurrentScope = exports.RulesRunner = exports.SpaghettiScope = exports.SyntaxLogic = exports.ABAPObject = exports.Tokens = exports.ExpressionsCDS = exports.CDSParser = exports.LanguageServerTypes = exports.DDLParser = exports.AbstractFile = exports.ABAPFile = exports.MemoryFile = exports.Edits = exports.ReferenceType = exports.NativeSQL = exports.MacroContent = exports.MacroCall = exports.SpaghettiScopeNode = exports.Token = exports.ScopeType = exports.BasicTypes = exports.TypedIdentifier = exports.AbstractType = exports.VirtualPosition = exports.Comment = exports.Unknown = exports.Empty = exports.Identifier = exports.Nodes = exports.Types = exports.Expressions = exports.Statements = exports.Structures = exports.SkipLogic = exports.Objects = exports.ArtifactsRules = exports.ArtifactsObjects = exports.ArtifactsABAP = exports.BuiltIn = exports.FormLengthStats = exports.FunctionLengthStats = exports.MethodLengthStats = exports.LanguageServer = exports.Registry = exports.CyclomaticComplexityStats = exports.Version = exports.Config = exports.Issue = void 0;
-exports.LSPEdit = exports.RuleTag = exports.Severity = exports.Visibility = exports.Info = exports.Diagnostics = exports.Rename = exports.PrettyPrinter = void 0;
+exports.SyntaxLogic = exports.ABAPObject = exports.Tokens = exports.ExpressionsCDS = exports.CDSParser = exports.LanguageServerTypes = exports.DDLParser = exports.AbstractFile = exports.ABAPFile = exports.MemoryFile = exports.Edits = exports.ReferenceType = exports.NativeSQL = exports.MacroContent = exports.MacroCall = exports.SpaghettiScopeNode = exports.Token = exports.ScopeType = exports.BasicTypes = exports.TypedIdentifier = exports.AbstractType = exports.VirtualPosition = exports.Comment = exports.Unknown = exports.Empty = exports.Identifier = exports.Nodes = exports.Types = exports.Expressions = exports.Statements = exports.Structures = exports.SkipLogic = exports.Objects = exports.ArtifactsRules = exports.ArtifactsObjects = exports.ArtifactsABAP = exports.BuiltIn = exports.FormLengthStats = exports.FunctionLengthStats = exports.MethodLengthStats = exports.LanguageServer = exports.Registry = exports.CyclomaticComplexityStats = exports.versionToABAPRelease = exports.releaseAtLeast = exports.Release = exports.LanguageVersion = exports.Version = exports.Config = exports.Issue = void 0;
+exports.LSPEdit = exports.RuleTag = exports.Severity = exports.Visibility = exports.Info = exports.Diagnostics = exports.Rename = exports.PrettyPrinter = exports.Position = exports.CurrentScope = exports.RulesRunner = exports.SpaghettiScope = void 0;
 const issue_1 = require("./issue");
 Object.defineProperty(exports, "Issue", { enumerable: true, get: function () { return issue_1.Issue; } });
 const config_1 = require("./config");
 Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return config_1.Config; } });
 const version_1 = require("./version");
 Object.defineProperty(exports, "Version", { enumerable: true, get: function () { return version_1.Version; } });
+Object.defineProperty(exports, "LanguageVersion", { enumerable: true, get: function () { return version_1.LanguageVersion; } });
+Object.defineProperty(exports, "Release", { enumerable: true, get: function () { return version_1.Release; } });
+Object.defineProperty(exports, "releaseAtLeast", { enumerable: true, get: function () { return version_1.releaseAtLeast; } });
+Object.defineProperty(exports, "versionToABAPRelease", { enumerable: true, get: function () { return version_1.versionToABAPRelease; } });
 const registry_1 = require("./registry");
 Object.defineProperty(exports, "Registry", { enumerable: true, get: function () { return registry_1.Registry; } });
 const method_length_stats_1 = require("./utils/method_length_stats");

package/build/src/objects/_abap_object.js

@@ -4,6 +4,7 @@ exports.ABAPObject = void 0;
 const _abstract_object_1 = require("./_abstract_object");
 const xml_utils_1 = require("../xml_utils");
 const abap_parser_1 = require("../abap/abap_parser");
+const version_1 = require("../version");
 class ABAPObject extends _abstract_object_1.AbstractObject {
     [Symbol.for("debug.description")]() {
         return `${this.constructor.name} ${this.getName()}`;
@@ -17,12 +18,12 @@ class ABAPObject extends _abstract_object_1.AbstractObject {
     static is(x) {
         return !!x && x instanceof ABAPObject;
     }
-    parse(version, globalMacros, reg) {
+    parse(release, globalMacros, reg, languageVersion = version_1.LanguageVersion.Normal, openABAP = false) {
         if (this.isDirty() === false) {
             return { updated: false, runtime: 0 };
         }
         const abapFiles = this.getFiles().filter(f => f.getFilename().endsWith(".abap"));
-        const result = new abap_parser_1.ABAPParser(version, globalMacros, reg).parse(abapFiles);
+        const result = new abap_parser_1.ABAPParser({ release, globalMacros, reg, languageVersion, openABAP }).parse(abapFiles);
         this.parsed = result.output;
         this.old = result.issues;
         this.dirty = false;

package/build/src/objects/_abstract_object.js

@@ -15,7 +15,7 @@ class AbstractObject {
     getParsingIssues() {
         return this.old;
     }
-    parse(_version, _globalMacros, _reg) {
+    parse(_release, _globalMacros, _reg, _languageVersion, _openABAP) {
         return { updated: false, runtime: 0 };
     }
     getName() {

package/build/src/objects/proxy_object.js

@@ -25,7 +25,7 @@ class ProxyObject extends _abstract_object_1.AbstractObject {
         this.parsedXML = undefined;
         super.setDirty();
     }
-    parse(_version, _globalMacros, reg) {
+    parse(_release, _globalMacros, reg) {
         if (this.parsedXML) {
             return { updated: false, runtime: 0 };
         }

package/build/src/objects/table.js

@@ -128,7 +128,7 @@ class Table extends _abstract_object_1.AbstractObject {
                 return new Types.UnknownType("Table, parser error");
             }
         }
-        if (reg.getConfig().getVersion() === version_1.Version.Cloud
+        if (reg.getConfig().getLanguageVersion() === version_1.LanguageVersion.Cloud
             && this.parsedData.dataClass === "USER3") {
             return new Types.UnknownType("Data class = USER3 not allowed in cloud");
         }

package/build/src/registry.js

@@ -74,7 +74,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.42";
+        return "2.119.44";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -309,7 +309,7 @@ class Registry {
         ParsingPerformance.clear();
         (_a = input === null || input === void 0 ? void 0 : input.progress) === null || _a === void 0 ? void 0 : _a.set(this.getObjectCount().total, "Lexing and parsing");
         for (const o of this.getObjects()) {
-            await ((_b = input === null || input === void 0 ? void 0 : input.progress) === null || _b === void 0 ? void 0 : _b.tick("Lexing and parsing(" + this.conf.getVersion() + ") - " + o.getType() + " " + o.getName()));
+            await ((_b = input === null || input === void 0 ? void 0 : input.progress) === null || _b === void 0 ? void 0 : _b.tick("Lexing and parsing(" + this.conf.getRelease().name + ") - " + o.getType() + " " + o.getName()));
             this.parsePrivate(o);
         }
         if ((input === null || input === void 0 ? void 0 : input.outputPerformance) === true) {
@@ -322,7 +322,7 @@ class Registry {
     // todo, refactor, this is a mess, see where-used, a lot of the code should be in this method instead
     parsePrivate(input) {
         const config = this.getConfig();
-        const result = input.parse(config.getVersion(), config.getSyntaxSetttings().globalMacros, this);
+        const result = input.parse(config.getRelease(), config.getSyntaxSetttings().globalMacros, this, config.getLanguageVersion(), config.getOpenABAP());
         ParsingPerformance.push(input, result);
     }
     isDirty() {

package/build/src/rules/ambiguous_statement.js

@@ -77,7 +77,7 @@ MODIFY TABLE foo FROM bar.`,
     }
     runParsed(file) {
         const issues = [];
-        if (this.reg.getConfig().getVersion() < version_1.Version.v740sp05) {
+        if (!(0, version_1.releaseAtLeast)(this.reg.getConfig().getRelease(), version_1.Release.v740sp05)) {
             return [];
         }
         for (const statement of file.getStatements()) {

package/build/src/rules/avoid_use.js

@@ -151,8 +151,8 @@ BREAK points`,
                 issues.push(issue_1.Issue.atStatement(file, statementNode, this.getDescription(message), this.getMetadata().key, this.conf.severity, fix));
             }
             if (this.conf.defaultKey
-                && (this.reg.getConfig().getVersion() >= version_1.Version.v740sp02
-                    || this.reg.getConfig().getVersion() === version_1.Version.Cloud)
+                && ((0, version_1.releaseAtLeast)(this.reg.getConfig().getRelease(), version_1.Release.v740sp02)
+                    || this.reg.getConfig().getLanguageVersion() === version_1.LanguageVersion.Cloud)
                 && (statement instanceof Statements.Data || statement instanceof Statements.Type)) {
                 const tt = (_a = statementNode.findFirstExpression(expressions_1.TypeTable)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(expressions_1.TypeTableKey);
                 const token = tt === null || tt === void 0 ? void 0 : tt.findDirectTokenByText("DEFAULT");

package/build/src/rules/call_transaction_authority_check.js

@@ -47,7 +47,7 @@ class CallTransactionAuthorityCheck extends _abap_rule_1.ABAPRule {
     constructor() {
         super(...arguments);
         this.conf = new CallTransactionAuthorityCheckConf();
-        this.MINIMUM_VERSION = version_1.Version.v740sp02;
+        this.MINIMUM_VERSION = version_1.Release.v740sp02;
     }
     getMetadata() {
         return {
@@ -73,9 +73,9 @@ ENDTRY.`,
         this.conf = conf;
     }
     runParsed(file, obj) {
-        const currentVersion = this.reg.getConfig().getVersion();
         // Cloud version does not support CALL TRANSACTION
-        if (currentVersion < this.MINIMUM_VERSION || currentVersion === version_1.Version.Cloud) {
+        if (!(0, version_1.releaseAtLeast)(this.reg.getConfig().getRelease(), this.MINIMUM_VERSION)
+            || this.reg.getConfig().getLanguageVersion() === version_1.LanguageVersion.Cloud) {
             return [];
         }
         const issues = [];

package/build/src/rules/cds_legacy_view.js

@@ -39,8 +39,8 @@ v755 and up`,
     }
     run(o) {
         const issues = [];
-        if (this.reg.getConfig().getVersion() < version_1.Version.v755
-            && this.reg.getConfig().getVersion() !== version_1.Version.Cloud) {
+        if (!(0, version_1.releaseAtLeast)(this.reg.getConfig().getRelease(), version_1.Release.v755)
+            && this.reg.getConfig().getLanguageVersion() !== version_1.LanguageVersion.Cloud) {
             return [];
         }
         if (o.getType() !== "DDLS" || !(o instanceof objects_1.DataDefinition)) {

package/build/src/rules/cloud_types.js

@@ -117,7 +117,7 @@ class CloudTypes {
             || obj instanceof Objects.Transformation;
     }
     run(obj) {
-        if (this.reg.getConfig().getVersion() !== version_1.Version.Cloud || CloudTypes.isCloud(obj)) {
+        if (this.reg.getConfig().getLanguageVersion() !== version_1.LanguageVersion.Cloud || CloudTypes.isCloud(obj)) {
             return [];
         }
         const position = new position_1.Position(1, 1);

package/build/src/rules/downport.js

@@ -203,8 +203,8 @@ Make sure to test the downported code, it might not always be completely correct
     }
     initialize(reg) {
         this.lowReg = reg;
-        const version = this.lowReg.getConfig().getVersion();
-        if (version === version_1.Version.v702 || version === version_1.Version.OpenABAP) {
+        const config = this.lowReg.getConfig();
+        if (config.getRelease() === version_1.Release.v702 || config.getOpenABAP()) {
             this.initHighReg();
         }
         return this;
@@ -236,8 +236,8 @@ Make sure to test the downported code, it might not always be completely correct
         var _a;
         const ret = [];
         this.counter = 1;
-        const version = this.lowReg.getConfig().getVersion();
-        if (version !== version_1.Version.v702 && version !== version_1.Version.OpenABAP) {
+        const config = this.lowReg.getConfig();
+        if (config.getRelease() !== version_1.Release.v702 && !config.getOpenABAP()) {
             return ret;
         }
         else if (!(lowObj instanceof _abap_object_1.ABAPObject)) {
@@ -1091,7 +1091,7 @@ ${indentation}`);
     outlineCatchSimple(node, lowFile) {
         // outlines "CATCH cx_bcs INTO DATA(lx_bcs_excep).", note that this does not need to look at types
         var _a, _b;
-        if (this.lowReg.getConfig().getVersion() === version_1.Version.OpenABAP) {
+        if (this.lowReg.getConfig().getOpenABAP()) {
             return undefined;
         }
         if (!(node.get() instanceof Statements.Catch)) {
@@ -1140,7 +1140,7 @@ ${indentation}CATCH ${className} INTO ${targetName}.`;
         if (!(node.get() instanceof Statements.Move)) {
             return undefined;
         }
-        if (this.lowReg.getConfig().getVersion() === version_1.Version.OpenABAP) {
+        if (this.lowReg.getConfig().getOpenABAP()) {
             return undefined;
         }
         const target = node.findFirstExpression(Expressions.Target);
@@ -1196,7 +1196,7 @@ ${indentation}CATCH ${className} INTO ${targetName}.`;
         return issue_1.Issue.atToken(lowFile, node.getFirstToken(), "Outline DATA", this.getMetadata().key, this.conf.severity, fix);
     }
     partiallyImplemented(node, lowFile) {
-        if (this.lowReg.getConfig().getVersion() === version_1.Version.OpenABAP) {
+        if (this.lowReg.getConfig().getOpenABAP()) {
             return undefined;
         }
         if (node.get() instanceof Statements.InterfaceDef) {
@@ -1872,7 +1872,7 @@ ${indentation}    output = ${uniqueName}.\n`;
         if (!(node.get() instanceof Statements.Loop)) {
             return undefined;
         }
-        if (this.lowReg.getConfig().getVersion() === version_1.Version.OpenABAP) {
+        if (this.lowReg.getConfig().getOpenABAP()) {
             return undefined;
         }
         const source = (_a = node.findDirectExpression(Expressions.LoopSource)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.SimpleSource2);
@@ -2548,7 +2548,7 @@ ${indentation}    output = ${uniqueName}.\n`;
     outlineData(node, lowFile, highSyntax) {
         // hmm, no guard here, as DATA(SDF) is valid in 702
         var _a, _b;
-        if (this.lowReg.getConfig().getVersion() === version_1.Version.OpenABAP) {
+        if (this.lowReg.getConfig().getOpenABAP()) {
             return undefined;
         }
         for (const i of node.findAllExpressionsRecursive(Expressions.InlineData)) {
@@ -2767,7 +2767,7 @@ ${indentation}    output = ${uniqueName}.\n`;
         return false;
     }
     replaceXsdBool(node, lowFile, highSyntax) {
-        if (this.lowReg.getConfig().getVersion() === version_1.Version.OpenABAP) {
+        if (this.lowReg.getConfig().getOpenABAP()) {
             return undefined;
         }
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());
@@ -2896,7 +2896,7 @@ ${indentation}    output = ${uniqueName}.\n`;
     }
     replaceLineFunctions(node, lowFile, highSyntax, highFile) {
         var _a, _b;
-        if (this.lowReg.getConfig().getVersion() === version_1.Version.OpenABAP) {
+        if (this.lowReg.getConfig().getOpenABAP()) {
             return undefined;
         }
         const spag = highSyntax.spaghetti.lookupPosition(node.getFirstToken().getStart(), lowFile.getFilename());

package/build/src/rules/function_module_recommendations.js

@@ -3,9 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionModuleRecommendations = exports.FunctionModuleRecommendationsConf = void 0;
 const expressions_1 = require("../abap/2_statements/expressions");
 const issue_1 = require("../issue");
+const version_1 = require("../version");
 const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const _irule_1 = require("./_irule");
+function resolveRelease(from) {
+    if (version_1.Release[from] !== undefined) {
+        return version_1.Release[from];
+    }
+    try {
+        return (0, version_1.versionToABAPRelease)(from);
+    }
+    catch (_a) {
+        return undefined;
+    }
+}
 class FunctionModuleRecommendationsConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -112,7 +124,7 @@ class FunctionModuleRecommendations extends _abap_rule_1.ABAPRule {
         if (!this.conf.recommendations) {
             return issues;
         }
-        const configVersion = this.reg.getConfig().getVersion();
+        const configRelease = this.reg.getConfig().getRelease();
         for (const exNode of ((_a = file.getStructure()) === null || _a === void 0 ? void 0 : _a.findAllExpressions(expressions_1.FunctionName)) || []) {
             const token = exNode.getFirstToken();
             let funcName = token.getStr().toUpperCase();
@@ -122,7 +134,16 @@ class FunctionModuleRecommendations extends _abap_rule_1.ABAPRule {
             }
             // remove leading and trailing single quote
             funcName = funcName.slice(1, funcName.length - 1);
-            const index = this.conf.recommendations.findIndex(i => i.name.toUpperCase() === funcName && (i.from === undefined || configVersion >= i.from));
+            const index = this.conf.recommendations.findIndex(i => {
+                if (i.name.toUpperCase() !== funcName) {
+                    return false;
+                }
+                if (i.from === undefined) {
+                    return true;
+                }
+                const rel = resolveRelease(i.from);
+                return rel !== undefined && (0, version_1.releaseAtLeast)(configRelease, rel);
+            });
             if (index >= 0) {
                 issues.push(issue_1.Issue.atToken(file, token, this.getMessage(index), this.getMetadata().key, this.conf.severity));
             }

package/build/src/rules/inline_data_old_versions.js

@@ -31,9 +31,9 @@ class InlineDataOldVersions extends _abap_rule_1.ABAPRule {
     }
     runParsed(file) {
         const issues = [];
-        if (this.reg.getConfig().getVersion() >= version_1.Version.v740sp02
-            || this.reg.getConfig().getVersion() === version_1.Version.OpenABAP
-            || this.reg.getConfig().getVersion() === version_1.Version.Cloud) {
+        if ((0, version_1.releaseAtLeast)(this.reg.getConfig().getRelease(), version_1.Release.v740sp02)
+            || this.reg.getConfig().getOpenABAP()
+            || this.reg.getConfig().getLanguageVersion() === version_1.LanguageVersion.Cloud) {
             return [];
         }
         for (const statement of file.getStatements()) {

package/build/src/rules/local_testclass_consistency.js

@@ -32,7 +32,7 @@ class LocalTestclassConsistency extends _abap_rule_1.ABAPRule {
     runParsed(file, obj) {
         var _a, _b, _c;
         const issues = [];
-        if (this.reg.getConfig().getVersion() === version_1.Version.v700) {
+        if (this.reg.getConfig().getRelease() === version_1.Release.v700) {
             // 700 does not have testclass includes
             return [];
         }

package/build/src/rules/main_file_contents.js

@@ -79,7 +79,7 @@ class MainFileContents {
     }
     run(obj) {
         if (!(obj instanceof _abap_object_1.ABAPObject)
-            || this.reg.getConfig().getVersion() === version_1.Version.Cloud) {
+            || this.reg.getConfig().getLanguageVersion() === version_1.LanguageVersion.Cloud) {
             return [];
         }
         const main = obj.getMainABAPFile();

package/build/src/rules/no_inline_in_optional_branches.js

@@ -77,10 +77,10 @@ Not considered optional branches:
     }
     runParsed(file) {
         const output = [];
-        const version = this.reg.getConfig().getVersion();
-        if (version === version_1.Version.v700
-            || version === version_1.Version.v702
-            || version === version_1.Version.OpenABAP) {
+        const release = this.reg.getConfig().getRelease();
+        if (release === version_1.Release.v700
+            || release === version_1.Release.v702
+            || this.reg.getConfig().getOpenABAP()) {
             return [];
         }
         const struc = file.getStructure();

package/build/src/rules/obsolete_statement.js

@@ -192,15 +192,15 @@ ENDIF.`,
         const issues = [];
         const statements = file.getStatements();
         let prev = undefined;
-        const configVersion = this.reg.getConfig().getVersion();
+        const configRelease = this.reg.getConfig().getRelease();
         for (const staNode of statements) {
             const sta = staNode.get();
             if ((sta instanceof Statements.Refresh && this.conf.refresh)
                 || (sta instanceof Statements.Compute && this.conf.compute)
                 || (sta instanceof Statements.Add && this.conf.add)
                 || (sta instanceof Statements.Subtract && this.conf.subtract)
-                || (sta instanceof Statements.ClassDefinitionLoad && this.conf.load && configVersion >= version_1.Version.v702)
-                || (sta instanceof Statements.InterfaceLoad && this.conf.load && configVersion >= version_1.Version.v702)
+                || (sta instanceof Statements.ClassDefinitionLoad && this.conf.load && (0, version_1.releaseAtLeast)(configRelease, version_1.Release.v702))
+                || (sta instanceof Statements.InterfaceLoad && this.conf.load && (0, version_1.releaseAtLeast)(configRelease, version_1.Release.v702))
                 || (sta instanceof Statements.Multiply && this.conf.multiply)
                 || (sta instanceof Statements.Divide && this.conf.divide)
                 || (sta instanceof Statements.Move && this.conf.move
@@ -315,7 +315,7 @@ ENDIF.`,
                     issues.push(issue);
                 }
             }
-            if (this.conf.typePools && sta instanceof Statements.TypePools && configVersion >= version_1.Version.v702) {
+            if (this.conf.typePools && sta instanceof Statements.TypePools && (0, version_1.releaseAtLeast)(configRelease, version_1.Release.v702)) {
                 const fix = edit_helper_1.EditHelper.deleteStatement(file, staNode);
                 const issue = issue_1.Issue.atStatement(file, staNode, "Statement \"TYPE-POOLS\" is obsolete", this.getMetadata().key, this.conf.severity, fix);
                 issues.push(issue);
@@ -373,7 +373,7 @@ ENDIF.`,
                 const issue = issue_1.Issue.atStatement(file, staNode, "SORT extract", this.getMetadata().key, this.conf.severity);
                 issues.push(issue);
             }
-            if (configVersion >= version_1.Version.v754 && this.conf.clientSpecified
+            if ((0, version_1.releaseAtLeast)(configRelease, version_1.Release.v754) && this.conf.clientSpecified
                 && (sta instanceof Statements.Select
                     || sta instanceof Statements.SelectLoop
                     || sta instanceof Statements.DeleteDatabase
@@ -386,7 +386,7 @@ ENDIF.`,
                     issues.push(issue);
                 }
             }
-            if (configVersion >= version_1.Version.v756 && this.conf.regex) {
+            if ((0, version_1.releaseAtLeast)(configRelease, version_1.Release.v756) && this.conf.regex) {
                 if (sta instanceof Statements.Find || sta instanceof Statements.Replace) {
                     if ((_c = staNode.findFirstExpression(Expressions.FindType)) === null || _c === void 0 ? void 0 : _c.concatTokens().includes("REGEX")) {
                         const issue = issue_1.Issue.atStatement(file, staNode, "REGEX obsolete, use PCRE", this.getMetadata().key, this.conf.severity);

package/build/src/rules/parser_702_chaining.js

@@ -67,8 +67,8 @@ Only active on target version 702 and below.`,
     }
     runParsed(file) {
         const issues = [];
-        if (this.reg.getConfig().getVersion() !== version_1.Version.v702
-            && this.reg.getConfig().getVersion() !== version_1.Version.v700) {
+        if (this.reg.getConfig().getRelease() !== version_1.Release.v702
+            && this.reg.getConfig().getRelease() !== version_1.Release.v700) {
             return [];
         }
         const stru = file.getStructure();