@abaplint/core 2.101.15 → 2.101.17

package/build/abaplint.d.ts

@@ -441,6 +441,7 @@ declare namespace BasicTypes {
         UnknownType,
         UTCLongType,
         VoidType,
+        XGenericType,
         XSequenceType,
         XStringType
     }
@@ -1310,7 +1311,7 @@ export declare class CurrentScope {
     addDeferred(token: Token | undefined): void;
     addListPrefix(identifiers: readonly TypedIdentifier[], prefix: string): void;
     addList(identifiers: readonly TypedIdentifier[]): void;
-    addReference(usage: Token | undefined, referencing: Identifier | undefined, type: ReferenceType | undefined, filename: string, extra?: IReferenceExtras): void;
+    addReference(usage: Token | undefined, referencing: Identifier | undefined, type: ReferenceType | ReferenceType[] | undefined, filename: string, extra?: IReferenceExtras): void;
     addSQLConversion(fieldName: string, message: string, token: Token): void;
     findFunctionModule(name: string | undefined): FunctionModuleDefinition | undefined;
     findObjectDefinition(name: string | undefined): IClassDefinition | IInterfaceDefinition | undefined;
@@ -6793,6 +6794,14 @@ declare class WStaticArrowW extends Token {
     static railroad(): string;
 }
 
+declare class XGenericType extends AbstractType {
+    toText(): string;
+    isGeneric(): boolean;
+    toABAP(): string;
+    containsVoid(): boolean;
+    toCDS(): string;
+}
+
 declare class XSequenceType extends AbstractType {
     toText(): string;
     isGeneric(): boolean;

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

@@ -133,12 +133,19 @@ class CurrentScope {
         }
     }
     addReference(usage, referencing, type, filename, extra) {
-        var _a;
+        var _a, _b;
         if (usage === undefined || type === undefined) {
             return;
         }
         const position = new _identifier_1.Identifier(usage, filename);
-        (_a = this.current) === null || _a === void 0 ? void 0 : _a.getData().references.push({ position, resolved: referencing, referenceType: type, extra });
+        if (Array.isArray(type)) {
+            for (const t of type) {
+                (_a = this.current) === null || _a === void 0 ? void 0 : _a.getData().references.push({ position, resolved: referencing, referenceType: t, extra });
+            }
+        }
+        else {
+            (_b = this.current) === null || _b === void 0 ? void 0 : _b.getData().references.push({ position, resolved: referencing, referenceType: type, extra });
+        }
     }
     addSQLConversion(fieldName, message, token) {
         var _a;

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

@@ -92,6 +92,7 @@ class TypeUtils {
         else if (type instanceof basic_1.XStringType
             || type instanceof basic_1.HexType
             || type instanceof basic_1.VoidType
+            || type instanceof basic_1.XGenericType
             || type instanceof basic_1.XSequenceType
             || type instanceof basic_1.AnyType
             || type instanceof basic_1.UnknownType) {
@@ -208,12 +209,15 @@ class TypeUtils {
         }
         return false;
     }
-    isAssignableStrict(source, target) {
+    isAssignableStrict(source, target, containsMethodCall = false) {
         var _a, _b, _c, _d, _e, _f;
         /*
             console.dir(source);
             console.dir(target);
         */
+        if (containsMethodCall) {
+            return this.isAssignable(source, target);
+        }
         if (source instanceof basic_1.CharacterType) {
             if (target instanceof basic_1.CharacterType) {
                 if (((_a = source.getAbstractTypeData()) === null || _a === void 0 ? void 0 : _a.derivedFromConstant) === true) {

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

@@ -24,7 +24,7 @@ class BasicTypes {
     }
     lookupQualifiedName(name) {
         var _a;
-        // argh, todo, rewrite this entire method, more argh
+        // argh, todo, rewrite this entire method, more argh, again argh
         if (name === undefined) {
             return undefined;
         }
@@ -45,7 +45,10 @@ class BasicTypes {
                     const stru = oo.getTypeDefinitions().getByName(subTypeName);
                     const struType = stru === null || stru === void 0 ? void 0 : stru.getType();
                     if (stru && struType instanceof basic_1.StructureType) {
-                        const f = struType.getComponentByName(fieldName);
+                        let f = struType.getComponentByName(fieldName);
+                        if (split[2] && f instanceof basic_1.StructureType) {
+                            f = f.getComponentByName(split[2]);
+                        }
                         if (f) {
                             return new _typed_identifier_1.TypedIdentifier(stru.getToken(), stru.getFilename(), f);
                         }
@@ -67,7 +70,10 @@ class BasicTypes {
             if (type) {
                 const stru = type.getType();
                 if (stru instanceof basic_1.StructureType) {
-                    const f = stru.getComponentByName(fieldName);
+                    let f = stru.getComponentByName(fieldName);
+                    if (split[2] && f instanceof basic_1.StructureType) {
+                        f = f.getComponentByName(split[2]);
+                    }
                     if (f) {
                         return new _typed_identifier_1.TypedIdentifier(type.getToken(), type.getFilename(), f);
                     }

package/build/src/abap/5_syntax/expressions/attribute_chain.js

@@ -32,7 +32,9 @@ class AttributeChain {
         if (context === undefined) {
             throw new Error("Attribute or constant \"" + name + "\" not found in \"" + def.getName() + "\"");
         }
-        scope.addReference(nameToken, context, type, filename);
+        for (const t of type) {
+            scope.addReference(nameToken, context, t, filename);
+        }
         // todo, loop, handle ArrowOrDash, ComponentName, TableExpression
         return context.getType();
     }

package/build/src/abap/5_syntax/expressions/method_call_param.js

@@ -55,7 +55,7 @@ class MethodCallParam {
             if (sourceType === undefined) {
                 throw new Error("No source type determined, method source");
             }
-            else if (new _type_utils_1.TypeUtils(scope).isAssignableStrict(sourceType, targetType) === false) {
+            else if (new _type_utils_1.TypeUtils(scope).isAssignableStrict(sourceType, targetType, child.findFirstExpression(Expressions.MethodCallChain) !== undefined) === false) {
                 throw new Error("Method parameter type not compatible");
             }
         }

package/build/src/abap/5_syntax/expressions/method_param.js

@@ -30,6 +30,9 @@ class MethodParam {
         if (concat === "TYPE C" || concat.startsWith("TYPE C ")) {
             return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, new cgeneric_type_1.CGenericType(), meta);
         }
+        else if (concat === "TYPE X" || concat.startsWith("TYPE X ")) {
+            return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, new basic_1.XGenericType(), meta);
+        }
         const found = new basic_types_1.BasicTypes(filename, scope).parseType(type);
         if (found) {
             return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, found, meta);

package/build/src/abap/5_syntax/expressions/source.js

@@ -34,7 +34,7 @@ const _typed_identifier_1 = require("../../types/_typed_identifier");
 * DATA(bar) = VALUE #( ... ).     give error, no type can be derived
 */
 class Source {
-    runSyntax(node, scope, filename, targetType) {
+    runSyntax(node, scope, filename, targetType, writeReference = false) {
         if (node === undefined) {
             return undefined;
         }
@@ -161,12 +161,16 @@ class Source {
             return undefined;
         }
         let context = new unknown_type_1.UnknownType("todo, Source type");
+        const type = [_reference_1.ReferenceType.DataReadReference];
+        if (writeReference) {
+            type.push(_reference_1.ReferenceType.DataWriteReference);
+        }
         while (children.length >= 0) {
             if (first instanceof nodes_1.ExpressionNode && first.get() instanceof Expressions.MethodCallChain) {
                 context = new method_call_chain_1.MethodCallChain().runSyntax(first, scope, filename, targetType);
             }
             else if (first instanceof nodes_1.ExpressionNode && first.get() instanceof Expressions.FieldChain) {
-                context = new field_chain_1.FieldChain().runSyntax(first, scope, filename, _reference_1.ReferenceType.DataReadReference);
+                context = new field_chain_1.FieldChain().runSyntax(first, scope, filename, type);
             }
             else if (first instanceof nodes_1.ExpressionNode && first.get() instanceof Expressions.StringTemplate) {
                 context = new string_template_1.StringTemplate().runSyntax(first, scope, filename);
@@ -179,15 +183,14 @@ class Source {
             }
             else if (first instanceof nodes_1.ExpressionNode && first.get() instanceof Expressions.Dereference) {
                 context = new dereference_1.Dereference().runSyntax(context);
-            }
-            else if (first instanceof nodes_1.ExpressionNode && first.get() instanceof Expressions.ArrowOrDash) {
+                //      } else if (first instanceof ExpressionNode && first.get() instanceof Expressions.ArrowOrDash) {
                 //        console.dir("dash");
             }
             else if (first instanceof nodes_1.ExpressionNode && first.get() instanceof Expressions.ComponentChain) {
                 context = new component_chain_1.ComponentChain().runSyntax(context, first, scope, filename);
             }
             else if (first instanceof nodes_1.ExpressionNode && first.get() instanceof Expressions.AttributeChain) {
-                context = new attribute_chain_1.AttributeChain().runSyntax(context, first, scope, filename, _reference_1.ReferenceType.DataReadReference);
+                context = new attribute_chain_1.AttributeChain().runSyntax(context, first, scope, filename, type);
             }
             first = children.shift();
             if (first === undefined) {

package/build/src/abap/5_syntax/statements/loop.js

@@ -20,12 +20,13 @@ class Loop {
         if (target === undefined) {
             target = node.findDirectExpression(Expressions.FSTarget);
         }
+        const write = (loopTarget === null || loopTarget === void 0 ? void 0 : loopTarget.findDirectTokenByText("ASSIGNING")) !== undefined;
         const sources = node.findDirectExpressions(Expressions.Source);
         let firstSource = node.findDirectExpression(Expressions.SimpleSource2);
         if (firstSource === undefined) {
             firstSource = sources[0];
         }
-        let sourceType = firstSource ? new source_1.Source().runSyntax(firstSource, scope, filename, targetType) : undefined;
+        let sourceType = firstSource ? new source_1.Source().runSyntax(firstSource, scope, filename, targetType, write) : undefined;
         let rowType = undefined;
         const concat = node.concatTokens().toUpperCase();
         if (sourceType === undefined) {

package/build/src/abap/types/basic/hex_type.js

@@ -6,7 +6,7 @@ class HexType extends _abstract_type_1.AbstractType {
     constructor(length, qualifiedName) {
         super({ qualifiedName: qualifiedName });
         if (length <= 0) {
-            throw new Error("Bad LENGTHm, Hex");
+            throw new Error("Bad LENGTH, Hex");
         }
         this.length = length;
     }

package/build/src/abap/types/basic/index.js

@@ -42,6 +42,7 @@ __exportStar(require("./time_type"), exports);
 __exportStar(require("./unknown_type"), exports);
 __exportStar(require("./utc_long_type"), exports);
 __exportStar(require("./void_type"), exports);
+__exportStar(require("./xgeneric_type"), exports);
 __exportStar(require("./xsequence_type"), exports);
 __exportStar(require("./xstring_type"), exports);
 //# sourceMappingURL=index.js.map

package/build/src/abap/types/basic/xgeneric_type.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XGenericType = void 0;
+const _abstract_type_1 = require("./_abstract_type");
+class XGenericType extends _abstract_type_1.AbstractType {
+    toText() {
+        return "```x```";
+    }
+    isGeneric() {
+        return true;
+    }
+    toABAP() {
+        throw new Error("x, generic");
+    }
+    containsVoid() {
+        return false;
+    }
+    toCDS() {
+        return "abap.TODO_CGENERIC";
+    }
+}
+exports.XGenericType = XGenericType;
+//# sourceMappingURL=xgeneric_type.js.map

package/build/src/registry.js

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

package/build/src/rules/align_parameters.js

@@ -6,7 +6,9 @@ const Expressions = require("../abap/2_statements/expressions");
 const _abap_rule_1 = require("./_abap_rule");
 const _basic_rule_config_1 = require("./_basic_rule_config");
 const _irule_1 = require("./_irule");
+const position_1 = require("../position");
 const __1 = require("..");
+const edit_helper_1 = require("../edit_helper");
 class AlignParametersConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.AlignParametersConf = AlignParametersConf;
@@ -33,8 +35,9 @@ https://github.com/SAP/styleguides/blob/master/clean-abap/CleanABAP.md#align-par
 
 Does not take effect on non functional method calls, use https://rules.abaplint.org/functional_writing/
 
-Also https://rules.abaplint.org/max_one_method_parameter_per_line/ can help aligning parameter syntax`,
-            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Whitespace, _irule_1.RuleTag.Styleguide],
+If parameters are on the same row, no issues are reported, see
+https://rules.abaplint.org/max_one_method_parameter_per_line/ for splitting parameters to lines`,
+            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Whitespace, _irule_1.RuleTag.Styleguide, _irule_1.RuleTag.Quickfix],
             badExample: `CALL FUNCTION 'FOOBAR'
   EXPORTING
     foo = 2
@@ -96,16 +99,28 @@ DATA(sdf) = VALUE type(
             return undefined;
         }
         let expectedEqualsColumn = 0;
+        let row = 0;
         for (const p of candidate.parameters) {
             const currentCol = p.left.getLastToken().getCol() + p.left.getLastToken().getStr().length + 1;
+            if (p.eq.getRow() === row) {
+                return undefined;
+            }
+            row = p.eq.getRow();
             if (currentCol > expectedEqualsColumn) {
                 expectedEqualsColumn = currentCol;
             }
         }
         for (const p of candidate.parameters) {
             if (p.eq.getCol() !== expectedEqualsColumn) {
+                let fix;
+                if (p.eq.getCol() < expectedEqualsColumn) {
+                    fix = edit_helper_1.EditHelper.insertAt(file, p.eq, " ".repeat(expectedEqualsColumn - p.eq.getCol()));
+                }
+                else {
+                    fix = edit_helper_1.EditHelper.deleteRange(file, new position_1.Position(p.eq.getRow(), expectedEqualsColumn), p.eq);
+                }
                 const message = "Align parameters to column " + expectedEqualsColumn;
-                return issue_1.Issue.atPosition(file, p.eq, message, this.getMetadata().key, this.getConfig().severity);
+                return issue_1.Issue.atPosition(file, p.eq, message, this.getMetadata().key, this.getConfig().severity, fix);
             }
         }
         return undefined;

package/build/src/rules/fully_type_itabs.js

@@ -45,11 +45,11 @@ DATA lt_bar TYPE STANDARD TABLE OF ty.`,
             const concat = tt.concatTokens().toUpperCase();
             if (concat.includes("TYPE TABLE OF")) {
                 const message = "Specify table type";
-                issues.push(issue_1.Issue.atStatement(file, statement, message, this.getMetadata().key, this.conf.severity));
+                issues.push(issue_1.Issue.atPosition(file, tt.getFirstToken().getStart(), message, this.getMetadata().key, this.conf.severity));
             }
             else if (concat.includes(" WITH ") === false && concat.includes(" RANGE OF ") === false) {
                 const message = "Specify table key";
-                issues.push(issue_1.Issue.atStatement(file, statement, message, this.getMetadata().key, this.conf.severity));
+                issues.push(issue_1.Issue.atPosition(file, tt.getFirstToken().getStart(), message, this.getMetadata().key, this.conf.severity));
             }
         }
         return issues;

package/build/src/rules/select_single_full_key.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectSingleFullKey = exports.SelectSingleFullKeyConf = void 0;
 const issue_1 = require("../issue");
 const _basic_rule_config_1 = require("./_basic_rule_config");
-const _irule_1 = require("./_irule");
 const __1 = require("..");
 class SelectSingleFullKeyConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
@@ -23,7 +22,7 @@ class SelectSingleFullKey {
             shortDescription: `Detect SELECT SINGLE which are possibily not unique`,
             extendedInformation: `Table definitions must be known, ie. inside the errorNamespace`,
             pseudoComment: "EC CI_NOORDER",
-            tags: [_irule_1.RuleTag.Experimental],
+            tags: [],
         };
     }
     initialize(reg) {

package/build/src/rules/unnecessary_pragma.js

@@ -9,6 +9,12 @@ const _basic_rule_config_1 = require("./_basic_rule_config");
 const _statement_1 = require("../abap/2_statements/statements/_statement");
 const _irule_1 = require("./_irule");
 class UnnecessaryPragmaConf extends _basic_rule_config_1.BasicRuleConfig {
+    constructor() {
+        super(...arguments);
+        /** Allow NO_TEXT in global CLAS and INTF definitions,
+            its added automatically by SE24 in some cases where it should not */
+        this.allowNoTextGlobal = false;
+    }
 }
 exports.UnnecessaryPragmaConf = UnnecessaryPragmaConf;
 class UnnecessaryPragma extends _abap_rule_1.ABAPRule {
@@ -58,6 +64,7 @@ ENDIF.`,
     runParsed(file) {
         const issues = [];
         let noHandler = false;
+        let globalDefinition = false;
         const statements = file.getStatements();
         for (let i = 0; i < statements.length; i++) {
             const statement = statements[i];
@@ -65,6 +72,16 @@ ENDIF.`,
             if (statement.get() instanceof Statements.EndTry) {
                 noHandler = false;
             }
+            else if (statement.get() instanceof Statements.ClassDefinition
+                || statement.get() instanceof Statements.Interface) {
+                if (statement.findDirectExpression(Expressions.ClassGlobal)) {
+                    globalDefinition = true;
+                }
+            }
+            else if (statement.get() instanceof Statements.EndClass
+                || statement.get() instanceof Statements.EndInterface) {
+                globalDefinition = false;
+            }
             else if (statement.get() instanceof _statement_1.Comment) {
                 continue;
             }
@@ -77,9 +94,16 @@ ENDIF.`,
             else {
                 noHandler = this.containsNoHandler(statement, statements[i + 1]);
             }
-            issues.push(...this.checkText(statement, file));
+            if (this.getConfig().allowNoTextGlobal === true && globalDefinition === true) {
+                // skip
+            }
+            else {
+                issues.push(...this.checkText(statement, file));
+            }
             issues.push(...this.checkNeeded(statement, file));
-            issues.push(...this.checkSubrc(statement, nextStatement, file));
+            if (globalDefinition === false) {
+                issues.push(...this.checkSubrc(statement, nextStatement, file));
+            }
         }
         return issues;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.101.15",
+    "version": "2.101.17",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,10 +50,10 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.35.1",
+        "@microsoft/api-extractor": "^7.35.2",
         "@types/chai": "^4.3.5",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^20.2.5",
+        "@types/node": "^20.2.6",
         "chai": "^4.3.7",
         "eslint": "^8.42.0",
         "mocha": "^10.2.0",