@abaplint/core 2.113.39 → 2.113.40

package/build/src/abap/2_statements/statements/data_begin.js

@@ -6,7 +6,8 @@ const expressions_1 = require("../expressions");
 class DataBegin {
     getMatcher() {
         const occurs = (0, combi_1.seq)("OCCURS", expressions_1.Integer);
-        const structure = (0, combi_1.seq)("BEGIN OF", (0, combi_1.opt)("COMMON PART"), expressions_1.DefinitionName, (0, combi_1.opt)("READ-ONLY"), (0, combi_1.opt)(occurs));
+        const common = (0, combi_1.altPrio)((0, combi_1.seq)("COMMON PART", expressions_1.DefinitionName), "COMMON PART");
+        const structure = (0, combi_1.seq)("BEGIN OF", (0, combi_1.altPrio)(common, (0, combi_1.seq)(expressions_1.DefinitionName, (0, combi_1.opt)("READ-ONLY"), (0, combi_1.opt)(occurs))));
         return (0, combi_1.seq)("DATA", structure);
     }
 }

package/build/src/abap/flow/statement_flow.js

@@ -8,6 +8,7 @@ const Expressions = require("../2_statements/expressions");
 const flow_graph_1 = require("./flow_graph");
 const objects_1 = require("../../objects");
 const selection_events_1 = require("./selection_events");
+const virtual_position_1 = require("../../virtual_position");
 class StatementFlow {
     constructor() {
         this.counter = 0;
@@ -96,6 +97,7 @@ class StatementFlow {
         var _a;
         return ((_a = f.findDirectStructure(Structures.Body)) === null || _a === void 0 ? void 0 : _a.getChildren()) || [];
     }
+    // note: it must handle macros and chained statements
     buildName(statement) {
         let token = undefined;
         const colon = statement.getColon();
@@ -110,12 +112,18 @@ class StatementFlow {
                 }
             }
         }
+        let extra = "";
+        const tStart = token === null || token === void 0 ? void 0 : token.getStart();
+        if (tStart instanceof virtual_position_1.VirtualPosition) {
+            extra += "$" + tStart.vrow;
+            extra += "," + tStart.vcol;
+        }
         if (token === undefined) {
             return "tokenError";
         }
         return statement.get().constructor.name +
             ":" + token.getRow() +
-            "," + token.getCol();
+            "," + token.getCol() + extra;
     }
     traverseBody(children, context) {
         const graph = new flow_graph_1.FlowGraph(this.counter++);

package/build/src/cds/cds_determine_types.js

@@ -13,9 +13,19 @@ class CDSDetermineTypes {
             const components = [];
             for (const f of (parsedData === null || parsedData === void 0 ? void 0 : parsedData.fields) || []) {
                 if (f.prefix !== "") {
-                    let source = parsedData.sources.find((s) => { var _a; return ((_a = s.as) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === f.prefix.toUpperCase(); });
+                    const prefixUpper = f.prefix.toUpperCase();
+                    let source = parsedData.sources.find((s) => { var _a; return ((_a = s.as) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === prefixUpper; });
                     if ((source === null || source === void 0 ? void 0 : source.name) === undefined) {
-                        source = parsedData.sources.find((s) => s.name.toUpperCase() === f.prefix.toUpperCase());
+                        source = parsedData.sources.find((s) => s.name.toUpperCase() === prefixUpper);
+                    }
+                    if ((source === null || source === void 0 ? void 0 : source.name) === undefined
+                        && (parsedData.associations.find((s) => s.name.toUpperCase() === prefixUpper)
+                            || parsedData.associations.find((s) => { var _a; return ((_a = s.as) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === prefixUpper; }))) {
+                        components.push({
+                            name: f.name,
+                            type: new basic_1.VoidType("DDLS:association"),
+                        });
+                        continue;
                     }
                     if ((source === null || source === void 0 ? void 0 : source.name) === undefined) {
                         components.push({

package/build/src/cds/expressions/cds_cast.js

@@ -6,7 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSCast extends combi_1.Expression {
     getRunnable() {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
-        return (0, combi_1.seq)("CAST", "(", (0, combi_1.alt)(name, _1.CDSFunction, _1.CDSCase, CDSCast, _1.CDSString, _1.CDSArithmetics), "AS", _1.CDSType, (0, combi_1.opt)((0, combi_1.seq)("PRESERVING", "TYPE")), ")");
+        return (0, combi_1.seq)("CAST", "(", (0, combi_1.alt)(name, _1.CDSFunction, _1.CDSCase, _1.CDSAggregate, CDSCast, _1.CDSString, _1.CDSArithmetics), "AS", _1.CDSType, (0, combi_1.opt)((0, combi_1.seq)("PRESERVING", "TYPE")), ")");
     }
 }
 exports.CDSCast = CDSCast;

package/build/src/lsp/help.js

@@ -6,6 +6,7 @@ const _lsp_utils_1 = require("./_lsp_utils");
 const syntax_1 = require("../abap/5_syntax/syntax");
 const _abap_object_1 = require("../objects/_abap_object");
 const dump_scope_1 = require("./dump_scope");
+const virtual_position_1 = require("../virtual_position");
 class Help {
     static find(reg, textDocument, position) {
         const file = _lsp_utils_1.LSPUtils.getABAPFile(reg, textDocument.uri);
@@ -180,13 +181,24 @@ class Help {
         return ret + "</ul>";
     }
     static tokens(file) {
-        let inner = "<table><tr><td><b>String</b></td><td><b>Type</b></td><td><b>Row</b></td><td><b>Column</b></td></tr>";
+        let inner = `<table><tr><td><b>String</b></td><td><b>Type</b></td>
+    <td><b>Row</b></td><td><b>Column</b></td>
+    <td><b>vRow</b></td><td><b>vColumn</b></td>
+    </tr>`;
         for (const token of file.getTokens()) {
-            inner = inner + "<tr><td><tt>" +
+            const tStart = token.getStart();
+            inner += "<tr><td><tt>" +
                 this.escape(token.getStr()) + "</tt></td><td>" +
                 token.constructor.name + "</td><td align=\"right\">" +
-                token.getRow() + "</td><td align=\"right\">" +
-                token.getCol() + "</td></tr>";
+                tStart.getRow() + "</td><td align=\"right\">" +
+                tStart.getCol() + "</td>";
+            if (tStart instanceof virtual_position_1.VirtualPosition) {
+                inner += `<td>${tStart.vcol}</td><td>${tStart.vrow}</td>`;
+            }
+            else {
+                inner += "<td></td><td></td>";
+            }
+            inner += "</tr>";
         }
         inner = inner + "</table>";
         return inner;

package/build/src/registry.js

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

package/package.json

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