@abaplint/cli 2.113.84 → 2.113.86

package/build/cli.js

@@ -10201,7 +10201,7 @@ class Assign {
         const decimals = (0, combi_1.seq)("DECIMALS", expressions_1.Source);
         const casting = (0, combi_1.seq)("CASTING", (0, combi_1.opt)((0, combi_1.alt)(like, handle, (0, combi_1.per)(type, decimals))));
         const obsoleteType = (0, combi_1.seq)("TYPE", expressions_1.Source, (0, combi_1.optPrio)(decimals));
-        const ret = (0, combi_1.seq)("ASSIGN", (0, combi_1.opt)((0, combi_1.seq)(expressions_1.Target, "INCREMENT")), expressions_1.AssignSource, "TO", expressions_1.FSTarget, (0, combi_1.opt)((0, combi_1.altPrio)(casting, obsoleteType)), (0, combi_1.opt)(range), (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v757, "ELSE UNASSIGN")));
+        const ret = (0, combi_1.seq)("ASSIGN", (0, combi_1.opt)((0, combi_1.seq)(expressions_1.Target, "INCREMENT")), expressions_1.AssignSource, "TO", expressions_1.FSTarget, (0, combi_1.opt)((0, combi_1.altPrio)(casting, obsoleteType, decimals)), (0, combi_1.opt)(range), (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v757, "ELSE UNASSIGN")));
         return ret;
     }
 }
