@abaplint/cli 2.101.9 → 2.101.10

package/build/cli.js

@@ -17109,8 +17109,8 @@ class StructureParser {
         return { issues: [], node: parent };
     }
 }
-StructureParser.singletons = {};
 exports.StructureParser = StructureParser;
+StructureParser.singletons = {};
 //# sourceMappingURL=structure_parser.js.map
 
 /***/ }),
@@ -18748,26 +18748,26 @@ var AttributeLevel;
     AttributeLevel["Instance"] = "instance";
     AttributeLevel["Static"] = "static";
     AttributeLevel["Constant"] = "constant";
-})(AttributeLevel = exports.AttributeLevel || (exports.AttributeLevel = {}));
+})(AttributeLevel || (exports.AttributeLevel = AttributeLevel = {}));
 var MethodParameterDirection;
 (function (MethodParameterDirection) {
     MethodParameterDirection["Importing"] = "importing";
     MethodParameterDirection["Exporting"] = "exporting";
     MethodParameterDirection["Changing"] = "changing";
     MethodParameterDirection["Returning"] = "returning";
-})(MethodParameterDirection = exports.MethodParameterDirection || (exports.MethodParameterDirection = {}));
+})(MethodParameterDirection || (exports.MethodParameterDirection = MethodParameterDirection = {}));
 var Duration;
 (function (Duration) {
     Duration["short"] = "SHORT";
     Duration["medium"] = "MEDIUM";
     Duration["long"] = "LONG";
-})(Duration = exports.Duration || (exports.Duration = {}));
+})(Duration || (exports.Duration = Duration = {}));
 var RiskLevel;
 (function (RiskLevel) {
     RiskLevel["harmless"] = "HARMLESS";
     RiskLevel["critical"] = "CRITICAL";
     RiskLevel["dangerous"] = "DANGEROUS";
-})(RiskLevel = exports.RiskLevel || (exports.RiskLevel = {}));
+})(RiskLevel || (exports.RiskLevel = RiskLevel = {}));
 //# sourceMappingURL=_abap_file_information.js.map
 
 /***/ }),
@@ -19218,7 +19218,7 @@ var Visibility;
     Visibility[Visibility["Private"] = 1] = "Private";
     Visibility[Visibility["Protected"] = 2] = "Protected";
     Visibility[Visibility["Public"] = 3] = "Public";
-})(Visibility = exports.Visibility || (exports.Visibility = {}));
+})(Visibility || (exports.Visibility = Visibility = {}));
 //# sourceMappingURL=visibility.js.map
 
 /***/ }),
@@ -19586,6 +19586,7 @@ class BuiltIn {
         return new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, new basic_1.VoidType(name), ["built-in" /* IdentifierMeta.BuiltIn */]);
     }
 }
+exports.BuiltIn = BuiltIn;
 BuiltIn.filename = "_builtin.prog.abap";
 // todo: "pcre" vs "regex", only one of these parameters are allowed
 // todo: "pcre", only possible from 755
@@ -20409,7 +20410,6 @@ BuiltIn.methods = [
         return: new basic_1.IntegerType(),
     },
 ];
-exports.BuiltIn = BuiltIn;
 //# sourceMappingURL=_builtin.js.map
 
 /***/ }),
@@ -21368,7 +21368,7 @@ var ReferenceType;
     //  FormVoidReference = "Form (void)",
     ReferenceType["DataReadReference"] = "Read From";
     ReferenceType["DataWriteReference"] = "Write To";
-})(ReferenceType = exports.ReferenceType || (exports.ReferenceType = {}));
+})(ReferenceType || (exports.ReferenceType = ReferenceType = {}));
 //# sourceMappingURL=_reference.js.map
 
 /***/ }),
@@ -21401,7 +21401,7 @@ var ScopeType;
     ScopeType["For"] = "for";
     ScopeType["Let"] = "let";
     ScopeType["OpenSQL"] = "open_sql";
-})(ScopeType = exports.ScopeType || (exports.ScopeType = {}));
+})(ScopeType || (exports.ScopeType = ScopeType = {}));
 //# sourceMappingURL=_scope_type.js.map
 
 /***/ }),
@@ -35117,13 +35117,13 @@ var TableAccessType;
     TableAccessType["hashed"] = "HASHED";
     TableAccessType["index"] = "INDEX";
     TableAccessType["any"] = "ANY";
