@abaplint/cli 2.102.43 → 2.102.45

package/build/cli.js

@@ -21792,7 +21792,8 @@ class TypeUtils {
             }
         }
         else if (source instanceof basic_1.IntegerType) {
-            if (target instanceof basic_1.StringType) {
+            if (target instanceof basic_1.StringType
+                || target instanceof basic_1.PackedType) {
                 return false;
             }
             else if (target instanceof basic_1.Integer8Type) {
@@ -26827,6 +26828,15 @@ class SpaghettiScopeNode extends ScopeData {
         }
         return ret;
     }
+    listInterfaceDefinitions() {
+        let search = this;
+        const ret = [];
+        while (search !== undefined) {
+            ret.push(...Object.values(search.getData().idefs));
+            search = search.getParent();
+        }
+        return ret;
+    }
     findFormDefinition(name) {
         let search = this;
         const upper = name.toUpperCase();
@@ -28164,6 +28174,9 @@ const target_1 = __webpack_require__(/*! ../expressions/target */ "./node_module
 const source_1 = __webpack_require__(/*! ../expressions/source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 const dynamic_1 = __webpack_require__(/*! ../expressions/dynamic */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/dynamic.js");
 const basic_types_1 = __webpack_require__(/*! ../basic_types */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/basic_types.js");
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const _typed_identifier_1 = __webpack_require__(/*! ../../types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
+const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
 class CreateData {
     runSyntax(node, scope, filename) {
         for (const s of node.findDirectExpressions(Expressions.Source)) {
@@ -28177,7 +28190,23 @@ class CreateData {
         }
         const type = node.findDirectExpression(Expressions.TypeName);
         if (type) {
-            new basic_types_1.BasicTypes(filename, scope).resolveTypeName(type);
+            const found = new basic_types_1.BasicTypes(filename, scope).resolveTypeName(type);
+            if (found instanceof basic_1.UnknownType) {
+                if (node.concatTokens().toUpperCase().includes(" REF TO ")) {
+                    const def = scope.findObjectDefinition(type.concatTokens());
+                    if (def) {
+                        scope.addReference(type.getFirstToken(), def, _reference_1.ReferenceType.TypeReference, filename);
+                    }
+                    else {
+                        const identifier = new _typed_identifier_1.TypedIdentifier(type.getFirstToken(), filename, found);
+                        scope.addReference(type.getFirstToken(), identifier, _reference_1.ReferenceType.TypeReference, filename);
+                    }
+                }
+                else {
+                    const identifier = new _typed_identifier_1.TypedIdentifier(type.getFirstToken(), filename, found);
+                    scope.addReference(type.getFirstToken(), identifier, _reference_1.ReferenceType.TypeReference, filename);
+                }
+            }
         }
     }
 }
@@ -40065,6 +40094,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.LSPLookup = void 0;
+/* eslint-disable max-len */
 const LServer = __webpack_require__(/*! vscode-languageserver-types */ "./node_modules/vscode-languageserver-types/lib/esm/main.js");
 const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 const Expressions = __webpack_require__(/*! ../abap/2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
@@ -40147,13 +40177,14 @@ class LSPLookup {
             }
             return { hover: hoverValue, definition: location, implementation: location, definitionId: variable, scope: bottomScope };
         }
-        for (const c of bottomScope.listClassDefinitions()) {
+        // TODO: this can be optimized, no need to loop through all the defintions, the scope knows the name of the object?
+        for (const c of [...bottomScope.listClassDefinitions(), ...bottomScope.listInterfaceDefinitions()]) {
             for (const m of ((_a = c.getMethodDefinitions()) === null || _a === void 0 ? void 0 : _a.getAll()) || []) {
                 for (const p of ((_b = m.getParameters()) === null || _b === void 0 ? void 0 : _b.getAll()) || []) {
                     if (p.getStart().equals(cursor.token.getStart())) {
                         const found = _lsp_utils_1.LSPUtils.identiferToLocation(p);
                         return {
-                            hover: "Method Parameter, " + cursor.token.getStr(),
+                            hover: "Method Parameter: " + cursor.token.getStr().replace("!", ""),
                             definition: found,
                             definitionId: p,
                             implementation: undefined,
@@ -40335,11 +40366,12 @@ class LSPLookup {
         };
     }
     static findMethodDefinition(found, scope) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (scope === undefined) {
             return undefined;
         }
-        if (scope.getIdentifier().stype !== _scope_type_1.ScopeType.ClassDefinition
+        if ((scope.getIdentifier().stype !== _scope_type_1.ScopeType.ClassDefinition
+            && scope.getIdentifier().stype !== _scope_type_1.ScopeType.Interface)
             || !(found.snode.get() instanceof Statements.MethodDef)) {
             return undefined;
         }
@@ -40355,8 +40387,14 @@ class LSPLookup {
             || nameToken.getStart().getRow() !== found.token.getStart().getRow()) {
             return undefined;
         }
-        const def = (_d = (_c = (_b = scope.getParent()) === null || _b === void 0 ? void 0 : _b.findClassDefinition(scope.getIdentifier().sname)) === null || _c === void 0 ? void 0 : _c.getMethodDefinitions()) === null || _d === void 0 ? void 0 : _d.getByName(nameToken.getStr());
-        return def;
+        if (scope.getIdentifier().stype === _scope_type_1.ScopeType.ClassDefinition) {
+            const def = (_d = (_c = (_b = scope.getParent()) === null || _b === void 0 ? void 0 : _b.findClassDefinition(scope.getIdentifier().sname)) === null || _c === void 0 ? void 0 : _c.getMethodDefinitions()) === null || _d === void 0 ? void 0 : _d.getByName(nameToken.getStr());
+            return def;
+        }
+        else {
+            const def = (_g = (_f = (_e = scope.getParent()) === null || _e === void 0 ? void 0 : _e.findInterfaceDefinition(scope.getIdentifier().sname)) === null || _f === void 0 ? void 0 : _f.getMethodDefinitions()) === null || _g === void 0 ? void 0 : _g.getByName(nameToken.getStr());
+            return def;
+        }
     }
     static findFunctionModule(found) {
         if (!(found.snode.get() instanceof Statements.CallFunction)) {
@@ -48896,7 +48934,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.43";
+        return "2.102.45";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -52100,7 +52138,12 @@ class CloudTypes {
     }
     run(obj) {
         if (this.reg.getConfig().getVersion() !== version_1.Version.Cloud
+            || obj instanceof Objects.ApplicationJobCatalogEntry
+            || obj instanceof Objects.ApplicationJobTemplate
             || obj instanceof Objects.AssignmentServiceToAuthorizationGroup
+            || obj instanceof Objects.ATCCheckCategory
+            || obj instanceof Objects.ATCCheckObject
+            || obj instanceof Objects.ATCCheckVariant
             || obj instanceof Objects.AuthorizationCheckField
             || obj instanceof Objects.AuthorizationObject
             || obj instanceof Objects.AuthorizationObjectExtension
@@ -52108,11 +52151,7 @@ class CloudTypes {
             || obj instanceof Objects.BusinessCatalog
             || obj instanceof Objects.BusinessCatalogAppAssignment
             || obj instanceof Objects.CDSMetadataExtension
-            || obj instanceof Objects.RestrictionField
             || obj instanceof Objects.Class
-            || obj instanceof Objects.OutboundService
-            || obj instanceof Objects.ApplicationJobCatalogEntry
-            || obj instanceof Objects.ApplicationJobTemplate
             || obj instanceof Objects.CommunicationScenario
             || obj instanceof Objects.DataControl
             || obj instanceof Objects.DataDefinition
@@ -52124,11 +52163,11 @@ class CloudTypes {
             || obj instanceof Objects.InboundService
             || obj instanceof Objects.Interface
             || obj instanceof Objects.LockObject
-            || obj instanceof Objects.ATCCheckCategory
-            || obj instanceof Objects.ATCCheckObject
-            || obj instanceof Objects.ATCCheckVariant
             || obj instanceof Objects.MessageClass
+            || obj instanceof Objects.NumberRange
+            || obj instanceof Objects.OutboundService
             || obj instanceof Objects.Package
+            || obj instanceof Objects.RestrictionField
             || obj instanceof Objects.RestrictionType
             || obj instanceof Objects.ServiceBinding
             || obj instanceof Objects.ServiceDefinition
@@ -53072,14 +53111,12 @@ exports.DefinitionsTop = exports.DefinitionsTopConf = void 0;
 const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
 const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
-const Expressions = __webpack_require__(/*! ../abap/2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const Structures = __webpack_require__(/*! ../abap/3_structures/structures */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/index.js");
 const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@abaplint/core/build/src/rules/_abap_rule.js");
 const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
 const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
 const nodes_1 = __webpack_require__(/*! ../abap/nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
-const version_1 = __webpack_require__(/*! ../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class DefinitionsTopConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.DefinitionsTopConf = DefinitionsTopConf;
@@ -53098,10 +53135,16 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
             key: "definitions_top",
             title: "Place definitions in top of routine",
             shortDescription: `Checks that definitions are placed at the beginning of METHODs, FORMs and FUNCTIONs.`,
-            extendedInformation: `If the routine has inline definitions then no issues are reported
-
-https://docs.abapopenchecks.org/checks/17/`,
+            extendedInformation: `https://docs.abapopenchecks.org/checks/17/`,
             tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Quickfix],
+            badExample: `FROM foo.
+  WRITE 'hello'.
+  DATA int TYPE i.
+ENDFORM.`,
+            goodExample: `FROM foo.
+  DATA int TYPE i.
+  WRITE 'hello'.
+ENDFORM.`,
         };
     }
     getMessage() {
@@ -53130,10 +53173,6 @@ https://docs.abapopenchecks.org/checks/17/`,
             this.fixed = false;
             this.mode = DEFINITION;
             this.moveTo = (_a = r.getFirstStatement()) === null || _a === void 0 ? void 0 : _a.getLastToken().getEnd();
-            if (this.reg.getConfig().getVersion() !== version_1.Version.v702
-                && r.findFirstExpression(Expressions.InlineData)) {
-                continue;
-            }
             const found = this.walk(r, file);
             if (found) {
                 issues.push(found);
@@ -53194,16 +53233,19 @@ https://docs.abapopenchecks.org/checks/17/`,
                 && (get instanceof Statements.Data
                     || get instanceof Statements.Type
                     || get instanceof Statements.Constant
+                    || (get instanceof Statements.Move && c.concatTokens().toUpperCase().startsWith("DATA("))
                     || get instanceof Statements.Static
                     || get instanceof Statements.FieldSymbol)) {
                 if (this.mode === AFTER) {
                     // only one fix per routine, as it reorders a lot
-                    let fix = undefined;
-                    if (this.fixed === false && this.moveTo) {
-                        fix = this.buildFix(file, c, this.moveTo);
-                        this.fixed = true;
+                    if (!(get instanceof Statements.Move && c.concatTokens().toUpperCase().startsWith("DATA("))) {
+                        let fix = undefined;
+                        if (this.fixed === false && this.moveTo) {
+                            fix = this.buildFix(file, c, this.moveTo);
+                            this.fixed = true;
+                        }
+                        return issue_1.Issue.atStatement(file, c, this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
                     }
-                    return issue_1.Issue.atStatement(file, c, this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
                 }
                 else {
                     this.moveTo = c.getLastToken().getEnd();
@@ -71477,6 +71519,7 @@ Builder.prototype.j2x = function(jObj, level) {
   let attrStr = '';
   let val = '';
   for (let key in jObj) {
+    if(!jObj.hasOwnProperty(key)) continue;
     if (typeof jObj[key] === 'undefined') {
       // supress undefined node only if it is not an attribute
       if (this.isAttribute(key)) {
@@ -71698,6 +71741,8 @@ function arrToStr(arr, options, jPath, indentation) {
     for (let i = 0; i < arr.length; i++) {
         const tagObj = arr[i];
         const tagName = propName(tagObj);
+        if(tagName === undefined) continue;
+
         let newJPath = "";
         if (jPath.length === 0) newJPath = tagName
         else newJPath = `${jPath}.${tagName}`;
@@ -71767,6 +71812,7 @@ function propName(obj) {
     const keys = Object.keys(obj);
     for (let i = 0; i < keys.length; i++) {
         const key = keys[i];
+        if(!obj.hasOwnProperty(key)) continue;
         if (key !== ":@") return key;
     }
 }
@@ -71775,6 +71821,7 @@ function attr_to_str(attrMap, options) {
     let attrStr = "";
     if (attrMap && !options.ignoreAttributes) {
         for (let attr in attrMap) {
+            if(!attrMap.hasOwnProperty(attr)) continue;
             let attrVal = options.attributeValueProcessor(attr, attrMap[attr]);
             attrVal = replaceEntitiesValue(attrVal, options);
             if (attrVal === true && options.suppressBooleanAttributes) {
@@ -72318,6 +72365,7 @@ const parseXml = function(xmlData) {
       }else {//Opening tag
         let result = readTagExp(xmlData,i, this.options.removeNSPrefix);
         let tagName= result.tagName;
+        const rawTagName = result.rawTagName;
         let tagExp = result.tagExp;
         let attrExpPresent = result.attrExpPresent;
         let closeIndex = result.closeIndex;
@@ -72343,7 +72391,7 @@ const parseXml = function(xmlData) {
         if(tagName !== xmlObj.tagname){
           jPath += jPath ? "." + tagName : tagName;
         }
-        if (this.isItStopNode(this.options.stopNodes, jPath, tagName)) { //TODO: namespace
+        if (this.isItStopNode(this.options.stopNodes, jPath, tagName)) {
           let tagContent = "";
           //self-closing tag
           if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){
@@ -72356,8 +72404,8 @@ const parseXml = function(xmlData) {
           //normal tag
           else{
             //read until closing tag is found
-            const result = this.readStopNodeData(xmlData, tagName, closeIndex + 1);
-            if(!result) throw new Error(`Unexpected end of ${tagName}`);
+            const result = this.readStopNodeData(xmlData, rawTagName, closeIndex + 1);
+            if(!result) throw new Error(`Unexpected end of ${rawTagName}`);
             i = result.i;
             tagContent = result.tagContent;
           }
@@ -72542,6 +72590,7 @@ function readTagExp(xmlData,i, removeNSPrefix, closingChar = ">"){
     tagExp = tagExp.substr(separatorIndex + 1);
   }
 
+  const rawTagName = tagName;
   if(removeNSPrefix){
     const colonIndex = tagName.indexOf(":");
     if(colonIndex !== -1){
@@ -72555,6 +72604,7 @@ function readTagExp(xmlData,i, removeNSPrefix, closingChar = ">"){
     tagExp: tagExp,
     closeIndex: closeIndex,
     attrExpPresent: attrExpPresent,
+    rawTagName: rawTagName,
   }
 }
 /**

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.102.43",
+    "version": "2.102.45",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
-        "abaplint": "./abaplint"
+        "abaplint": "abaplint"
     },
     "scripts": {
         "lint": "eslint src/**/*.ts test/**/*.ts --format unix",
@@ -38,12 +38,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.102.43",
+        "@abaplint/core": "^2.102.45",
         "@types/chai": "^4.3.6",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.2",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^20.6.2",
+        "@types/node": "^20.6.3",
         "@types/progress": "^2.0.5",
         "chai": "^4.3.8",
         "chalk": "^5.3.0",