Skip to content

Commit 5cc07b9

Browse files
committed
autocomplete [nfc]: Remove unused narrow in MentionAutocompleteView
1 parent d6d07b4 commit 5cc07b9

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

lib/model/autocomplete.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'package:flutter/services.dart';
44
import '../api/model/events.dart';
55
import '../api/model/model.dart';
66
import '../widgets/compose_box.dart';
7-
import 'narrow.dart';
87
import 'store.dart';
98

109
extension ComposeContentAutocomplete on ComposeContentController {
@@ -286,7 +285,6 @@ class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery,
286285

287286
MentionAutocompleteView.init({
288287
required super.store,
289-
required this.narrow,
290288
}) : super(dataProvider: MentionAutocompleteDataProvider(store: store)) {
291289
store.autocompleteViewManager.registerMentionAutocomplete(this);
292290
}
@@ -306,7 +304,6 @@ class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery,
306304
/// Called in particular when we get a [RealmUserEvent].
307305
void refreshStaleUserResults() => reassemble();
308306

309-
final Narrow narrow;
310307
}
311308

312309
abstract class AutocompleteQuery {

lib/widgets/autocomplete.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ComposeAutocomplete extends AutocompleteField<MentionAutocompleteQuery, Me
1919
getAutocompleteIntent: () => controller.autocompleteIntent(),
2020
viewModelBuilder: (context) {
2121
final store = PerAccountStoreWidget.of(context);
22-
return MentionAutocompleteView.init(store: store, narrow: narrow);
22+
return MentionAutocompleteView.init(store: store);
2323
},
2424
itemBuilder: (context, index, option) {
2525
Widget avatar;

test/model/autocomplete_test.dart

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'package:flutter/cupertino.dart';
77
import 'package:test/scaffolding.dart';
88
import 'package:zulip/api/model/model.dart';
99
import 'package:zulip/model/autocomplete.dart';
10-
import 'package:zulip/model/narrow.dart';
1110
import 'package:zulip/widgets/compose_box.dart';
1211

1312
import '../example_data.dart' as eg;
@@ -166,10 +165,9 @@ void main() {
166165
});
167166

168167
test('MentionAutocompleteView misc', () async {
169-
const narrow = AllMessagesNarrow();
170168
final store = eg.store()
171169
..addUsers([eg.selfUser, eg.otherUser, eg.thirdUser]);
172-
final view = MentionAutocompleteView.init(store: store, narrow: narrow);
170+
final view = MentionAutocompleteView.init(store: store);
173171

174172
bool done = false;
175173
view.addListener(() { done = true; });
@@ -183,10 +181,9 @@ void main() {
183181

184182
test('MentionAutocompleteView not starve timers', () {
185183
fakeAsync((binding) {
186-
const narrow = AllMessagesNarrow();
187184
final store = eg.store()
188185
..addUsers([eg.selfUser, eg.otherUser, eg.thirdUser]);
189-
final view = MentionAutocompleteView.init(store: store, narrow: narrow);
186+
final view = MentionAutocompleteView.init(store: store);
190187

191188
bool searchDone = false;
192189
view.addListener(() {
@@ -218,12 +215,11 @@ void main() {
218215
});
219216

220217
test('MentionAutocompleteView yield between batches of 1000', () async {
221-
const narrow = AllMessagesNarrow();
222218
final store = eg.store();
223219
for (int i = 0; i < 2500; i++) {
224220
store.addUser(eg.user(userId: i, email: 'user$i@example.com', fullName: 'User $i'));
225221
}
226-
final view = MentionAutocompleteView.init(store: store, narrow: narrow);
222+
final view = MentionAutocompleteView.init(store: store);
227223

228224
bool done = false;
229225
view.addListener(() { done = true; });
@@ -241,12 +237,11 @@ void main() {
241237
});
242238

243239
test('MentionAutocompleteView new query during computation replaces old', () async {
244-
const narrow = AllMessagesNarrow();
245240
final store = eg.store();
246241
for (int i = 0; i < 1500; i++) {
247242
store.addUser(eg.user(userId: i, email: 'user$i@example.com', fullName: 'User $i'));
248243
}
249-
final view = MentionAutocompleteView.init(store: store, narrow: narrow);
244+
final view = MentionAutocompleteView.init(store: store);
250245

251246
bool done = false;
252247
view.addListener(() { done = true; });
@@ -275,12 +270,11 @@ void main() {
275270
});
276271

277272
test('MentionAutocompleteView mutating store.users while in progress causes retry', () async {
278-
const narrow = AllMessagesNarrow();
279273
final store = eg.store();
280274
for (int i = 0; i < 1500; i++) {
281275
store.addUser(eg.user(userId: i, email: 'user$i@example.com', fullName: 'User $i'));
282276
}
283-
final view = MentionAutocompleteView.init(store: store, narrow: narrow);
277+
final view = MentionAutocompleteView.init(store: store);
284278

285279
bool done = false;
286280
view.addListener(() { done = true; });

0 commit comments

Comments
 (0)