-})(TableAccessType = exports.TableAccessType || (exports.TableAccessType = {}));
+})(TableAccessType || (exports.TableAccessType = TableAccessType = {}));
 var TableKeyType;
 (function (TableKeyType) {
     TableKeyType["default"] = "DEFAULT";
     TableKeyType["user"] = "USER";
     TableKeyType["empty"] = "EMPTY";
-})(TableKeyType = exports.TableKeyType || (exports.TableKeyType = {}));
+})(TableKeyType || (exports.TableKeyType = TableKeyType = {}));
 class TableType extends _abstract_type_1.AbstractType {
     constructor(rowType, options, qualifiedName) {
         var _a;
@@ -36021,7 +36021,7 @@ var FunctionModuleParameterDirection;
     FunctionModuleParameterDirection["exporting"] = "exporting";
     FunctionModuleParameterDirection["changing"] = "changing";
     FunctionModuleParameterDirection["tables"] = "tables";
-})(FunctionModuleParameterDirection = exports.FunctionModuleParameterDirection || (exports.FunctionModuleParameterDirection = {}));
+})(FunctionModuleParameterDirection || (exports.FunctionModuleParameterDirection = FunctionModuleParameterDirection = {}));
 class FunctionModuleDefinition {
     constructor(data) {
         this.parse(data);
@@ -38705,7 +38705,7 @@ var DDLKind;
 (function (DDLKind) {
     DDLKind["Structure"] = "structure";
     DDLKind["Table"] = "table";
-})(DDLKind = exports.DDLKind || (exports.DDLKind = {}));
+})(DDLKind || (exports.DDLKind = DDLKind = {}));
 class DDLParser {
     parse(file) {
         const tokens = ddl_lexer_1.DDLLexer.run(file);
@@ -41128,7 +41128,7 @@ var RenameType;
     RenameType[RenameType["Variable"] = 2] = "Variable";
     RenameType[RenameType["GlobalInterface"] = 3] = "GlobalInterface";
     RenameType[RenameType["Method"] = 4] = "Method";
-})(RenameType = exports.RenameType || (exports.RenameType = {}));
+})(RenameType || (exports.RenameType = RenameType = {}));
 class Rename {
     constructor(reg) {
         this.reg = reg;
@@ -41147,18 +41147,23 @@ class Rename {
             return undefined;
         }
         const range = _lsp_utils_1.LSPUtils.tokenToRange(cursor.token);
+        let placeholder = cursor.token.getStr();
+        if (placeholder.startsWith("!")) {
+            placeholder = placeholder.substring(1);
+            range.start.character += 1;
+        }
         const lookup = _lookup_1.LSPLookup.lookup(cursor, this.reg, obj);
         if ((lookup === null || lookup === void 0 ? void 0 : lookup.definitionId) instanceof _typed_identifier_1.TypedIdentifier) {
-            return { range, placeholder: cursor.token.getStr(), type: RenameType.Variable, file };
+            return { range, placeholder, type: RenameType.Variable, file };
         }
         else if ((lookup === null || lookup === void 0 ? void 0 : lookup.definitionId) instanceof types_1.ClassDefinition) {
-            return { range, placeholder: cursor.token.getStr(), type: RenameType.GlobalClass, file };
+            return { range, placeholder, type: RenameType.GlobalClass, file };
         }
         else if ((lookup === null || lookup === void 0 ? void 0 : lookup.definitionId) instanceof types_1.InterfaceDefinition) {
-            return { range, placeholder: cursor.token.getStr(), type: RenameType.GlobalInterface, file };
+            return { range, placeholder, type: RenameType.GlobalInterface, file };
         }
         else if ((lookup === null || lookup === void 0 ? void 0 : lookup.definitionId) instanceof types_1.MethodDefinition) {
-            return { range, placeholder: cursor.token.getStr(), type: RenameType.Method, file };
+            return { range, placeholder, type: RenameType.Method, file };
         }
         return undefined;
     }
@@ -41351,8 +41356,8 @@ class SemanticHighlighting {
         return ret;
     }
 }
-SemanticHighlighting.tokenTypes = [];
 exports.SemanticHighlighting = SemanticHighlighting;
+SemanticHighlighting.tokenTypes = [];
 //# sourceMappingURL=semantic.js.map
 
 /***/ }),
