@abaplint/core 2.105.0 → 2.105.2

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -367,6 +367,10 @@ Make sure to test the downported code, it might not always be completely correct
         if (found) {
             return found;
         }
+        found = this.assignComponent(low, high, lowFile, highSyntax);
+        if (found) {
+            return found;
+        }
         found = this.downportRefSimple(high, lowFile, highSyntax);
         if (found) {
             return found;
@@ -1476,6 +1480,28 @@ LOOP AT ${groupTargetName}tab ${groupTarget}.`;
         const fix = edit_helper_1.EditHelper.replaceRange(lowFile, high.getFirstToken().getStart(), high.getLastToken().getEnd(), code);
         return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, ASSIGN table expr", this.getMetadata().key, this.conf.severity, fix);
     }
+    assignComponent(low, high, lowFile, highSyntax) {
+        if (!(low.get() instanceof _statement_1.Unknown)) {
+            return undefined;
+        }
+        if (!(high.get() instanceof Statements.Assign)) {
+            return undefined;
+        }
+        const assignSource = high.findDirectExpression(Expressions.AssignSource);
+        if (assignSource === undefined || assignSource.getFirstToken().getStr().toUpperCase() !== "COMPONENT") {
+            return undefined;
+        }
+        const componentSource = assignSource.findExpressionAfterToken("COMPONENT");
+        if (componentSource === undefined || componentSource.get() instanceof Expressions.SimpleSource3) {
+            return undefined;
+        }
+        const uniqueName = this.uniqueName(assignSource.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
+        const code = `DATA(${uniqueName}) = ${componentSource.concatTokens()}.\n`;
+        const fix1 = edit_helper_1.EditHelper.insertAt(lowFile, high.getFirstToken().getStart(), code);
+        const fix2 = edit_helper_1.EditHelper.replaceRange(lowFile, componentSource.getFirstToken().getStart(), componentSource.getLastToken().getEnd(), uniqueName);
+        const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
+        return issue_1.Issue.atToken(lowFile, high.getFirstToken(), "Downport, ASSIGN COMPONENT source", this.getMetadata().key, this.conf.severity, fix);
+    }
     moveWithSimpleValue(low, high, lowFile) {
         if (!(low.get() instanceof _statement_1.Unknown)) {
             return undefined;

package/build/src/rules/no_prefixes.js

@@ -86,77 +86,77 @@ https://github.com/SAP/styleguides/blob/main/clean-abap/sub-sections/AvoidEncodi
         return ret;
     }
     checkData(topNode, regex, file) {
-        var _a, _b, _c;
         const ret = [];
         for (const data of topNode.findAllStatements(Statements.Data).concat(topNode.findAllStatements(Statements.DataBegin)).concat(topNode.findAllStatements(Statements.ClassDataBegin)).concat(topNode.findAllStatements(Statements.ClassData))) {
-            let name = ((_a = data.findFirstExpression(Expressions.DefinitionName)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "";
-            if (name === "") {
-                name = ((_b = data.findFirstExpression(Expressions.NamespaceSimpleName)) === null || _b === void 0 ? void 0 : _b.concatTokens()) || "";
-            }
-            if (name !== "" && name.match(regex)) {
-                const issue = issue_1.Issue.atToken(file, data.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
+            const nameExpression = data.findFirstExpression(Expressions.DefinitionName)
+                || data.findFirstExpression(Expressions.NamespaceSimpleName);
+            const name = (nameExpression === null || nameExpression === void 0 ? void 0 : nameExpression.concatTokens()) || "";
+            if (name !== "" && nameExpression && name.match(regex)) {
+                const issue = issue_1.Issue.atToken(file, nameExpression.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
                 ret.push(issue);
             }
         }
         for (const data of topNode.findAllExpressions(Expressions.InlineData)) {
-            const name = ((_c = data.findFirstExpression(Expressions.TargetField)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "";
-            if (name !== "" && name.match(regex)) {
-                const issue = issue_1.Issue.atToken(file, data.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
+            const nameExpression = data.findFirstExpression(Expressions.TargetField);
+            const name = (nameExpression === null || nameExpression === void 0 ? void 0 : nameExpression.concatTokens()) || "";
+            if (name !== "" && nameExpression && name.match(regex)) {
+                const issue = issue_1.Issue.atToken(file, nameExpression.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
                 ret.push(issue);
             }
         }
         return ret;
     }
     checkStatics(topNode, regex, file) {
-        var _a;
         const ret = [];
         for (const data of topNode.findAllStatements(Statements.Static).concat(topNode.findAllStatements(Statements.StaticBegin))) {
-            const name = ((_a = data.findFirstExpression(Expressions.DefinitionName)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "";
-            if (name !== "" && name.match(regex)) {
-                const issue = issue_1.Issue.atToken(file, data.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
+            const nameExpression = data.findFirstExpression(Expressions.DefinitionName);
+            const name = (nameExpression === null || nameExpression === void 0 ? void 0 : nameExpression.concatTokens()) || "";
+            if (name !== "" && nameExpression && name.match(regex)) {
+                const issue = issue_1.Issue.atToken(file, nameExpression.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
                 ret.push(issue);
             }
         }
         return ret;
     }
     checkFieldSymbols(topNode, regex, file) {
-        var _a, _b;
         const ret = [];
         for (const data of topNode.findAllStatements(Statements.FieldSymbol)) {
-            const name = ((_a = data.findFirstExpression(Expressions.FieldSymbol)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "";
-            if (name !== "" && name.match(regex)) {
-                const issue = issue_1.Issue.atToken(file, data.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
+            const nameExpression = data.findFirstExpression(Expressions.FieldSymbol);
+            const name = (nameExpression === null || nameExpression === void 0 ? void 0 : nameExpression.concatTokens()) || "";
+            if (name !== "" && nameExpression && name.match(regex)) {
+                const issue = issue_1.Issue.atToken(file, nameExpression.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
                 ret.push(issue);
             }
         }
         for (const data of topNode.findAllExpressions(Expressions.InlineFS)) {
-            const name = ((_b = data.findFirstExpression(Expressions.FieldSymbol)) === null || _b === void 0 ? void 0 : _b.concatTokens()) || "";
-            if (name !== "" && name.match(regex)) {
-                const issue = issue_1.Issue.atToken(file, data.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
+            const nameExpression = data.findFirstExpression(Expressions.FieldSymbol);
+            const name = (nameExpression === null || nameExpression === void 0 ? void 0 : nameExpression.concatTokens()) || "";
+            if (name !== "" && nameExpression && name.match(regex)) {
+                const issue = issue_1.Issue.atToken(file, nameExpression.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
                 ret.push(issue);
             }
         }
         return ret;
     }
     checkConstants(topNode, regex, file) {
-        var _a;
         const ret = [];
         for (const data of topNode.findAllStatements(Statements.Constant).concat(topNode.findAllStatements(Statements.ConstantBegin))) {
-            const name = ((_a = data.findFirstExpression(Expressions.DefinitionName)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "";
-            if (name !== "" && name.match(regex)) {
-                const issue = issue_1.Issue.atToken(file, data.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
+            const nameExpression = data.findFirstExpression(Expressions.DefinitionName);
+            const name = (nameExpression === null || nameExpression === void 0 ? void 0 : nameExpression.concatTokens()) || "";
+            if (name !== "" && nameExpression && name.match(regex)) {
+                const issue = issue_1.Issue.atToken(file, nameExpression.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
                 ret.push(issue);
             }
         }
         return ret;
     }
     checkTypes(topNode, regex, file) {
-        var _a;
         const ret = [];
         for (const data of topNode.findAllStatements(Statements.Type).concat(topNode.findAllStatements(Statements.TypeEnum)).concat(topNode.findAllStatements(Statements.TypeEnumBegin)).concat(topNode.findAllStatements(Statements.TypeMesh)).concat(topNode.findAllStatements(Statements.TypeMeshBegin)).concat(topNode.findAllStatements(Statements.TypeBegin))) {
-            const name = ((_a = data.findFirstExpression(Expressions.NamespaceSimpleName)) === null || _a === void 0 ? void 0 : _a.concatTokens()) || "";
-            if (name !== "" && name.match(regex)) {
-                const issue = issue_1.Issue.atToken(file, data.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
+            const nameExpression = data.findFirstExpression(Expressions.NamespaceSimpleName);
+            const name = (nameExpression === null || nameExpression === void 0 ? void 0 : nameExpression.concatTokens()) || "";
+            if (name !== "" && nameExpression && name.match(regex)) {
+                const issue = issue_1.Issue.atToken(file, nameExpression.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
                 ret.push(issue);
             }
         }
@@ -168,7 +168,7 @@ https://github.com/SAP/styleguides/blob/main/clean-abap/sub-sections/AvoidEncodi
             for (const def of method.findAllExpressions(Expressions.MethodParamName)) {
                 const name = def.concatTokens();
                 if (name !== "" && name.match(regex)) {
-                    const issue = issue_1.Issue.atToken(file, method.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
+                    const issue = issue_1.Issue.atToken(file, def.getFirstToken(), MESSAGE, this.getMetadata().key, this.conf.severity);
                     ret.push(issue);
                 }
             }

package/package.json

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