@abaplint/cli 2.113.91 → 2.113.93

package/build/cli.js

@@ -40829,14 +40829,14 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node
 const cds_integer_1 = __webpack_require__(/*! ./cds_integer */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_integer.js");
 class CDSArithmetics extends combi_1.Expression {
     getRunnable() {
-        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
-        const val = (0, combi_1.alt)(cds_integer_1.CDSInteger, name, _1.CDSFunction, _1.CDSCase, _1.CDSCast, _1.CDSString);
+        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", _1.CDSName)));
+        const val = (0, combi_1.altPrio)(cds_integer_1.CDSInteger, _1.CDSFunction, _1.CDSCase, _1.CDSCast, _1.CDSString, name);
         const operator = (0, combi_1.altPrio)("+", "-", "*", "/");
         const operatorValue = (0, combi_1.seq)(operator, val);
-        const paren = (0, combi_1.seq)("(", val, (0, combi_1.plus)(operatorValue), ")");
-        const noParen = (0, combi_1.seq)(val, (0, combi_1.plus)(operatorValue));
+        const paren = (0, combi_1.seq)("(", val, (0, combi_1.plusPrio)(operatorValue), ")");
+        const noParen = (0, combi_1.seq)(val, (0, combi_1.plusPrio)(operatorValue));
         // todo: this is pretty bad, it needs a rewrite
-        return (0, combi_1.altPrio)((0, combi_1.seq)(paren, (0, combi_1.plus)(operatorValue)), paren, noParen);
+        return (0, combi_1.altPrio)((0, combi_1.seq)(paren, (0, combi_1.plusPrio)(operatorValue)), paren, noParen);
     }
 }
 exports.CDSArithmetics = CDSArithmetics;
@@ -40926,10 +40926,10 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node
 class CDSCase extends combi_1.Expression {
     getRunnable() {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", _1.CDSName)));
-        const value = (0, combi_1.alt)(name, _1.CDSString, _1.CDSFunction, CDSCase, _1.CDSCast, _1.CDSArithmetics);
-        const simple = (0, combi_1.seq)("CASE", (0, combi_1.alt)(name, _1.CDSFunction), (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", value, "THEN", value)), "ELSE", value, "END");
-        const complex = (0, combi_1.seq)("CASE", (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", _1.CDSCondition, "THEN", value)), (0, combi_1.opt)((0, combi_1.seq)("ELSE", value)), "END");
-        return (0, combi_1.altPrio)(simple, complex);
+        const value = (0, combi_1.altPrio)(_1.CDSFunction, _1.CDSString, CDSCase, _1.CDSCast, _1.CDSArithmetics, name);
+        const simple = (0, combi_1.seq)((0, combi_1.altPrio)(_1.CDSFunction, name), (0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", value, "THEN", value)), "ELSE", value);
+        const complex = (0, combi_1.seq)((0, combi_1.plusPrio)((0, combi_1.seq)("WHEN", _1.CDSCondition, "THEN", value)), (0, combi_1.optPrio)((0, combi_1.seq)("ELSE", value)));
+        return (0, combi_1.seq)("CASE", (0, combi_1.altPrio)(complex, simple), "END");
     }
 }
 exports.CDSCase = CDSCase;
@@ -40951,8 +40951,8 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 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, _1.CDSAggregate, CDSCast, _1.CDSString, _1.CDSArithmetics), "AS", _1.CDSType, (0, combi_1.opt)((0, combi_1.seq)("PRESERVING", "TYPE")), ")");
+        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", _1.CDSName)));
+        return (0, combi_1.seq)("CAST", "(", (0, combi_1.altPrio)(_1.CDSFunction, _1.CDSCase, _1.CDSAggregate, CDSCast, _1.CDSString, _1.CDSArithmetics, name), "AS", _1.CDSType, (0, combi_1.optPrio)((0, combi_1.seq)("PRESERVING", "TYPE")), ")");
     }
 }
 exports.CDSCast = CDSCast;
@@ -41001,7 +41001,7 @@ class CDSCondition extends combi_1.Expression {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", (0, combi_1.altPrio)(_1.CDSString, _1.CDSName))));
         const left = (0, combi_1.altPrio)(_1.CDSString, _1.CDSFunction, name);
         const operators = (0, combi_1.altPrio)("=", (0, combi_1.seq)("!", "="), (0, combi_1.seq)("<", ">"), (0, combi_1.seq)(">", "="), (0, combi_1.seq)("<", "="), "<", ">", "LIKE", "NOT LIKE");
-        const compare = (0, combi_1.seq)(left, operators, (0, combi_1.alt)(left, cds_integer_1.CDSInteger));
+        const compare = (0, combi_1.seq)(left, operators, (0, combi_1.altPrio)(left, cds_integer_1.CDSInteger));
         const is = (0, combi_1.seq)(left, "IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("INITIAL", "NULL"));
         const condition = (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(compare, is));
         const paren = (0, combi_1.seq)("(", CDSCondition, ")");
@@ -41345,7 +41345,7 @@ const combi_1 = __webpack_require__(/*! ../../abap/2_statements/combi */ "./node
 class CDSName extends combi_1.Expression {
     getRunnable() {
         const pre = (0, combi_1.seq)("/", (0, combi_1.regex)(/^[\w_]+$/), "/");
-        return (0, combi_1.seq)((0, combi_1.opt)(":"), (0, combi_1.opt)(pre), (0, combi_1.regex)(/^\$?#?[\w_]+$/));
+        return (0, combi_1.seq)((0, combi_1.optPrio)(":"), (0, combi_1.optPrio)(pre), (0, combi_1.regex)(/^\$?#?[\w_]+$/));
     }
 }
 exports.CDSName = CDSName;
@@ -44251,6 +44251,7 @@ const _abap_object_1 = __webpack_require__(/*! ../objects/_abap_object */ "./nod
 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");
 const objects_1 = __webpack_require__(/*! ../objects */ "./node_modules/@abaplint/core/build/src/objects/index.js");
+const cds_lexer_1 = __webpack_require__(/*! ../cds/cds_lexer */ "./node_modules/@abaplint/core/build/src/cds/cds_lexer.js");
 class Help {
     static find(reg, textDocument, position) {
         const abapFile = _lsp_utils_1.LSPUtils.getABAPFile(reg, textDocument.uri);
@@ -44263,11 +44264,34 @@ class Help {
         }
         const obj = reg.findObjectForFile(file);
         if (obj instanceof objects_1.DataDefinition) {
-            return "Data definition, dump todo";
+            return this.dumpDDLS(obj, reg);
         }
         return "Unhandled object type: " + obj.getType();
     }
     /////////////////////////////////////////////////
+    static dumpDDLS(obj, reg) {
+        let content = "";
+        content += "<h1>" + obj.getType() + " " + obj.getName() + "</h1>\n";
+        content += obj.getDescription() + "\n";
+        content += obj.getParsingIssues().map(i => i.getMessage()).join("<br>\n");
+        content += `<hr>\n`;
+        const parsed = obj.getParsedData();
+        parsed === null || parsed === void 0 ? true : delete parsed.tree;
+        content += `<pre>` + JSON.stringify(parsed, null, 2) + "</pre>\n";
+        content += `<hr>\n`;
+        content += `<pre>` + obj.parseType(reg).toText(0) + "</pre>\n";
+        content += `<hr>\n`;
+        const file = obj.findSourceFile();
+        if (file) {
+            const tokens = cds_lexer_1.CDSLexer.run(file);
+            content += `<h3>Tokens</h3>\n<pre>\n`;
+            for (const t of tokens) {
+                content += JSON.stringify(t) + "\n";
+            }
+            content += `</pre>\n`;
+        }
+        return content;
+    }
     static dumpABAP(file, reg, textDocument, position) {
         let content = "";
         content = `
@@ -53757,7 +53781,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.91";
+        return "2.113.93";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -63239,7 +63263,7 @@ DATA lt_bar TYPE STANDARD TABLE OF ty.`,
     runParsed(file) {
         const issues = [];
         for (const statement of file.getStatements()) {
-            if (!(statement.get() instanceof Statements.Data)) {
+            if (!(statement.get() instanceof Statements.Data || statement.get() instanceof Statements.Type)) {
                 continue;
             }
             const tt = statement.findFirstExpression(Expressions.TypeTable);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.91",
+    "version": "2.113.93",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.113.91",
+        "@abaplint/core": "^2.113.93",
         "@types/chai": "^4.3.20",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",