Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded pub packages for Flutter v3.13.6 #256

Merged
merged 8 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/dart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches: [ '**' ]

env:
flutter_version: 3.10.2
flutter_version: 3.13.6

jobs:
build:
Expand All @@ -29,9 +29,13 @@ jobs:

- run: flutter --version

- run: flutter clean

- name: Install Dependencies
run: flutter pub get

- run: flutter pub outdated

- name: Analyze
run: dart analyze --fatal-infos

Expand Down
6 changes: 3 additions & 3 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ version: 1.0.0+1

environment:
sdk: '>=2.17.0 <3.0.0'
flutter: '>=3.0.0'
flutter: ">=3.13.6"

dependencies:
flutter: { sdk: flutter }
flutter_code_editor: { path: ../ }
flutter_highlight: ^0.7.0
highlight: ^0.7.0
http: ^0.13.5
http: ^1.1.0

dev_dependencies:
flutter_test: { sdk: flutter }
total_lints: ^2.17.4
total_lints: ^3.1.1

flutter:
uses-material-design: true
Expand Down
6 changes: 3 additions & 3 deletions lib/src/search/controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class CodeSearchController extends ChangeNotifier {
patternFocusNode.unfocus();
_hidingTimer?.cancel();

if (returnFocusToCodeField == true) {
if (returnFocusToCodeField) {
_codeFieldFocusNode?.requestFocus();
}

Expand Down Expand Up @@ -160,8 +160,8 @@ class CodeSearchController extends ChangeNotifier {
return;
}

final shouldDismiss = patternFocusNode.hasFocus == false &&
_codeFieldFocusNode?.hasFocus == false;
final shouldDismiss =
!patternFocusNode.hasFocus && _codeFieldFocusNode?.hasFocus == false;

if (shouldDismiss) {
hideSearch(returnFocusToCodeField: false);
Expand Down
10 changes: 5 additions & 5 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@ dependencies:
autotrie: ^2.0.0
characters: ^1.2.1
charcode: ^1.3.1
collection: ^1.16.0
collection: ^1.17.2
equatable: ^2.0.5
flutter: { sdk: flutter }
flutter_highlight: ^0.7.0
highlight: ^0.7.0
http: ^0.13.5
http: ^1.1.0
linked_scroll_controller: ^0.2.0
meta: ^1.7.0
mocktail: ^0.3.0
meta: ^1.9.1
mocktail: ^1.0.1
scrollable_positioned_list: ^0.3.5
tuple: ^2.0.1
url_launcher: ^6.1.8

dev_dependencies:
fake_async: ^1.3.1
flutter_test: { sdk: flutter }
total_lints: ^2.18.0
total_lints: ^3.1.1

flutter:
uses-material-design: true
2 changes: 1 addition & 1 deletion test/src/code/string_get_changed_range_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void main() {
str1: 'abccde',
str2: 'abcde',
expected: [TextRange(start: 2, end: 2), TextRange(start: 3, end: 3)],
)
),
];
const affinities = [TextAffinity.upstream, TextAffinity.downstream];

Expand Down
2 changes: 1 addition & 1 deletion test/src/folding/parsers/highlight_parser_go_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func (
InvalidFoldableBlock(endLine: 6, type: FBT.braces),
InvalidFoldableBlock(endLine: 6, type: FBT.braces),
InvalidFoldableBlock(startLine: 6, type: FBT.parentheses),
InvalidFoldableBlock(endLine: 8, type: FBT.braces)
InvalidFoldableBlock(endLine: 8, type: FBT.braces),
];
_Tester.parseAndCheck(
mode: go,
Expand Down
2 changes: 1 addition & 1 deletion test/src/folding/parsers/indent_parser_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ numbers = [1,
5
]''',
expected: [_FB(firstLine: 0, lastLine: 4, type: _T.indent)],
)
),
];

for (final example in examples) {
Expand Down
8 changes: 6 additions & 2 deletions test/src/history/code_history_controller_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,14 @@ void main() {
final controller = await pumpController(wt, MethodSnippet.full);
await wt.cursorEnd();

controller.value = controller.value;
controller.value = controller.value.replacedText(
controller.value.text,
);
controller.value = controller.value.typed('a');
controller.value = controller.value.typed('b');
controller.value = controller.value;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is useful to test that changing to the same value doesn't create a history record

controller.value = controller.value.replacedText(
controller.value.text,
);
controller.foldAt(0);
controller.unfoldAt(0);

Expand Down