@@ -42620,7 +42625,7 @@ var ClassCategory;
     ClassCategory["PersistentFactory"] = "11";
     ClassCategory["Exception"] = "40";
     ClassCategory["SharedObject"] = "45";
-})(ClassCategory = exports.ClassCategory || (exports.ClassCategory = {}));
+})(ClassCategory || (exports.ClassCategory = ClassCategory = {}));
 class Class extends _abap_object_1.ABAPObject {
     constructor() {
         super(...arguments);
@@ -46680,7 +46685,7 @@ var EnhancementCategory;
     EnhancementCategory["Character"] = "2";
     EnhancementCategory["CharacterOrNumeric"] = "3";
     EnhancementCategory["Deep"] = "4";
-})(EnhancementCategory = exports.EnhancementCategory || (exports.EnhancementCategory = {}));
+})(EnhancementCategory || (exports.EnhancementCategory = EnhancementCategory = {}));
 var TableCategory;
 (function (TableCategory) {
     TableCategory["Transparent"] = "TRANSP";
@@ -46689,7 +46694,7 @@ var TableCategory;
     TableCategory["Pooled"] = "POOL";
     TableCategory["View"] = "VIEW";
     TableCategory["Append"] = "APPEND";
-})(TableCategory = exports.TableCategory || (exports.TableCategory = {}));
+})(TableCategory || (exports.TableCategory = TableCategory = {}));
 class Table extends _abstract_object_1.AbstractObject {
     getType() {
         return "TABL";
@@ -48155,7 +48160,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.101.9";
+        return "2.101.10";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -48607,7 +48612,7 @@ var RuleTag;
     RuleTag["Styleguide"] = "Styleguide";
     /** Single file compatible, the rule gives correct results when having only information about the single file */
     RuleTag["SingleFile"] = "SingleFile";
-})(RuleTag = exports.RuleTag || (exports.RuleTag = {}));
+})(RuleTag || (exports.RuleTag = RuleTag = {}));
 //# sourceMappingURL=_irule.js.map
 
 /***/ }),
