Skip to content

Commit cf5e31a

Browse files
Remove return types on overridden getters so they can be inferred
The fewer explicit types we have, the fewer need to be updated during the transition to null safety Done via replacement of `(@OverRide\n )([^(=\n]+ )(get [^(=\n]+=)` with `$1/$3`
1 parent 94d3507 commit cf5e31a

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

example/test/error_boundary_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ final _ErrorBoundary = react.registerComponent2(() => _ErrorBoundaryComponent(),
4242

4343
class _ErrorBoundaryComponent extends react.Component2 {
4444
@override
45-
Map get initialState => {'hasError': false};
45+
get initialState => {'hasError': false};
4646

4747
@override
4848
getDerivedStateFromError(dynamic error) => {'hasError': true};
@@ -62,7 +62,7 @@ final _ThrowingComponent = react.registerComponent2(() => _ThrowingComponentComp
6262

6363
class _ThrowingComponentComponent2 extends react.Component2 {
6464
@override
65-
Map get initialState => {'shouldThrow': false};
65+
get initialState => {'shouldThrow': false};
6666

6767
@override
6868
render() {

example/test/react_test_components.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ var mainComponent = react.registerComponent(() => _MainComponent());
201201
/////
202202
class _LegacyContextComponent extends react.Component {
203203
@override
204-
Iterable<String> get childContextKeys => const ['foo', 'bar', 'renderCount'];
204+
get childContextKeys => const ['foo', 'bar', 'renderCount'];
205205

206206
@override
207207
getChildContext() => {
@@ -234,7 +234,7 @@ var legacyContextComponent = react.registerComponent(() => _LegacyContextCompone
234234

235235
class _LegacyContextConsumerComponent extends react.Component {
236236
@override
237-
Iterable<String> get contextKeys => const ['foo'];
237+
get contextKeys => const ['foo'];
238238

239239
@override
240240
render() {
@@ -254,7 +254,7 @@ var legacyContextConsumerComponent = react.registerComponent(() => _LegacyContex
254254

255255
class _GrandchildLegacyContextConsumerComponent extends react.Component {
256256
@override
257-
Iterable<String> get contextKeys => const ['renderCount'];
257+
get contextKeys => const ['renderCount'];
258258

259259
@override
260260
render() {

test/js_builds/shared_tests.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ final _ErrorBoundary = react.registerComponent2(() => _ErrorBoundaryComponent(),
195195

196196
class _ErrorBoundaryComponent extends react.Component2 {
197197
@override
198-
Map get initialState => {'hasError': false};
198+
get initialState => {'hasError': false};
199199

200200
@override
201201
getDerivedStateFromError(dynamic error) => {'hasError': true};
@@ -215,7 +215,7 @@ final _ThrowingComponent = react.registerComponent(() => _ThrowingComponentCompo
215215

216216
class _ThrowingComponentComponent extends react.Component {
217217
@override
218-
String get displayName => r'DisplayName$_ThrowingComponentComponent';
218+
get displayName => r'DisplayName$_ThrowingComponentComponent';
219219

220220
@override
221221
render() {
@@ -227,7 +227,7 @@ final _ThrowingComponent2 = react.registerComponent2(() => _ThrowingComponent2Co
227227

228228
class _ThrowingComponent2Component extends react.Component2 {
229229
@override
230-
String get displayName => r'DisplayName$_ThrowingComponent2Component';
230+
get displayName => r'DisplayName$_ThrowingComponent2Component';
231231

232232
@override
233233
render() {

test/lifecycle_test/component.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class _DefaultPropsCachingTest extends react.Component implements DefaultPropsCa
8787
static int getDefaultPropsCallCount = 0;
8888

8989
@override
90-
int get staticGetDefaultPropsCallCount => getDefaultPropsCallCount;
90+
get staticGetDefaultPropsCallCount => getDefaultPropsCallCount;
9191

9292
@override
9393
set staticGetDefaultPropsCallCount(int value) => getDefaultPropsCallCount = value;
@@ -123,7 +123,7 @@ final ContextWrapperWithoutKeys =
123123

124124
class _ContextWrapperWithoutKeys extends react.Component with LifecycleTestHelper {
125125
@override
126-
Iterable<String> get childContextKeys => const [];
126+
get childContextKeys => const [];
127127

128128
@override
129129
getChildContext() {
@@ -142,7 +142,7 @@ final ContextWrapper = react.registerComponent(() => _ContextWrapper()) as React
142142

143143
class _ContextWrapper extends react.Component with LifecycleTestHelper {
144144
@override
145-
Iterable<String> get childContextKeys => const ['foo', 'extraContext'];
145+
get childContextKeys => const ['foo', 'extraContext'];
146146

147147
@override
148148
getChildContext() {
@@ -162,7 +162,7 @@ final LifecycleTestWithContext =
162162

163163
class _LifecycleTestWithContext extends _LifecycleTest {
164164
@override
165-
Iterable<String> get contextKeys => const ['foo']; // only listening to one context key
165+
get contextKeys => const ['foo']; // only listening to one context key
166166
}
167167

168168
final LifecycleTest = react.registerComponent(() => _LifecycleTest()) as ReactDartComponentFactoryProxy;

test/lifecycle_test/component2.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class _DefaultPropsCachingTest extends react.Component2 implements DefaultPropsC
126126
static int getDefaultPropsCallCount = 0;
127127

128128
@override
129-
int get staticGetDefaultPropsCallCount => getDefaultPropsCallCount;
129+
get staticGetDefaultPropsCallCount => getDefaultPropsCallCount;
130130

131131
@override
132132
set staticGetDefaultPropsCallCount(int value) => getDefaultPropsCallCount = value;
@@ -145,7 +145,7 @@ final DefaultPropsTest = react.registerComponent2(() => _DefaultPropsTest());
145145

146146
class _DefaultPropsTest extends react.Component2 {
147147
@override
148-
Map get defaultProps => {'defaultProp': 'default'};
148+
get defaultProps => {'defaultProp': 'default'};
149149

150150
@override
151151
render() => false;
@@ -263,10 +263,10 @@ class _LifecycleTest extends react.Component2 with LifecycleTestHelper {
263263
render() => lifecycleCall('render', defaultReturnValue: () => react.div({}));
264264

265265
@override
266-
Map get initialState => lifecycleCall('initialState', defaultReturnValue: () => {});
266+
get initialState => lifecycleCall('initialState', defaultReturnValue: () => {});
267267

268268
@override
269-
Map get defaultProps => lifecycleCall('defaultProps', defaultReturnValue: () => {'defaultProp': 'default'});
269+
get defaultProps => lifecycleCall('defaultProps', defaultReturnValue: () => {'defaultProp': 'default'});
270270
}
271271

272272
final NoGetDerivedStateFromErrorLifecycleTest =
@@ -301,8 +301,8 @@ class _NoGetDerivedStateFromErrorLifecycleTest extends react.Component2 with Lif
301301
render() => lifecycleCall('render', defaultReturnValue: () => react.div({}));
302302

303303
@override
304-
Map get initialState => lifecycleCall('initialState', defaultReturnValue: () => {});
304+
get initialState => lifecycleCall('initialState', defaultReturnValue: () => {});
305305

306306
@override
307-
Map get defaultProps => lifecycleCall('defaultProps', defaultReturnValue: () => {'defaultProp': 'default'});
307+
get defaultProps => lifecycleCall('defaultProps', defaultReturnValue: () => {'defaultProp': 'default'});
308308
}

0 commit comments

Comments
 (0)