@abaplint/core 2.113.46 → 2.113.48

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

@@ -6,7 +6,7 @@ class Field extends combi_1.Expression {
     getRunnable() {
         // "&1" can be used for almost anything(field names, method names etc.) in macros
         // field names with only digits should not be possible
-        return (0, combi_1.regex)(/^[&_!]?\*?\w*(\/\w+\/)?\d*[a-zA-Z_%\$][\w\*%\$\?#]*(~\w+)?$/);
+        return (0, combi_1.regex)(/^[&_!?]?\*?\w*(\/\w+\/)?\d*[a-zA-Z_%\$][\w\*%\$\?#]*(~\w+)?$/);
     }
 }
 exports.Field = Field;

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

@@ -6,7 +6,7 @@ const tokens_1 = require("../../1_lexer/tokens");
 const _1 = require(".");
 class FieldOffset extends combi_1.Expression {
     getRunnable() {
-        const offset = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.Plus), (0, combi_1.altPrio)((0, combi_1.regex)(/^\d+$/), _1.SimpleFieldChain2));
+        const offset = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.Plus), (0, combi_1.optPrio)((0, combi_1.altPrio)((0, combi_1.regex)(/^\d+$/), _1.SimpleFieldChain2)));
         return offset;
     }
 }

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

@@ -7,7 +7,8 @@ const version_1 = require("../../../version");
 class Break {
     getMatcher() {
         const next = (0, combi_1.str)("AT NEXT APPLICATION STATEMENT");
-        const ret = (0, combi_1.altPrio)((0, combi_1.seq)("BREAK-POINT", (0, combi_1.optPrio)((0, combi_1.altPrio)(next, expressions_1.Source))), (0, combi_1.seq)("BREAK", expressions_1.FieldSub));
+        // note BREAK is a special macro that wraps the parameter in a char
+        const ret = (0, combi_1.altPrio)((0, combi_1.seq)("BREAK-POINT", (0, combi_1.optPrio)((0, combi_1.altPrio)(next, expressions_1.Source))), (0, combi_1.seq)("BREAK", (0, combi_1.starPrio)((0, combi_1.regex)(/.*/))));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }

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

@@ -13,7 +13,7 @@ class ReadTable {
         const key = (0, combi_1.seq)((0, combi_1.altPrio)("WITH KEY", "WITH TABLE KEY"), (0, combi_1.alt)(expressions_1.ComponentCompareSimple, components, (0, combi_1.seq)((0, combi_1.optPrio)("="), expressions_1.Source)));
         const using = (0, combi_1.seq)("USING KEY", (0, combi_1.alt)(expressions_1.Field, expressions_1.Dynamic));
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
-        const perm = (0, combi_1.per)((0, combi_1.alt)(index, key, from), expressions_1.ReadTableTarget, using, comparing, "CASTING", "TRANSPORTING ALL FIELDS", (0, combi_1.seq)("TRANSPORTING", transporting_fields_1.TransportingFields), "BINARY SEARCH");
+        const perm = (0, combi_1.per)((0, combi_1.alt)(index, key, from), expressions_1.ReadTableTarget, using, comparing, "CASTING", (0, combi_1.seq)("TRANSPORTING", (0, combi_1.altPrio)("ALL FIELDS", "NO FIELDS", transporting_fields_1.TransportingFields)), "BINARY SEARCH");
         return (0, combi_1.seq)("READ TABLE", (0, combi_1.alt)(expressions_1.SimpleSource2, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source)), (0, combi_1.opt)(perm));
     }
 }

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

@@ -492,9 +492,11 @@ class TypeUtils {
                 && this.isCharLike(source)) {
                 return true;
             }
+            else if (source instanceof basic_1.StructureType) {
+                return this.isCharLikeStrict(source);
+            }
             else if (source instanceof basic_1.DataReference
                 || source instanceof basic_1.ObjectReferenceType
-                || source instanceof basic_1.StructureType
                 || source instanceof basic_1.GenericObjectReferenceType) {
                 return false;
             }

package/build/src/lsp/diagnostics.js

@@ -2,15 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Diagnostics = void 0;
 const LServer = require("vscode-languageserver-types");
-const _lsp_utils_1 = require("./_lsp_utils");
 const severity_1 = require("../severity");
 class Diagnostics {
     constructor(reg) {
         this.reg = reg;
     }
     findIssues(textDocument) {
-        this.reg.parse();
-        const file = _lsp_utils_1.LSPUtils.getABAPFile(this.reg, textDocument.uri); // todo, this sould also run for xml files
+        const file = this.reg.getFileByName(textDocument.uri);
         if (file === undefined) {
             return [];
         }
@@ -18,6 +16,7 @@ class Diagnostics {
         if (obj === undefined) {
             return [];
         }
+        this.reg.parse();
         let issues = this.reg.findIssuesObject(obj);
         issues = issues.filter(i => i.getFilename() === file.getFilename());
         return issues;

package/build/src/registry.js

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

package/package.json

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