@abaplint/core 2.113.168 → 2.113.170

package/build/abaplint.d.ts

@@ -592,9 +592,9 @@ export declare class BuiltIn {
         [name: string]: IBuiltinMethod;
     };
     private row;
-    private buildDefinition;
-    searchBuiltin(name: string | undefined): IMethodDefinition | undefined;
-    isPredicate(name: string | undefined): boolean | undefined;
+    private static buildDefinition;
+    static searchBuiltin(name: string | undefined): IMethodDefinition | undefined;
+    static isPredicate(name: string | undefined): boolean | undefined;
     getTypes(): TypedIdentifier[];
     get(extras: string[]): TypedIdentifier[];
     private buildVariable;

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

@@ -12,7 +12,7 @@ class NewObject extends combi_1.Expression {
         const lines = (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), _1.Source, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const linesFields = (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), (0, combi_1.plus)(field_assignment_1.FieldAssignment), (0, combi_1.tok)(tokens_1.WParenRightW)));
         const neww = (0, combi_1.seq)("NEW", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.optPrio)((0, combi_1.alt)(_1.Source, _1.ParameterListS, lines, linesFields)), ")");
-        return (0, combi_1.ver)(version_1.Version.v740sp02, neww);
+        return (0, combi_1.ver)(version_1.Version.v740sp02, neww, version_1.Version.OpenABAP);
     }
 }
 exports.NewObject = NewObject;

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

@@ -22,7 +22,7 @@ class Source extends combi_1.Expression {
         // paren used for eg. "( 2 + 1 ) * 4"
         const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), Source, rparen);
         const after = (0, combi_1.seq)((0, combi_1.altPrio)("&", "&&", _1.ArithOperator), Source);
-        const bool = (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.ver)(version_1.Version.v702, (0, combi_1.regex)(/^BOOLC$/i)), (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.regex)(/^XSDBOOL$/i))), (0, combi_1.tok)(tokens_1.ParenLeftW), _1.Cond, ")");
+        const bool = (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.ver)(version_1.Version.v702, (0, combi_1.regex)(/^BOOLC$/i), version_1.Version.OpenABAP), (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.regex)(/^XSDBOOL$/i)), version_1.Version.OpenABAP), (0, combi_1.tok)(tokens_1.ParenLeftW), _1.Cond, ")");
         const prefix = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WPlus), "BIT-NOT");
         const old = (0, combi_1.seq)((0, combi_1.optPrio)(prefix), (0, combi_1.altPrio)(_1.Constant, _1.StringTemplate, text_element_1.TextElement, bool, method, (0, combi_1.seq)(_1.FieldChain, deref), paren), (0, combi_1.optPrio)(after));
         const corr = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("CORRESPONDING", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CorrespondingBody, rparen, (0, combi_1.optPrio)(after)));

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