@@ -10681,7 +10681,7 @@ const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@a
 class CallOLE {
     getMatcher() {
         const rc = (0, combi_1.seq)("=", expressions_1.Target);
-        const ret = (0, combi_1.seq)("CALL METHOD OF", expressions_1.Source, expressions_1.Source, (0, combi_1.opt)(rc), (0, combi_1.opt)("NO FLUSH"), (0, combi_1.opt)("QUEUEONLY"), (0, combi_1.opt)(expressions_1.OLEExporting));
+        const ret = (0, combi_1.seq)("CALL METHOD OF", expressions_1.Source, expressions_1.Source, (0, combi_1.opt)(rc), (0, combi_1.opt)("NO FLUSH"), (0, combi_1.opt)("QUEUE-ONLY"), (0, combi_1.opt)(expressions_1.OLEExporting));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -13105,9 +13105,12 @@ exports.Field = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
+const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 class Field {
     getMatcher() {
-        const ret = (0, combi_1.seq)("FIELD", expressions_1.FieldChain, (0, combi_1.opt)((0, combi_1.seq)("MODULE", expressions_1.FormName, (0, combi_1.opt)((0, combi_1.alt)("ON INPUT", "ON REQUEST")))));
+        const module = (0, combi_1.seq)("MODULE", expressions_1.FormName, (0, combi_1.opt)((0, combi_1.alt)("ON INPUT", "ON REQUEST")));
+        const values = (0, combi_1.seq)("VALUES", (0, combi_1.tok)(tokens_1.WParenLeft), "BETWEEN", expressions_1.Constant, "AND", expressions_1.Constant, (0, combi_1.tok)(tokens_1.ParenRightW));
+        const ret = (0, combi_1.seq)("FIELD", expressions_1.FieldChain, (0, combi_1.opt)((0, combi_1.alt)(module, values)));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -13750,7 +13753,7 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class GetProperty {
     getMatcher() {
-        const ret = (0, combi_1.seq)("GET PROPERTY OF", expressions_1.FieldSub, expressions_1.Source, "=", expressions_1.Source, (0, combi_1.opt)("NO FLUSH"), (0, combi_1.opt)("QUEUEONLY"), (0, combi_1.opt)(expressions_1.OLEExporting));
+        const ret = (0, combi_1.seq)("GET PROPERTY OF", expressions_1.FieldSub, expressions_1.Source, "=", expressions_1.Source, (0, combi_1.opt)("NO FLUSH"), (0, combi_1.opt)("QUEUE-ONLY"), (0, combi_1.opt)(expressions_1.OLEExporting));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -15030,7 +15033,7 @@ class ModifyLine {
     getMatcher() {
         const onOff = (0, combi_1.alt)("ON", "OFF");
         const eq = (0, combi_1.seq)("=", expressions_1.Source);
-        const form = (0, combi_1.seq)((0, combi_1.alt)("INVERSE", "INPUT", "COLOR"), (0, combi_1.alt)(eq, onOff));
+        const form = (0, combi_1.seq)((0, combi_1.alt)("INVERSE", "INPUT", "COLOR", "HOTSPOT"), (0, combi_1.alt)(eq, onOff));
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
         const value = (0, combi_1.seq)("FIELD VALUE", (0, combi_1.plus)((0, combi_1.seq)(expressions_1.Source, (0, combi_1.optPrio)(from))));
         const format = (0, combi_1.seq)("FIELD FORMAT", expressions_1.Source, (0, combi_1.opt)(form));
@@ -15091,7 +15094,7 @@ const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@a
 class Module {
     getMatcher() {
         const sw = (0, combi_1.seq)("SWITCH", expressions_1.NamespaceSimpleName);
-        const ret = (0, combi_1.seq)("MODULE", expressions_1.FormName, (0, combi_1.opt)((0, combi_1.alt)("INPUT", "OUTPUT", "ON CHAIN-REQUEST", "ON CHAIN-INPUT", sw)));
+        const ret = (0, combi_1.seq)("MODULE", expressions_1.FormName, (0, combi_1.opt)((0, combi_1.alt)("INPUT", "OUTPUT", "ON CHAIN-REQUEST", "ON CHAIN-INPUT", "AT EXIT-COMMAND", sw)));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -16375,7 +16378,8 @@ class ScrollList {
         const line = (0, combi_1.seq)("LINE", expressions_1.Source);
         const column = (0, combi_1.seq)("TO COLUMN", expressions_1.Source);
         const to = (0, combi_1.seq)("TO", (0, combi_1.alt)("FIRST PAGE", "LAST PAGE", (0, combi_1.seq)("PAGE", expressions_1.Source)));
-        const ret = (0, combi_1.seq)("SCROLL LIST", (0, combi_1.per)(index, (0, combi_1.alt)(to, "BACKWARD", "FORWARD"), (0, combi_1.seq)((0, combi_1.alt)("LEFT", "RIGHT"), (0, combi_1.opt)((0, combi_1.seq)("BY", expressions_1.Source, "PLACES"))), column, line));
+        const pages = (0, combi_1.seq)(expressions_1.Source, "PAGES");
+        const ret = (0, combi_1.seq)("SCROLL LIST", (0, combi_1.per)(index, (0, combi_1.seq)((0, combi_1.alt)(to, "BACKWARD", "FORWARD"), (0, combi_1.opt)(pages)), (0, combi_1.seq)((0, combi_1.alt)("LEFT", "RIGHT"), (0, combi_1.opt)((0, combi_1.seq)("BY", expressions_1.Source, "PLACES"))), column, line));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -32004,12 +32008,11 @@ class Loop {
                 const message = "No source type determined";
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
             }
-            return;
         }
         else if (sourceType instanceof basic_1.UnknownType) {
             const message = "Loop, not a table type, " + sourceType.getError();
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
-            return;
+            sourceType = new basic_1.VoidType("Loop, not a table type");
         }
         else if (sourceType instanceof basic_1.TableType
             && target === undefined
@@ -32017,7 +32020,6 @@ class Loop {
             && node.getChildren().length === 4) {
             const message = "Loop, no header line";
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
-            return;
         }
         else if (!(sourceType instanceof basic_1.TableType)
             && !(sourceType instanceof basic_1.AnyType)
@@ -32026,14 +32028,12 @@ class Loop {
             && concat.startsWith("LOOP AT GROUP ") === false) {
             const message = "Loop, not a table type";
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
-            return;
         }
         else if (loopTarget === undefined
             && sourceType instanceof basic_1.TableType
             && sourceType.isWithHeader() === false) {
             const message = "Loop, no header";
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
-            return;
         }
         const targetConcat = loopTarget === null || loopTarget === void 0 ? void 0 : loopTarget.concatTokens().toUpperCase();
         if (sourceType instanceof basic_1.TableType) {
@@ -45533,7 +45533,10 @@ class ABAPObject extends _abstract_object_1.AbstractObject {
         }
         // uri fallback,
         for (const file of this.getABAPFiles()) {
-            if (file.getFilename().endsWith(".abap")) {
+            if (file.getFilename().includes(".prog.screen_")) {
+                continue;
+            }
+            else if (file.getFilename().endsWith(".abap")) {
                 return file;
             }
         }
@@ -53315,6 +53318,7 @@ class Indent {
                 || type instanceof Statements.EndModule
                 || type instanceof Statements.EndSelect
                 || type instanceof Statements.EndMethod
+                || type instanceof Statements.EndChain
                 || type instanceof Statements.EndAt
                 || type instanceof Statements.Else
                 || type instanceof Statements.EndExec
@@ -53423,6 +53427,7 @@ class Indent {
                 || type instanceof Statements.Else
                 || type instanceof Statements.ElseIf
                 || type instanceof Statements.MethodImplementation
+                || type instanceof Statements.Chain
                 || type instanceof Statements.TestInjection
                 || type instanceof Statements.TestSeam
                 || (this.options.selectionScreenBlockIndentation === true
@@ -53628,7 +53633,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.84";
+        return "2.113.86";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -88948,11 +88953,11 @@ function _supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) {
 	}
 
 	if ('CI' in env) {
-		if ('GITHUB_ACTIONS' in env || 'GITEA_ACTIONS' in env) {
+		if (['GITHUB_ACTIONS', 'GITEA_ACTIONS', 'CIRCLECI'].some(key => key in env)) {
 			return 3;
 		}
 
-		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI', 'BUILDKITE', 'DRONE'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+		if (['TRAVIS', 'APPVEYOR', 'GITLAB_CI', 'BUILDKITE', 'DRONE'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
 			return 1;
 		}
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.84",
+    "version": "2.113.86",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,25 +38,25 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.113.84",
+        "@abaplint/core": "^2.113.86",
         "@types/chai": "^4.3.20",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",
-        "@types/node": "^22.10.2",
+        "@types/node": "^22.10.5",
         "@types/progress": "^2.0.7",
         "chai": "^4.5.0",
-        "chalk": "^5.3.0",
+        "chalk": "^5.4.1",
         "eslint": "^9.17.0",
         "glob": "^7.2.3",
         "json5": "^2.2.3",
-        "memfs": "^4.15.0",
+        "memfs": "^4.15.3",
         "minimist": "^1.2.8",
         "mocha": "^11.0.1",
         "progress": "^2.0.3",
         "typescript": "^5.7.2",
         "webpack": "^5.97.1",
-        "webpack-cli": "^5.1.4",
+        "webpack-cli": "^6.0.1",
         "xml-js": "^1.6.11"
     },
     "dependencies": {}