@abaplint/core 2.84.6 → 2.84.10

package/build/src/abap/2_statements/expand_macros.js

@@ -46,17 +46,18 @@ class ExpandMacros {
         let contents = [];
         for (let i = 0; i < statements.length; i++) {
             const statement = statements[i];
-            if (statement.get() instanceof Statements.Define) {
+            const type = statement.get();
+            if (type instanceof Statements.Define) {
                 // todo, will this break if first token is a pragma?
                 name = statement.getTokens()[1].getStr();
                 contents = [];
             }
             else if (name) {
-                if (statement.get() instanceof Statements.EndOfDefinition) {
+                if (type instanceof Statements.EndOfDefinition) {
                     this.macros.addMacro(name, contents);
                     name = undefined;
                 }
-                else if (!(statement.get() instanceof _statement_1.Comment)) {
+                else if (!(type instanceof _statement_1.Comment)) {
                     statements[i] = new statement_node_1.StatementNode(new _statement_1.MacroContent()).setChildren(this.tokensToNodes(statement.getTokens()));
                     contents.push(statements[i]);
                 }
@@ -67,7 +68,8 @@ class ExpandMacros {
         const result = [];
         let containsUnknown = false;
         for (const statement of statements) {
-            if (statement.get() instanceof _statement_1.Unknown || statement.get() instanceof _statement_1.MacroCall) {
+            const type = statement.get();
+            if (type instanceof _statement_1.Unknown || type instanceof _statement_1.MacroCall) {
                 const macroName = this.findName(statement.getTokens());
                 if (macroName && this.macros.isMacro(macroName)) {
                     result.push(new statement_node_1.StatementNode(new _statement_1.MacroCall()).setChildren(this.tokensToNodes(statement.getTokens())));

package/build/src/abap/2_statements/expressions/type_table.js

@@ -12,7 +12,7 @@ class TypeTable extends combi_1.Expression {
         const normal1 = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE", (0, combi_1.opt)("OF"), (0, combi_1.opt)("REF TO"), (0, combi_1.opt)(_1.TypeName));
         const likeType = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE OF", (0, combi_1.optPrio)("REF TO"), (0, combi_1.opt)(field_chain_1.FieldChain), (0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))));
         const rangeType = (0, combi_1.seq)("RANGE OF", _1.TypeName, (0, combi_1.opt)(header), (0, combi_1.opt)(initial));
-        const rangeLike = (0, combi_1.seq)("RANGE OF", _1.FieldSub, (0, combi_1.opt)(header), (0, combi_1.opt)(initial));
+        const rangeLike = (0, combi_1.seq)("RANGE OF", _1.SimpleFieldChain, (0, combi_1.opt)(header), (0, combi_1.opt)(initial));
         const typetable = (0, combi_1.seq)(normal1, (0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))));
         const occurs = (0, combi_1.seq)("OCCURS", _1.Integer);
         const oldType = (0, combi_1.seq)((0, combi_1.opt)("REF TO"), _1.TypeName, (0, combi_1.alt)((0, combi_1.seq)(occurs, (0, combi_1.opt)(header)), header));

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

@@ -282,7 +282,7 @@ class BasicTypes {
             return new Types.TableType(structure, options);
         }
         else if (text.startsWith("LIKE RANGE OF ")) {
-            const sub = node.findFirstExpression(Expressions.FieldSub);
+            const sub = node.findFirstExpression(Expressions.SimpleFieldChain);
             found = this.resolveLikeName(sub);
             if (found === undefined) {
                 return new Types.UnknownType("LIKE RANGE OF, could not resolve type");

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

@@ -7,7 +7,7 @@ const source_1 = require("./source");
 class StringTemplate {
     runSyntax(node, scope, filename) {
         for (const s of node.findAllExpressions(Expressions.Source)) {
-            new source_1.Source().runSyntax(s, scope, filename);
+            new source_1.Source().runSyntax(s, scope, filename, new basic_1.StringType("STRING"));
         }
         return new basic_1.StringType();
     }

package/build/src/abap/5_syntax/global_definitions/find_global_definitions.js

@@ -114,7 +114,7 @@ class FindGlobalDefinitions {
                 obj.setDefinition(undefined);
             }
         }
-        else if (obj instanceof class_1.Class) {
+        else {
             const found = struc === null || struc === void 0 ? void 0 : struc.findFirstStructure(Structures.ClassDefinition);
             if (struc && file && found) {
                 try {

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

@@ -76,7 +76,10 @@ class ReadTable {
             */
             const t = target.findFirstExpression(Expressions.Target);
             if (t) {
-                new target_1.Target().runSyntax(t, scope, filename);
+                const targetType = new target_1.Target().runSyntax(t, scope, filename);
+                if (_type_utils_1.TypeUtils.isAssignable(rowType, targetType) === false) {
+                    throw new Error("Incompatible types");
+                }
                 return;
             }
         }

package/build/src/lsp/diagnostics.js

@@ -30,6 +30,7 @@ class Diagnostics {
                 end: { line: issue.getEnd().getRow() - 1, character: issue.getEnd().getCol() - 1 },
             },
             code: issue.getKey(),
+            codeDescription: { href: "https://rules.abaplint.org/" + issue.getKey() + "/" },
             message: issue.getMessage().toString(),
             source: "abaplint",
         };

package/build/src/objects/_abap_object.js

@@ -41,7 +41,7 @@ class ABAPObject extends _abstract_object_1.AbstractObject {
         return undefined;
     }
     getMainABAPFile() {
-        // todo, uris
+        // todo, uris, https://github.com/abaplint/abaplint/issues/673
         const search = this.getName().replace(/\//g, "#").toLowerCase() + "." + this.getType().toLowerCase() + ".abap";
         for (const file of this.getABAPFiles()) {
             if (file.getFilename().endsWith(search)) {

package/build/src/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.84.6",
+    "version": "2.84.10",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,8 +48,8 @@
         "@microsoft/api-extractor": "^7.19.4",
         "@types/chai": "^4.3.0",
         "@types/mocha": "^9.1.0",
-        "@types/node": "^17.0.12",
-        "chai": "^4.3.5",
+        "@types/node": "^17.0.13",
+        "chai": "^4.3.6",
         "eslint": "^8.7.0",
         "mocha": "^9.2.0",
         "c8": "^7.11.0",