Skip to content

Commit 3df89dc

Browse files
DzmitrySalauyeuAnadeaDzmitrySalauyeuAkvelon
DzmitrySalauyeuAnadea
authored and
DzmitrySalauyeuAkvelon
committed
Minor improvements based on feedback at PR#231
1 parent b0e893b commit 3df89dc

File tree

5 files changed

+152
-56
lines changed

5 files changed

+152
-56
lines changed

‎lib/src/code_field/code_controller.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import 'package:meta/meta.dart';
1111
import '../../flutter_code_editor.dart';
1212
import '../autocomplete/autocompleter.dart';
1313
import '../code/code_edit_result.dart';
14-
import '../code_modifiers/insertion.dart';
1514
import '../code/key_event.dart';
15+
import '../code_modifiers/insertion.dart';
1616
import '../history/code_history_controller.dart';
1717
import '../history/code_history_record.dart';
1818
import '../search/controller.dart';

‎lib/src/code_modifiers/code_modifier.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ abstract class CodeModifier {
77

88
const CodeModifier(this.char);
99

10-
// Helper to insert [str] in [text] between [start] and [end]
10+
/// Helper to insert [str] in [text] between [start] and [end]
1111
TextEditingValue replace(String text, int start, int end, String str) {
1212
final len = str.length;
1313
return TextEditingValue(

‎lib/src/wip/autocomplete/popup_controller.dart

+4-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@ class PopupController extends ChangeNotifier {
2424
int get selectedIndex => _selectedIndex;
2525

2626
void reset() {
27-
itemScrollController = ItemScrollController();
27+
if(itemScrollController.isAttached) {
28+
itemScrollController.jumpTo(index: 0);
29+
}
2830
}
2931

3032
void show(List<String> suggestions) {
31-
if (enabled == false) {
33+
if (!enabled) {
3234
return;
3335
}
3436

‎test/src/code_modifiers/insertion_test.dart

+48-51
Original file line numberDiff line numberDiff line change
@@ -4,72 +4,69 @@ import 'package:flutter_code_editor/src/code_modifiers/insertion.dart';
44
import 'package:flutter_test/flutter_test.dart';
55

66
void main() {
7-
test('inserts at the start of string correctly', () {
7+
8+
group('InsertionCodeModifier', () {
9+
810
const modifier = InsertionCodeModifier(openChar: '1', closeString: '23');
9-
const text = 'Hello World';
10-
final selection = TextSelection.fromPosition(const TextPosition(offset: 0));
1111
const editorParams = EditorParams();
1212

13-
final result = modifier.updateString(text, selection, editorParams);
13+
test('inserts at the start of string correctly', () {
14+
const text = 'Hello World';
15+
final selection = TextSelection.fromPosition(const TextPosition(offset: 0));
1416

15-
expect(result!.text, '123Hello World');
16-
expect(result.selection.baseOffset, 1);
17-
expect(result.selection.extentOffset, 1);
18-
});
17+
final result = modifier.updateString(text, selection, editorParams);
1918

20-
test('inserts in the middle of string correctly', () {
21-
const modifier = InsertionCodeModifier(openChar: '1', closeString: '23');
22-
const text = 'Hello World';
23-
final selection = TextSelection.fromPosition(const TextPosition(offset: 5));
24-
const editorParams = EditorParams();
19+
expect(result!.text, '123Hello World');
20+
expect(result.selection.baseOffset, 1);
21+
expect(result.selection.extentOffset, 1);
22+
});
2523

26-
final result = modifier.updateString(text, selection, editorParams);
24+
test('inserts in the middle of string correctly', () {
25+
const text = 'Hello World';
26+
final selection = TextSelection.fromPosition(const TextPosition(offset: 5));
2727

28-
expect(result!.text, 'Hello123 World');
29-
expect(result.selection.baseOffset, 6);
30-
expect(result.selection.extentOffset, 6);
31-
});
28+
final result = modifier.updateString(text, selection, editorParams);
3229

33-
test('inserts at the end of string correctly', () {
34-
const modifier = InsertionCodeModifier(openChar: '1', closeString: '23');
35-
const text = 'Hello World';
36-
final selection =
37-
TextSelection.fromPosition(const TextPosition(offset: text.length));
38-
const editorParams = EditorParams();
30+
expect(result!.text, 'Hello123 World');
31+
expect(result.selection.baseOffset, 6);
32+
expect(result.selection.extentOffset, 6);
33+
});
3934

40-
final result = modifier.updateString(text, selection, editorParams);
35+
test('inserts at the end of string correctly', () {
36+
const text = 'Hello World';
37+
final selection =
38+
TextSelection.fromPosition(const TextPosition(offset: text.length));
4139

42-
expect(result!.text, 'Hello World123');
43-
expect(result.selection.baseOffset, text.length + 1);
44-
expect(result.selection.extentOffset, text.length + 1);
45-
});
40+
final result = modifier.updateString(text, selection, editorParams);
4641

47-
test('inserts in the middle of string with selection correctly', () {
48-
const modifier = InsertionCodeModifier(openChar: '1', closeString: '23');
49-
const text = 'Hello World';
50-
const selection = TextSelection(
51-
baseOffset: 5,
52-
extentOffset: 7,
53-
);
54-
const editorParams = EditorParams();
42+
expect(result!.text, 'Hello World123');
43+
expect(result.selection.baseOffset, text.length + 1);
44+
expect(result.selection.extentOffset, text.length + 1);
45+
});
5546

56-
final result = modifier.updateString(text, selection, editorParams);
47+
test('inserts in the middle of string with selection correctly', () {
48+
const text = 'Hello World';
49+
const selection = TextSelection(
50+
baseOffset: 5,
51+
extentOffset: 7,
52+
);
5753

58-
expect(result!.text, 'Hello123orld');
59-
expect(result.selection.baseOffset, 6);
60-
expect(result.selection.extentOffset, 6);
61-
});
54+
final result = modifier.updateString(text, selection, editorParams);
6255

63-
test('inserts at empty string correctly', () {
64-
const modifier = InsertionCodeModifier(openChar: '1', closeString: '23');
65-
const text = '';
66-
final selection = TextSelection.fromPosition(const TextPosition(offset: 0));
67-
const editorParams = EditorParams();
56+
expect(result!.text, 'Hello123orld');
57+
expect(result.selection.baseOffset, 6);
58+
expect(result.selection.extentOffset, 6);
59+
});
60+
61+
test('inserts at empty string correctly', () {
62+
const text = '';
63+
final selection = TextSelection.fromPosition(const TextPosition(offset: 0));
6864

69-
final result = modifier.updateString(text, selection, editorParams);
65+
final result = modifier.updateString(text, selection, editorParams);
7066

71-
expect(result!.text, '123');
72-
expect(result.selection.baseOffset, 1);
73-
expect(result.selection.extentOffset, 1);
67+
expect(result!.text, '123');
68+
expect(result.selection.baseOffset, 1);
69+
expect(result.selection.extentOffset, 1);
70+
});
7471
});
7572
}

‎test/src/search/code_controller_test.dart

+98-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:flutter/services.dart';
2+
import 'package:flutter_code_editor/flutter_code_editor.dart';
23
import 'package:flutter_code_editor/src/search/match.dart';
34
import 'package:flutter_code_editor/src/search/result.dart';
45
import 'package:flutter_code_editor/src/search/settings.dart';
@@ -7,7 +8,7 @@ import 'package:flutter_test/flutter_test.dart';
78
import '../common/create_app.dart';
89

910
void main() {
10-
group('CodeController', () {
11+
group('CodeController, Search-related functionality', () {
1112
testWidgets('CTRL + F shows search, Escape hides', (wt) async {
1213
const text = 'AaAa';
1314
final controller = await pumpController(wt, text);
@@ -60,4 +61,100 @@ void main() {
6061
await wt.pumpAndSettle();
6162
});
6263
});
64+
65+
/// Requested to add at {@link https://github.com/akvelon/flutter-code-editor/pull/231}
66+
group('CodeController-related formatting checks [Default params]', () {
67+
68+
/// tests insertion of existing modifiers into the code controller
69+
/// at the defined index
70+
void testInsertionAtIndex(
71+
CodeController controller,
72+
String initialText,
73+
String insertedStart,
74+
String insertedEnd,
75+
int insertionIndex,
76+
) {
77+
final selection = TextSelection(
78+
baseOffset: insertionIndex,
79+
extentOffset: insertionIndex,
80+
);
81+
// to move selection of textEditingValue at defined place
82+
controller.value = TextEditingValue(
83+
text: initialText,
84+
selection: selection,
85+
);
86+
87+
final textWithInsertedStart = initialText.replaceRange(
88+
insertionIndex, insertionIndex, insertedStart,);
89+
controller.value = TextEditingValue(
90+
text: textWithInsertedStart,
91+
selection: selection,
92+
);
93+
94+
final expectedText = initialText.replaceRange(
95+
insertionIndex,
96+
insertionIndex,
97+
'$insertedStart$insertedEnd',
98+
);
99+
expect(controller.value.text, expectedText);
100+
}
101+
102+
/// tests insertion at the start, middle and end of the initial text
103+
Future<void> testInsertion(
104+
WidgetTester wt,
105+
String insertedStart, {
106+
String? insertedEnd,
107+
}) async {
108+
insertedEnd ??= insertedStart;
109+
110+
const initialText = 'Hello';
111+
final controller = await pumpController(wt, initialText);
112+
113+
testInsertionAtIndex(
114+
controller,
115+
initialText,
116+
insertedStart,
117+
insertedEnd,
118+
0,
119+
);
120+
testInsertionAtIndex(
121+
controller,
122+
initialText,
123+
insertedStart,
124+
insertedEnd,
125+
2,
126+
);
127+
testInsertionAtIndex(
128+
controller,
129+
initialText,
130+
insertedStart,
131+
insertedEnd,
132+
initialText.length,
133+
);
134+
}
135+
136+
testWidgets('controller handles insertion of backticks', (wt) async {
137+
await testInsertion(wt, '`');
138+
});
139+
140+
testWidgets('controller handles insertion of single quotes', (wt) async {
141+
await testInsertion(wt, '\'');
142+
});
143+
144+
testWidgets('controller handles insertion of double quotes', (wt) async {
145+
await testInsertion(wt, '"');
146+
});
147+
148+
testWidgets('controller handles insertion of parentheses', (wt) async {
149+
await testInsertion(wt, '(', insertedEnd: ')');
150+
});
151+
152+
testWidgets('controller handles insertion of braces', (wt) async {
153+
await testInsertion(wt, '{', insertedEnd: '}');
154+
});
155+
156+
testWidgets('controller handles insertion of square brackets', (wt) async {
157+
await testInsertion(wt, '[', insertedEnd: ']');
158+
});
159+
});
63160
}

0 commit comments

Comments
 (0)