@abaplint/cli 2.113.39 → 2.113.40

package/build/cli.js

@@ -11586,7 +11586,8 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 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);
     }
 }
@@ -35334,6 +35335,7 @@ const Expressions = __webpack_require__(/*! ../2_statements/expressions */ "./no
 const flow_graph_1 = __webpack_require__(/*! ./flow_graph */ "./node_modules/@abaplint/core/build/src/abap/flow/flow_graph.js");
 const objects_1 = __webpack_require__(/*! ../../objects */ "./node_modules/@abaplint/core/build/src/objects/index.js");
 const selection_events_1 = __webpack_require__(/*! ./selection_events */ "./node_modules/@abaplint/core/build/src/abap/flow/selection_events.js");
+const virtual_position_1 = __webpack_require__(/*! ../../virtual_position */ "./node_modules/@abaplint/core/build/src/virtual_position.js");
 class StatementFlow {
     constructor() {
         this.counter = 0;
@@ -35422,6 +35424,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();
@@ -35436,12 +35439,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++);
@@ -39743,9 +39752,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({
@@ -40302,7 +40321,7 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node
 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;
@@ -43569,6 +43588,7 @@ const _lsp_utils_1 = __webpack_require__(/*! ./_lsp_utils */ "./node_modules/@ab
 const syntax_1 = __webpack_require__(/*! ../abap/5_syntax/syntax */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/syntax.js");
 const _abap_object_1 = __webpack_require__(/*! ../objects/_abap_object */ "./node_modules/@abaplint/core/build/src/objects/_abap_object.js");
 const dump_scope_1 = __webpack_require__(/*! ./dump_scope */ "./node_modules/@abaplint/core/build/src/lsp/dump_scope.js");
+const virtual_position_1 = __webpack_require__(/*! ../virtual_position */ "./node_modules/@abaplint/core/build/src/virtual_position.js");
 class Help {
     static find(reg, textDocument, position) {
         const file = _lsp_utils_1.LSPUtils.getABAPFile(reg, textDocument.uri);
@@ -43743,13 +43763,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;
@@ -52974,7 +53005,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/cli",
-    "version": "2.113.39",
+    "version": "2.113.40",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,12 +38,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.113.39",
+        "@abaplint/core": "^2.113.40",
         "@types/chai": "^4.3.20",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.9",
-        "@types/node": "^22.8.7",
+        "@types/node": "^22.9.0",
         "@types/progress": "^2.0.7",
         "chai": "^4.5.0",
         "chalk": "^5.3.0",