@abaplint/core 2.89.5 → 2.89.6

package/build/abaplint.d.ts

@@ -1144,7 +1144,7 @@ export declare class CurrentScope {
     /** Lookup class in local and global scope */
     findClassDefinition(name: string | undefined): IClassDefinition | undefined;
     findTypePoolConstant(name: string | undefined): TypedIdentifier | undefined;
-    findTypePoolType(name: string): AbstractType | undefined;
+    findTypePoolType(name: string): TypedIdentifier | undefined;
     /** Lookup interface in local and global scope */
     findInterfaceDefinition(name: string): IInterfaceDefinition | undefined;
     findFormDefinition(name: string): IFormDefinition | undefined;

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

@@ -220,7 +220,7 @@ class CurrentScope {
         return found;
     }
     findTypePoolType(name) {
-        var _a, _b;
+        var _a;
         if (name.includes("_") === undefined) {
             return undefined;
         }
@@ -230,7 +230,7 @@ class CurrentScope {
             return undefined;
         }
         const spag = (_a = new syntax_1.SyntaxLogic(this.reg, typePool).run().spaghetti.getFirstChild()) === null || _a === void 0 ? void 0 : _a.getFirstChild();
-        const found = (_b = spag === null || spag === void 0 ? void 0 : spag.findType(name)) === null || _b === void 0 ? void 0 : _b.getType();
+        const found = spag === null || spag === void 0 ? void 0 : spag.findType(name);
         return found;
     }
     /** Lookup interface in local and global scope */

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

@@ -52,6 +52,10 @@ class BasicTypes {
         if (builtin) {
             return new _typed_identifier_1.TypedIdentifier(new identifier_1.Identifier(new position_1.Position(1, 1), name), _builtin_1.BuiltIn.filename, builtin);
         }
+        const type = this.scope.findTypePoolType(name);
+        if (type) {
+            return type;
+        }
         return undefined;
     }
     resolveLikeName(node, headerLogic = true) {
@@ -145,6 +149,7 @@ class BasicTypes {
         return type;
     }
     resolveTypeName(typeName, length, decimals, name) {
+        var _a;
         if (typeName === undefined) {
             return undefined;
         }
@@ -170,7 +175,7 @@ class BasicTypes {
             this.scope.addReference(token, typ, _reference_1.ReferenceType.TypeReference, this.filename);
             return typ.getType();
         }
-        const type = this.scope.findTypePoolType(chainText);
+        const type = (_a = this.scope.findTypePoolType(chainText)) === null || _a === void 0 ? void 0 : _a.getType();
         if (type) {
             //      this.scope.addReference(typeName.getFirstToken(), type, ReferenceType.TypeReference, this.filename);
             return type;
@@ -445,6 +450,7 @@ class BasicTypes {
     /////////////////////
     // todo, rewrite this method
     resolveTypeChain(expr) {
+        var _a;
         const chainText = expr.concatTokens().toUpperCase();
         if (chainText.includes("=>") === false && chainText.includes("-") === false) {
             return undefined;
@@ -496,7 +502,7 @@ class BasicTypes {
             const found = this.scope.findType(subs[0]);
             foundType = found === null || found === void 0 ? void 0 : found.getType();
             if (foundType === undefined) {
-                const typePoolType = this.scope.findTypePoolType(subs[0]);
+                const typePoolType = (_a = this.scope.findTypePoolType(subs[0])) === null || _a === void 0 ? void 0 : _a.getType();
                 if (typePoolType) {
                     //          this.scope.addReference(typeName.getFirstToken(), typePoolType, ReferenceType.TypeReference, this.filename);
                     foundType = typePoolType;

package/build/src/registry.js

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

package/build/src/rules/definitions_top.js

@@ -42,6 +42,7 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
         this.conf = conf;
     }
     runParsed(file) {
+        var _a;
         const issues = [];
         const structure = file.getStructure();
         if (structure === undefined) {
@@ -52,7 +53,7 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
             // one fix per routine
             this.fixed = false;
             this.mode = DEFINITION;
-            this.moveTo = r.getFirstStatement();
+            this.moveTo = (_a = r.getFirstStatement()) === null || _a === void 0 ? void 0 : _a.getLastToken().getEnd();
             const found = this.walk(r, file);
             if (found) {
                 issues.push(found);
@@ -81,6 +82,9 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
                     // no quick fixes for these, its difficult?
                     return issue_1.Issue.atStatement(file, c.getFirstStatement(), this.getMessage(), this.getMetadata().key, this.conf.severity);
                 }
+                else {
+                    this.moveTo = c.getLastToken().getEnd();
+                }
             }
             else if (c instanceof nodes_1.StatementNode
                 && (c.get() instanceof Statements.Data
@@ -98,7 +102,7 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
                     return issue_1.Issue.atStatement(file, c, this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
                 }
                 else {
-                    this.moveTo = c;
+                    this.moveTo = c.getLastToken().getEnd();
                 }
             }
             else if (c instanceof nodes_1.StructureNode && c.get() instanceof Structures.Define) {
@@ -121,12 +125,12 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
         }
         return undefined;
     }
-    buildFix(file, statement, start) {
+    buildFix(file, statement, at) {
         let concat = statement.concatTokens();
         concat = concat.replace(/,$/, ".");
         const fix1 = edit_helper_1.EditHelper.deleteStatement(file, statement);
         const indentation = " ".repeat(statement.getFirstToken().getCol() - 1);
-        const fix2 = edit_helper_1.EditHelper.insertAt(file, start.getEnd(), "\n" + indentation + concat);
+        const fix2 = edit_helper_1.EditHelper.insertAt(file, at, "\n" + indentation + concat);
         return edit_helper_1.EditHelper.merge(fix1, fix2);
     }
 }

package/package.json

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