@abaplint/core 2.102.43 → 2.102.45

package/build/abaplint.d.ts

@@ -3678,6 +3678,7 @@ export declare interface ISpaghettiScopeNode {
     };
     findClassDefinition(name: string): IClassDefinition | undefined;
     listClassDefinitions(): IClassDefinition[];
+    listInterfaceDefinitions(): IInterfaceDefinition[];
     findFormDefinition(name: string): IFormDefinition | undefined;
     listFormDefinitions(): IFormDefinition[];
     findInterfaceDefinition(name: string): IInterfaceDefinition | undefined;
@@ -5352,6 +5353,7 @@ export declare class SpaghettiScopeNode extends ScopeData implements ISpaghettiS
     findDeferred(name: string): Identifier | undefined;
     findClassDefinition(name: string): IClassDefinition | undefined;
     listClassDefinitions(): IClassDefinition[];
+    listInterfaceDefinitions(): IInterfaceDefinition[];
     findFormDefinition(name: string): IFormDefinition | undefined;
     listFormDefinitions(): IFormDefinition[];
     findInterfaceDefinition(name: string): IInterfaceDefinition | undefined;

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

@@ -305,7 +305,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) {

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

@@ -86,6 +86,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();

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

@@ -6,6 +6,9 @@ const target_1 = require("../expressions/target");
 const source_1 = require("../expressions/source");
 const dynamic_1 = require("../expressions/dynamic");
 const basic_types_1 = require("../basic_types");
+const basic_1 = require("../../types/basic");
+const _typed_identifier_1 = require("../../types/_typed_identifier");
+const _reference_1 = require("../_reference");
 class CreateData {
     runSyntax(node, scope, filename) {
         for (const s of node.findDirectExpressions(Expressions.Source)) {
@@ -19,7 +22,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);
+                }
+            }
         }
     }
 }

package/build/src/lsp/_lookup.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LSPLookup = void 0;
+/* eslint-disable max-len */
 const LServer = require("vscode-languageserver-types");
 const Statements = require("../abap/2_statements/statements");
 const Expressions = require("../abap/2_statements/expressions");
@@ -83,13 +84,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,
@@ -271,11 +273,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;
         }
@@ -291,8 +294,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)) {

package/build/src/registry.js

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

package/build/src/rules/cloud_types.js

@@ -37,7 +37,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
@@ -45,11 +50,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
@@ -61,11 +62,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

package/build/src/rules/definitions_top.js

@@ -4,14 +4,12 @@ exports.DefinitionsTop = exports.DefinitionsTopConf = void 0;
 const issue_1 = require("../issue");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
 const Statements = require("../abap/2_statements/statements");
-const Expressions = require("../abap/2_statements/expressions");
 const Structures = require("../abap/3_structures/structures");
 const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const _irule_1 = require("./_irule");
 const edit_helper_1 = require("../edit_helper");
 const nodes_1 = require("../abap/nodes");
-const version_1 = require("../version");
 class DefinitionsTopConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.DefinitionsTopConf = DefinitionsTopConf;
@@ -30,10 +28,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() {
@@ -62,10 +66,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);
@@ -126,16 +126,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();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.102.43",
+    "version": "2.102.45",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -53,7 +53,7 @@
         "@microsoft/api-extractor": "^7.37.0",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^20.6.2",
+        "@types/node": "^20.6.3",
         "chai": "^4.3.8",
         "eslint": "^8.49.0",
         "mocha": "^10.2.0",
@@ -63,7 +63,7 @@
         "typescript": "^5.2.2"
     },
     "dependencies": {
-        "fast-xml-parser": "^4.2.7",
+        "fast-xml-parser": "^4.3.0",
         "json5": "^2.2.3",
         "vscode-languageserver-types": "^3.17.3"
     }