Skip to content

Commit 33c7003

Browse files
committed
fix: actually remove also ControllerExtension.use() inside sequences
1 parent aaa6e21 commit 33c7003

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

packages/plugin/__test__/__snapshots__/test.js.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1885,10 +1885,10 @@ exports[`typescript ts-class-controller-extension-wrapped.ts 1`] = `
18851885
};
18861886
};
18871887
const MyExtendedController = Controller.extend("test.controller.MyExtendedController", {
1888-
routing4: (cov_1uvvg22e7l().s[5]++, ControllerExtension.use(Routing.override({})), ControllerExtension.use(Routing)),
1889-
routing3: (cov_1uvvg22e7l().s[5]++, cov_1uvvg22e7l().s[5]++, ControllerExtension.use(Routing.override({}))),
1890-
routing2: (cov_1uvvg22e7l().s[5]++, ControllerExtension.use(Routing.override({}))),
1891-
routing: (cov_1uvvg22e7l().s[5]++, ControllerExtension.use(Routing))
1888+
routing4: (cov_1uvvg22e7l().s[5]++, ControllerExtension.use(Routing.override({})), Routing),
1889+
routing3: (cov_1uvvg22e7l().s[5]++, cov_1uvvg22e7l().s[5]++, Routing.override({})),
1890+
routing2: (cov_1uvvg22e7l().s[5]++, Routing.override({})),
1891+
routing: (cov_1uvvg22e7l().s[5]++, Routing)
18921892
});
18931893
return MyExtendedController;
18941894
});"

packages/plugin/src/classes/helpers/classes.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,13 @@ export function convertClassToUI5Extend(
233233
// this.routing = (cov_1uvvg22e7l().s[5]++, ControllerExtension.use(Routing.override({ … })));
234234
if (
235235
t.isSequenceExpression(rightSide) &&
236-
rightSide.expressions.some((expression) =>
237-
isCallToControllerExtensionUse(expression, memberPath)
236+
isCallToControllerExtensionUse(
237+
rightSide.expressions[rightSide.expressions.length - 1],
238+
memberPath
238239
)
239240
) {
241+
rightSide.expressions[rightSide.expressions.length - 1] =
242+
rightSide.expressions[rightSide.expressions.length - 1].arguments[0];
240243
member.value = rightSide;
241244
extendProps.unshift(buildObjectProperty(member)); // add it to the properties of the extend() config object
242245
continue; // prevent the member from also being added to the constructor

0 commit comments

Comments
 (0)