@abaplint/core 2.113.217 → 2.113.218

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

@@ -448,7 +448,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;
                     }
@@ -458,7 +458,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;
                     }

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

@@ -11,7 +11,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)) {

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -939,7 +939,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();

package/build/src/rules/fully_type_constants.js

@@ -45,7 +45,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) {
@@ -60,7 +60,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;

package/build/src/rules/implement_methods.js

@@ -180,7 +180,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) {
@@ -199,6 +199,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;

package/build/src/rules/unnecessary_return.js

@@ -61,9 +61,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/core",
-    "version": "2.113.217",
+    "version": "2.113.218",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",