@@ -55406,9 +55411,16 @@ ${indentation}    output = ${topTarget}.`;
             const data = `DATA ${name} TYPE REF TO ${type}.\n` +
                 indentation + abap + "\n" +
                 indentation;
-            const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), data);
-            const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, found.getFirstToken().getStart(), found.getLastToken().getEnd(), name);
-            fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+            if (found.getFirstToken().getStart().equals(high.getFirstToken().getStart())
+                && found.getLastToken().getEnd().equals(high.getLastToken().getStart())) {
+                // full statement = standalone NEW expression
+                fix = edit_helper_1.EditHelper.replaceRange(lowFile, high.getFirstToken().getStart(), high.getLastToken().getEnd(), abap);
+            }
+            else {
+                const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), data);
+                const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, found.getFirstToken().getStart(), found.getLastToken().getEnd(), name);
+                fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+            }
         }
         if (fix) {
             return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Use CREATE OBJECT instead of NEW", this.getMetadata().key, this.conf.severity, fix);
@@ -55774,24 +55786,24 @@ class EmptyStructure extends _abap_rule_1.ABAPRule {
         }
         const candidates = [];
         if (this.getConfig().loop === true) {
-            candidates.push(...stru.findAllStructures(Structures.Loop));
+            candidates.push(...stru.findAllStructuresRecursive(Structures.Loop));
         }
         if (this.getConfig().while === true) {
-            candidates.push(...stru.findAllStructures(Structures.While));
+            candidates.push(...stru.findAllStructuresRecursive(Structures.While));
         }
         if (this.getConfig().case === true) {
-            candidates.push(...stru.findAllStructures(Structures.Case));
+            candidates.push(...stru.findAllStructuresRecursive(Structures.Case));
         }
         if (this.getConfig().select === true) {
-            candidates.push(...stru.findAllStructures(Structures.Select));
+            candidates.push(...stru.findAllStructuresRecursive(Structures.Select));
         }
         if (this.getConfig().do === true) {
-            candidates.push(...stru.findAllStructures(Structures.Do));
+            candidates.push(...stru.findAllStructuresRecursive(Structures.Do));
         }
         if (this.getConfig().at === true) {
-            candidates.push(...stru.findAllStructures(Structures.At));
-            candidates.push(...stru.findAllStructures(Structures.AtFirst));
-            candidates.push(...stru.findAllStructures(Structures.AtLast));
+            candidates.push(...stru.findAllStructuresRecursive(Structures.At));
+            candidates.push(...stru.findAllStructuresRecursive(Structures.AtFirst));
+            candidates.push(...stru.findAllStructuresRecursive(Structures.AtLast));
         }
         for (const l of candidates) {
             if (l.getChildren().length === 2) {
@@ -55801,7 +55813,7 @@ class EmptyStructure extends _abap_rule_1.ABAPRule {
             }
         }
         if (this.getConfig().try === true) {
-            const tries = stru.findAllStructures(Structures.Try);
+            const tries = stru.findAllStructuresRecursive(Structures.Try);
             for (const t of tries) {
                 const normal = t.findDirectStructure(Structures.Body);
                 if (normal === undefined) {
@@ -55812,9 +55824,9 @@ class EmptyStructure extends _abap_rule_1.ABAPRule {
             }
         }
         if (this.getConfig().if === true) {
-            const tries = stru.findAllStructures(Structures.If)
-                .concat(stru.findAllStructures(Structures.Else))
-                .concat(stru.findAllStructures(Structures.ElseIf));
+            const tries = stru.findAllStructuresRecursive(Structures.If)
+                .concat(stru.findAllStructuresRecursive(Structures.Else))
+                .concat(stru.findAllStructuresRecursive(Structures.ElseIf));
             for (const t of tries) {
                 const normal = t.findDirectStructure(Structures.Body);
                 if (normal === undefined) {
@@ -55825,7 +55837,7 @@ class EmptyStructure extends _abap_rule_1.ABAPRule {
             }
         }
         if (this.getConfig().when === true) {
-            const tries = stru.findAllStructures(Structures.When);
+            const tries = stru.findAllStructuresRecursive(Structures.When);
             for (const t of tries) {
                 if (t.getChildren().length === 1) {
                     const token = t.getFirstToken();
@@ -58645,7 +58657,7 @@ var KeywordCaseStyle;
 (function (KeywordCaseStyle) {
     KeywordCaseStyle["Upper"] = "upper";
     KeywordCaseStyle["Lower"] = "lower";
-})(KeywordCaseStyle = exports.KeywordCaseStyle || (exports.KeywordCaseStyle = {}));
+})(KeywordCaseStyle || (exports.KeywordCaseStyle = KeywordCaseStyle = {}));
 class KeywordCaseConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -60892,7 +60904,7 @@ var NewlineLogic;
 (function (NewlineLogic) {
     NewlineLogic["Exact"] = "exact";
     NewlineLogic["Less"] = "less";
-})(NewlineLogic = exports.NewlineLogic || (exports.NewlineLogic = {}));
+})(NewlineLogic || (exports.NewlineLogic = NewlineLogic = {}));
 class NewlineBetweenMethodsConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -68646,7 +68658,7 @@ var Severity;
     Severity["Error"] = "Error";
     Severity["Warning"] = "Warning";
     Severity["Info"] = "Info";
-})(Severity = exports.Severity || (exports.Severity = {}));
+})(Severity || (exports.Severity = Severity = {}));
 //# sourceMappingURL=severity.js.map
 
 /***/ }),
@@ -69295,7 +69307,7 @@ var Version;
     Version["v756"] = "v756";
     Version["v757"] = "v757";
     Version["Cloud"] = "Cloud";
-})(Version = exports.Version || (exports.Version = {}));
+})(Version || (exports.Version = Version = {}));
 exports.defaultVersion = Version.v757;
 function getPreviousVersion(v) {
     if (v === Version.OpenABAP) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.101.9",
+    "version": "2.101.10",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.101.9",
+        "@abaplint/core": "^2.101.10",
         "@types/chai": "^4.3.5",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.2",
@@ -54,8 +54,8 @@
         "minimist": "^1.2.8",
         "mocha": "^10.2.0",
         "progress": "^2.0.3",
-        "typescript": "^5.0.4",
-        "webpack": "^5.84.1",
+        "typescript": "^5.1.3",
+        "webpack": "^5.85.0",
         "webpack-cli": "^5.1.1",
         "xml-js": "^1.6.11"
     },