@abaplint/cli 2.113.217 → 2.113.218

package/build/cli.js

@@ -437,7 +437,7 @@ class CodeClimate {
                         end: issue.getEnd().getRow(),
                     },
                 },
-                severity: (severityArray.includes(issue.getSeverity().toLowerCase())) ? issue.getSeverity().toLowerCase() : defaultSeverity,
+                severity: severityArray.includes(issue.getSeverity().toLowerCase()) ? issue.getSeverity().toLowerCase() : defaultSeverity,
                 fingerprint: md5(issue.getKey() + issue.getMessage() + issue.getFilename() + issue.getStart().getRow() + issue.getEnd().getRow()),
             };
             out.push(single);
@@ -478,7 +478,7 @@ class CodeFrame {
         const builtIssues = this.convertAllIssues(issues).sort(issueSort); // Make sure it is sorted by filename for caching to work
         return [
             ...builtIssues.map(i => this.renderIssue(i)),
-            (issues.length > 0 ? chalk_1.default.red(new total_1.Total().output(issues, fileCount)) : chalk_1.default.green(new total_1.Total().output(issues, fileCount))),
+            issues.length > 0 ? chalk_1.default.red(new total_1.Total().output(issues, fileCount)) : chalk_1.default.green(new total_1.Total().output(issues, fileCount)),
         ].join("\n");
     }
     convertAllIssues(issues) {
@@ -737,7 +737,7 @@ class Sonarqube {
             const single = {
                 engineId: "abaplint",
                 ruleId: issue.getKey(),
-                severity: (severityArray.includes(issue.getSeverity().toUpperCase())) ? issue.getSeverity().toUpperCase() : defaultSeverity,
+                severity: severityArray.includes(issue.getSeverity().toUpperCase()) ? issue.getSeverity().toUpperCase() : defaultSeverity,
                 type: "CODE_SMELL",
                 primaryLocation: {
                     message: issue.getMessage(),
@@ -1192,7 +1192,7 @@ class Rename {
                 continue;
             }
             for (const p of rconfig.patterns || []) {
-                if (!(o.getType().match(p.type))) {
+                if (!o.getType().match(p.type)) {
                     continue;
                 }
                 const regex = new RegExp(p.oldName, "i");
@@ -23835,7 +23835,7 @@ class TypeUtils {
                     if (!(sourceRowType instanceof basic_1.StructureType)) {
                         return false;
                     }
-                    else if (!(this.structureContainsString(sourceRowType))
+                    else if (!this.structureContainsString(sourceRowType)
                         && this.structureContainsVoid(sourceRowType) === false) {
                         return false;
                     }
@@ -23845,7 +23845,7 @@ class TypeUtils {
                     if (!(targetRowType instanceof basic_1.StructureType)) {
                         return false;
                     }
-                    else if (!(this.structureContainsString(targetRowType))
+                    else if (!this.structureContainsString(targetRowType)
                         && this.structureContainsVoid(targetRowType) === false) {
                         return false;
                     }
@@ -25643,7 +25643,7 @@ class CorrespondingBody {
         }
         const base = (_a = node.findDirectExpression(Expressions.CorrespondingBodyBase)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(Expressions.Source);
         if (base) {
-            source_1.Source.runSyntax(base, input);
+            source_1.Source.runSyntax(base, input, targetType);
         }
         let type = undefined;
         for (const s of node.findDirectExpressions(Expressions.Source)) {
@@ -54549,7 +54549,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.217";
+        return "2.113.218";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -60587,7 +60587,6 @@ ${indentation}${uniqueName} = ${source.concatTokens()}.\n${indentation}`);
         const source = high.findExpressionAfterToken("MESSAGE");
         if ((source === null || source === void 0 ? void 0 : source.get()) instanceof Expressions.MessageSourceSource
             && ((_a = source.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.Source) {
-            ;
             const uniqueName = this.uniqueName(high.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             const indentation = " ".repeat(high.getFirstToken().getStart().getCol() - 1);
             const firstToken = high.getFirstToken();
@@ -64019,7 +64018,7 @@ class FullyTypeConstants extends _abap_rule_1.ABAPRule {
         for (const stat of file.getStatements()) {
             if ((stat.get() instanceof Statements.Constant
                 || (this.conf.checkData === true && stat.get() instanceof Statements.Data))
-                && (!this.isTyped(stat))) {
+                && !this.isTyped(stat)) {
                 const type = stat.get() instanceof Statements.Constant ? "constant definition" : "data definition";
                 let token = (_a = stat.findFirstExpression(expressions_1.NamespaceSimpleName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
                 if (token === undefined) {
@@ -64034,7 +64033,7 @@ class FullyTypeConstants extends _abap_rule_1.ABAPRule {
         return issues;
     }
     isTyped(stat) {
-        return (stat.findFirstExpression(expressions_1.Type) || stat.findFirstExpression(expressions_1.TypeTable));
+        return stat.findFirstExpression(expressions_1.Type) || stat.findFirstExpression(expressions_1.TypeTable);
     }
 }
 exports.FullyTypeConstants = FullyTypeConstants;
@@ -65247,7 +65246,7 @@ class ImplementMethods extends _abap_rule_1.ABAPRule {
                 return [idef];
             }
             for (const m of this.findInterfaceMethods(idef)) {
-                if (interfaceInfo.abstractMethods.includes(m.method.name.toUpperCase())) {
+                if (this.isAbstract(m, interfaceInfo, def)) {
                     continue;
                 }
                 if (this.isImplemented(m, def, impl) === false) {
@@ -65266,6 +65265,23 @@ class ImplementMethods extends _abap_rule_1.ABAPRule {
         }
         return ret;
     }
+    isAbstract(m, interfaceInfo, def) {
+        if (interfaceInfo.abstractMethods.includes(m.method.name.toUpperCase())) {
+            return true;
+        }
+        if (!def.superClassName) {
+            return false;
+        }
+        // look up in superclass if method is abstract there
+        const superClass = this.findClass(def.superClassName);
+        const superInterface = superClass === null || superClass === void 0 ? void 0 : superClass.def.interfaces.find(iface => iface.name.toUpperCase() === m.objectName.toUpperCase());
+        if (superClass && superInterface) {
+            return this.isAbstract(m, superInterface, superClass.def);
+        }
+        else {
+            return false;
+        }
+    }
     isImplemented(m, def, impl) {
         if (impl === undefined) {
             return false;
@@ -75628,9 +75644,9 @@ ENDFORM.`,
         for (let i = 0; i < statements.length; i++) {
             const node = statements[i];
             const nodeType = node.get();
-            if ((nodeType instanceof Statements.MethodImplementation
+            if (nodeType instanceof Statements.MethodImplementation
                 || nodeType instanceof Statements.Form
-                || nodeType instanceof Statements.FunctionModule)) {
+                || nodeType instanceof Statements.FunctionModule) {
                 statementCounter = 0;
                 continue;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.217",
+    "version": "2.113.218",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {