@abaplint/core 2.89.11 → 2.89.14

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

@@ -8,11 +8,17 @@ const inline_field_definition_1 = require("./inline_field_definition");
 const unknown_type_1 = require("../../types/basic/unknown_type");
 const _scope_type_1 = require("../_scope_type");
 const reduce_next_1 = require("./reduce_next");
+const let_1 = require("./let");
 class ReduceBody {
     runSyntax(node, scope, filename) {
         if (node === undefined) {
             return;
         }
+        let scoped = false;
+        const letNode = node.findDirectExpression(Expressions.Let);
+        if (letNode) {
+            scoped = new let_1.Let().runSyntax(letNode, scope, filename);
+        }
         for (const i of node.findDirectExpressions(Expressions.InlineFieldDefinition)) {
             new inline_field_definition_1.InlineFieldDefinition().runSyntax(i, scope, filename);
         }
@@ -25,6 +31,9 @@ class ReduceBody {
         for (const s of node.findDirectExpressions(Expressions.ReduceNext)) {
             new reduce_next_1.ReduceNext().runSyntax(s, scope, filename);
         }
+        if (scoped === true) {
+            scope.pop(node.getLastToken().getEnd());
+        }
         while (scope.getType() === _scope_type_1.ScopeType.For) {
             scope.pop(node.getLastToken().getEnd());
         }

package/build/src/abap/5_syntax/structures/type_enum.js

@@ -8,6 +8,7 @@ const basic_1 = require("../../types/basic");
 const _typed_identifier_1 = require("../../types/_typed_identifier");
 const _reference_1 = require("../_reference");
 const enum_type_1 = require("../../types/basic/enum_type");
+const _scope_type_1 = require("../_scope_type");
 class TypeEnum {
     runSyntax(node, scope, filename) {
         var _a;
@@ -48,7 +49,12 @@ class TypeEnum {
         }
         const name = begin.findFirstExpression(Expressions.NamespaceSimpleName);
         if (name) {
-            const id = new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, new enum_type_1.EnumType(), ["enum" /* Enum */]);
+            let qualifiedName = name.concatTokens();
+            if (scope.getType() === _scope_type_1.ScopeType.ClassDefinition
+                || scope.getType() === _scope_type_1.ScopeType.Interface) {
+                qualifiedName = scope.getName() + "=>" + qualifiedName;
+            }
+            const id = new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, new enum_type_1.EnumType(qualifiedName), ["enum" /* Enum */]);
             scope.addType(id);
             types.push(id);
         }

package/build/src/abap/types/basic/enum_type.js

@@ -10,7 +10,7 @@ class EnumType extends _abstract_type_1.AbstractType {
         return false;
     }
     toABAP() {
-        return "enum";
+        return this.getQualifiedName() || "enum";
     }
     containsVoid() {
         return false;

package/build/src/pretty_printer/indent.js

@@ -60,7 +60,8 @@ class Indent {
                 || type instanceof Statements.EndCatch
                 || (this.options.selectionScreenBlockIndentation === true
                     && type instanceof Statements.SelectionScreen
-                    && statement.concatTokens().toUpperCase().includes("END OF BLOCK"))
+                    && (statement.concatTokens().toUpperCase().includes("END OF BLOCK") ||
+                        statement.concatTokens().toUpperCase().includes("END OF LINE")))
                 || type instanceof Statements.ElseIf
                 || type instanceof Statements.EndFunction
                 || type instanceof Statements.EndInterface
@@ -149,7 +150,8 @@ class Indent {
                 || type instanceof Statements.TestSeam
                 || (this.options.selectionScreenBlockIndentation === true
                     && type instanceof Statements.SelectionScreen
-                    && statement.concatTokens().toUpperCase().includes("BEGIN OF BLOCK"))
+                    && (statement.concatTokens().toUpperCase().includes("BEGIN OF BLOCK") ||
+                        statement.concatTokens().toUpperCase().includes("BEGIN OF LINE")))
                 || type instanceof Statements.StartOfSelection
                 || type instanceof Statements.AtSelectionScreen
                 || type instanceof Statements.AtLineSelection

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -1139,6 +1139,10 @@ ${indentation}    output = ${topTarget}.`;
             if (reduceBody === undefined) {
                 continue;
             }
+            const letNode = reduceBody.findDirectExpression(Expressions.Let);
+            if (letNode) {
+                body += this.outlineLet(letNode, indentation, highSyntax, lowFile);
+            }
             for (const init of reduceBody.findDirectExpressions(Expressions.InlineFieldDefinition)) {
                 name = init.getFirstToken().getStr();
                 const s = (_a = init.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.89.11",
+    "version": "2.89.14",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,14 +48,14 @@
         "@microsoft/api-extractor": "^7.23.0",
         "@types/chai": "^4.3.1",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^17.0.27",
+        "@types/node": "^17.0.30",
         "chai": "^4.3.6",
         "eslint": "^8.14.0",
-        "mocha": "^9.2.2",
+        "mocha": "^10.0.0",
         "c8": "^7.11.2",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^1.0.0",
-        "typescript": "^4.6.3"
+        "typescript": "^4.6.4"
     },
     "dependencies": {
         "fast-xml-parser": "^4.0.7",