@@ -99,7 +99,7 @@ class BuiltIn {
     constructor() {
         this.row = 1;
     }
-    buildDefinition(method, name) {
+    static buildDefinition(method, name) {
         if (method.cache) {
             return method.cache;
         }
@@ -108,7 +108,7 @@ class BuiltIn {
         method.cache = result;
         return result;
     }
-    searchBuiltin(name) {
+    static searchBuiltin(name) {
         if (name === undefined) {
             return undefined;
         }
@@ -118,7 +118,7 @@ class BuiltIn {
         }
         return this.buildDefinition(def, name);
     }
-    isPredicate(name) {
+    static isPredicate(name) {
         if (name === undefined) {
             return undefined;
         }

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

@@ -46,7 +46,7 @@ class MethodCallChain {
                 // eslint-disable-next-line prefer-const
                 let { method, def: foundDef } = helper.searchMethodName(def, methodName);
                 if (method === undefined && current === first) {
-                    method = new _builtin_1.BuiltIn().searchBuiltin(methodName === null || methodName === void 0 ? void 0 : methodName.toUpperCase());
+                    method = _builtin_1.BuiltIn.searchBuiltin(methodName === null || methodName === void 0 ? void 0 : methodName.toUpperCase());
                     if (method) {
                         input.scope.addReference(methodToken, method, _reference_1.ReferenceType.BuiltinMethodReference, input.filename);
                     }

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

@@ -11,11 +11,15 @@ const basic_types_1 = require("../basic_types");
 const _type_utils_1 = require("../_type_utils");
 const _syntax_input_1 = require("../_syntax_input");
 const assert_error_1 = require("../assert_error");
+const _typed_identifier_1 = require("../../types/_typed_identifier");
 class NewObject {
     static runSyntax(node, input, targetType) {
         let ret = undefined;
         const typeExpr = node.findDirectExpression(Expressions.TypeNameOrInfer);
         const typeToken = typeExpr === null || typeExpr === void 0 ? void 0 : typeExpr.getFirstToken();
+        if (typeToken === undefined) {
+            throw new Error("NewObject, child TypeNameOrInfer not found");
+        }
         const typeName = typeExpr === null || typeExpr === void 0 ? void 0 : typeExpr.concatTokens();
         if (typeName === undefined) {
             throw new assert_error_1.AssertError("NewObject, child TypeNameOrInfer not found");
@@ -23,7 +27,8 @@ class NewObject {
         else if (typeName === "#" && targetType && targetType instanceof basic_1.ObjectReferenceType) {
             const clas = input.scope.findClassDefinition(targetType.getIdentifierName());
             if (clas) {
-                input.scope.addReference(typeToken, clas, _reference_1.ReferenceType.InferredType, input.filename);
+                const tid = new _typed_identifier_1.TypedIdentifier(typeToken, input.filename, targetType);
+                input.scope.addReference(typeToken, tid, _reference_1.ReferenceType.InferredType, input.filename);
                 input.scope.addReference(typeToken, clas, _reference_1.ReferenceType.ConstructorReference, input.filename, { ooName: clas.getName() });
             }
             else {

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

@@ -55,14 +55,14 @@ class Source {
                     break;
                 case "BOOLC":
                     {
-                        const method = new _builtin_1.BuiltIn().searchBuiltin(tok);
+                        const method = _builtin_1.BuiltIn.searchBuiltin(tok);
                         input.scope.addReference(token, method, _reference_1.ReferenceType.BuiltinMethodReference, input.filename);
                         cond_1.Cond.runSyntax(node.findDirectExpression(Expressions.Cond), input);
                         return basic_1.StringType.get();
                     }
                 case "XSDBOOL":
                     {
-                        const method = new _builtin_1.BuiltIn().searchBuiltin(tok);
+                        const method = _builtin_1.BuiltIn.searchBuiltin(tok);
                         input.scope.addReference(token, method, _reference_1.ReferenceType.BuiltinMethodReference, input.filename);
                         cond_1.Cond.runSyntax(node.findDirectExpression(Expressions.Cond), input);
                         return new basic_1.CharacterType(1, { qualifiedName: "ABAP_BOOL", ddicName: "ABAP_BOOL" });
@@ -307,7 +307,8 @@ class Source {
         if (typeName === "#" && inferredType && typeToken) {
             const found = basic.lookupQualifiedName(inferredType.getQualifiedName());
             if (found) {
-                input.scope.addReference(typeToken, found, _reference_1.ReferenceType.InferredType, input.filename, { foundQualified: true });
+                const tid = new _typed_identifier_1.TypedIdentifier(typeToken, input.filename, inferredType);
+                input.scope.addReference(typeToken, tid, _reference_1.ReferenceType.InferredType, input.filename, { foundQualified: true });
             }
             else if (inferredType instanceof basic_1.ObjectReferenceType) {
                 const def = input.scope.findObjectDefinition(inferredType.getQualifiedName());

package/build/src/lsp/_lookup.js

@@ -214,7 +214,7 @@ class LSPLookup {
             ret += "\n\n" + this.dumpType(ref.resolved);
         }
         else if (ref.referenceType === _reference_1.ReferenceType.BuiltinMethodReference) {
-            const builtinDef = new _builtin_1.BuiltIn().searchBuiltin((_e = (_d = ref.resolved) === null || _d === void 0 ? void 0 : _d.getName()) === null || _e === void 0 ? void 0 : _e.toUpperCase());
+            const builtinDef = _builtin_1.BuiltIn.searchBuiltin((_e = (_d = ref.resolved) === null || _d === void 0 ? void 0 : _d.getName()) === null || _e === void 0 ? void 0 : _e.toUpperCase());
             if (builtinDef === undefined) {
                 return "Error: builtin method signature not found";
             }

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.168";
+        return "2.113.170";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/build/src/rules/downport.js

@@ -2779,7 +2779,7 @@ ${indentation}    output = ${uniqueName}.\n`;
             const spag = highSyntax.spaghetti.lookupPosition(high.getFirstToken().getStart(), lowFile.getFilename());
             for (const r of (spag === null || spag === void 0 ? void 0 : spag.getData().references) || []) {
                 if (r.referenceType === _reference_1.ReferenceType.BuiltinMethodReference &&
-                    new _builtin_1.BuiltIn().isPredicate(chain.getFirstToken().getStr().toUpperCase())) {
+                    _builtin_1.BuiltIn.isPredicate(chain.getFirstToken().getStr().toUpperCase())) {
                     predicate = true;
                     break;
                 }
@@ -2992,6 +2992,15 @@ ${indentation}    output = ${uniqueName}.\n`;
                         cdef = r.resolved;
                     }
                 }
+                if (cdef instanceof _typed_identifier_1.TypedIdentifier) {
+                    const foo = cdef.getType();
+                    if (foo instanceof basic_1.ObjectReferenceType) {
+                        cdef = foo.getIdentifier();
+                    }
+                    else {
+                        throw new Error("newParameters, downport, unexpected");
+                    }
+                }
                 if (cdef && cdef.getMethodDefinitions === undefined) {
                     return undefined; // something wrong
                 }

package/build/src/rules/method_overwrites_builtin.js

@@ -48,9 +48,8 @@ ENDCLASS.`,
         for (const classDef of file.getInfo().listClassDefinitions()) {
             methods = methods.concat(classDef.methods);
         }
-        const builtIn = new _builtin_1.BuiltIn();
         for (const method of methods) {
-            if (builtIn.searchBuiltin(method.name.toUpperCase())) {
+            if (_builtin_1.BuiltIn.searchBuiltin(method.name.toUpperCase())) {
                 const message = `Method name "${method.name}" overwrites built-in SAP function name`;
                 issues.push(issue_1.Issue.atIdentifier(method.identifier, message, this.getMetadata().key));
             }

package/package.json

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