@abaplint/core 2.88.3 → 2.88.6

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

@@ -4,6 +4,7 @@ exports.BasicTypes = void 0;
 /* eslint-disable default-case */
 const _typed_identifier_1 = require("../types/_typed_identifier");
 const Expressions = require("../2_statements/expressions");
+const Statements = require("../2_statements/statements");
 const Types = require("../types/basic");
 const _scope_type_1 = require("./_scope_type");
 const _object_oriented_1 = require("./_object_oriented");
@@ -199,7 +200,20 @@ class BasicTypes {
         if (nameExpr.countTokens() > 1) { // workaround for names with dashes
             name = new identifier_1.Identifier(name.getStart(), nameExpr.concatTokens());
         }
-        const found = this.parseType(node, this.scope.isTypePool() ? name.getStr() : undefined);
+        let qualifiedName = undefined;
+        if (node.get() instanceof Statements.Type) {
+            if (this.scope.isTypePool() === true) {
+                qualifiedName = name.getStr();
+            }
+            else {
+                qualifiedName = name.getStr();
+                if (this.scope.getType() === _scope_type_1.ScopeType.ClassDefinition
+                    || this.scope.getType() === _scope_type_1.ScopeType.Interface) {
+                    qualifiedName = this.scope.getName() + "=>" + qualifiedName;
+                }
+            }
+        }
+        const found = this.parseType(node, qualifiedName);
         if (found) {
             return new _typed_identifier_1.TypedIdentifier(name, this.filename, found);
         }
@@ -301,9 +315,9 @@ class BasicTypes {
         // fallback to old style syntax, OCCURS etc
         return this.parseType(node, name);
     }
-    parseType(node, name) {
+    parseType(node, qualifiedName) {
         var _a, _b, _c, _d, _e, _f;
-        const typename = node.findFirstExpression(Expressions.TypeName);
+        const typeName = node.findFirstExpression(Expressions.TypeName);
         let text = (_a = node.findFirstExpression(Expressions.Type)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
         if (text === undefined) {
             text = (_b = node.findFirstExpression(Expressions.TypeParam)) === null || _b === void 0 ? void 0 : _b.concatTokens().toUpperCase();
@@ -369,7 +383,7 @@ class BasicTypes {
             }
             found = this.resolveLikeName(sub);
             if (found && text.includes(" OCCURS ")) {
-                found = new Types.TableType(found, { withHeader: text.includes("WITH HEADER LINE") }, name);
+                found = new Types.TableType(found, { withHeader: text.includes("WITH HEADER LINE") }, qualifiedName);
             }
         }
         else if (text.startsWith("TYPE LINE OF ")) {
@@ -392,13 +406,13 @@ class BasicTypes {
             }
         }
         else if (text.startsWith("TYPE REF TO ")) {
-            found = this.resolveTypeRef(typename);
+            found = this.resolveTypeRef(typeName);
         }
         else if (text.startsWith("TYPE")) {
-            found = this.resolveTypeName(typename, this.findLength(node), this.findDecimals(node), name);
+            found = this.resolveTypeName(typeName, this.findLength(node), this.findDecimals(node), qualifiedName);
             const concat = node.concatTokens().toUpperCase();
             if (found && concat.includes(" OCCURS ")) {
-                found = new Types.TableType(found, { withHeader: concat.includes("WITH HEADER LINE") }, name);
+                found = new Types.TableType(found, { withHeader: concat.includes("WITH HEADER LINE") }, qualifiedName);
             }
             else if (found && concat.includes("WITH HEADER LINE")) {
                 if (found instanceof Types.VoidType) {
@@ -411,7 +425,7 @@ class BasicTypes {
                     found = new Types.TableType(found.getRowType(), { withHeader: true });
                 }
             }
-            if (found === undefined && typename === undefined) {
+            if (found === undefined && typeName === undefined) {
                 let length = 1;
                 const len = node.findDirectExpression(Expressions.ConstantFieldLength);
                 if (len) {
@@ -420,9 +434,9 @@ class BasicTypes {
                         length = parseInt(int.concatTokens(), 10);
                     }
                 }
-                found = new Types.CharacterType(length, name); // fallback
+                found = new Types.CharacterType(length, qualifiedName); // fallback
                 if (concat.includes(" OCCURS ")) {
-                    found = new Types.TableType(found, { withHeader: concat.includes("WITH HEADER LINE") }, name);
+                    found = new Types.TableType(found, { withHeader: concat.includes("WITH HEADER LINE") }, qualifiedName);
                 }
             }
         }

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -499,13 +499,17 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
             }
             const condition = this.tableCondition(tableExpression);
             const uniqueName = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+            const tabixBackup = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const indentation = " ".repeat(node.getFirstToken().getStart().getCol() - 1);
             const firstToken = node.getFirstToken();
             const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, firstToken.getStart(), `DATA ${uniqueName} LIKE LINE OF ${pre}.
+${indentation}DATA ${tabixBackup} LIKE sy-tabix.
+${indentation}${tabixBackup} = sy-tabix.
 ${indentation}READ TABLE ${pre} ${condition}INTO ${uniqueName}.
 ${indentation}IF sy-subrc <> 0.
 ${indentation}  RAISE EXCEPTION TYPE cx_sy_itab_line_not_found.
 ${indentation}ENDIF.
+${indentation}sy-tabix = ${tabixBackup}.
 ${indentation}`);
             const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, startToken.getStart(), tableExpression.getLastToken().getEnd(), uniqueName);
             const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
@@ -754,12 +758,16 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         uniqueName = `<${uniqueName}>`;
         const tName = target.concatTokens().split("[")[0];
         const condition = this.tableCondition(tableExpression);
+        const tabixBackup = this.uniqueName(node.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
         const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
         const code = `FIELD-SYMBOLS ${uniqueName} LIKE LINE OF ${tName}.
+${indentation}DATA ${tabixBackup} LIKE sy-tabix.
+${indentation}${tabixBackup} = sy-tabix.
 ${indentation}READ TABLE ${tName} ${condition}ASSIGNING ${uniqueName}.
 ${indentation}IF sy-subrc <> 0.
 ${indentation}  RAISE EXCEPTION TYPE cx_sy_itab_line_not_found.
 ${indentation}ENDIF.
+${indentation}sy-tabix = ${tabixBackup}.
 ${indentation}${uniqueName}`;
         const start = target.getFirstToken().getStart();
         const end = (_a = tableExpression.findDirectTokenByText("]")) === null || _a === void 0 ? void 0 : _a.getEnd();

package/package.json

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