Remove prints

This close #108 and adds a rule to the analyzer that this problems
can no longer occur.

Also, remove unnecessary catches and catches where the exceptions
occur in the user code and therefore should be handled by the user
instead of being swallowed by this library.
pull/110/head
Till Friebe 4 years ago
parent 997f3a212a
commit 7d4952655c
  1. 3
      analysis_options.yaml
  2. 1
      lib/models/rules/rule.dart
  3. 36
      lib/widgets/controller.dart
  4. 69
      lib/widgets/toolbar.dart

@ -5,3 +5,6 @@ analyzer:
undefined_prefixed_name: ignore undefined_prefixed_name: ignore
omit_local_variable_types: ignore omit_local_variable_types: ignore
unsafe_html: ignore unsafe_html: ignore
linter:
rules:
- avoid_print

@ -61,7 +61,6 @@ class Rules {
final result = rule.apply(delta, index, final result = rule.apply(delta, index,
len: len, data: data, attribute: attribute); len: len, data: data, attribute: attribute);
if (result != null) { if (result != null) {
print('Rule $rule applied');
return result..trim(); return result..trim();
} }
} catch (e) { } catch (e) {

@ -78,12 +78,7 @@ class QuillController extends ChangeNotifier {
Delta? delta; Delta? delta;
if (len > 0 || data is! String || data.isNotEmpty) { if (len > 0 || data is! String || data.isNotEmpty) {
try { delta = document.replace(index, len, data);
delta = document.replace(index, len, data);
} catch (e) {
print('document.replace failed: $e');
rethrow;
}
bool shouldRetainDelta = toggledStyle.isNotEmpty && bool shouldRetainDelta = toggledStyle.isNotEmpty &&
delta.isNotEmpty && delta.isNotEmpty &&
delta.length <= 2 && delta.length <= 2 &&
@ -112,23 +107,18 @@ class QuillController extends ChangeNotifier {
if (delta == null || delta.isEmpty) { if (delta == null || delta.isEmpty) {
_updateSelection(textSelection, ChangeSource.LOCAL); _updateSelection(textSelection, ChangeSource.LOCAL);
} else { } else {
try { Delta user = Delta()
Delta user = Delta() ..retain(index)
..retain(index) ..insert(data)
..insert(data) ..delete(len);
..delete(len); int positionDelta = getPositionDelta(user, delta);
int positionDelta = getPositionDelta(user, delta); _updateSelection(
_updateSelection( textSelection.copyWith(
textSelection.copyWith( baseOffset: textSelection.baseOffset + positionDelta,
baseOffset: textSelection.baseOffset + positionDelta, extentOffset: textSelection.extentOffset + positionDelta,
extentOffset: textSelection.extentOffset + positionDelta, ),
), ChangeSource.LOCAL,
ChangeSource.LOCAL, );
);
} catch (e) {
print('getPositionDelta or getPositionDelta error: $e');
rethrow;
}
} }
} }
notifyListeners(); notifyListeners();

@ -4,7 +4,6 @@ import 'package:file_picker/file_picker.dart';
import 'package:filesystem_picker/filesystem_picker.dart'; import 'package:filesystem_picker/filesystem_picker.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_colorpicker/flutter_colorpicker.dart'; import 'package:flutter_colorpicker/flutter_colorpicker.dart';
import 'package:flutter_quill/models/documents/attribute.dart'; import 'package:flutter_quill/models/documents/attribute.dart';
import 'package:flutter_quill/models/documents/nodes/embed.dart'; import 'package:flutter_quill/models/documents/nodes/embed.dart';
@ -520,46 +519,25 @@ class _ImageButtonState extends State<ImageButton> {
final File file = File(pickedFile.path); final File file = File(pickedFile.path);
// We simply return the absolute path to selected file. return widget.onImagePickCallback!(file);
try {
String url = await widget.onImagePickCallback!(file);
print('Image uploaded and its url is $url');
return url;
} catch (error) {
print('Upload image error $error');
}
return null;
} }
Future<String?> _pickImageWeb() async { Future<String?> _pickImageWeb() async {
try { _paths = (await FilePicker.platform.pickFiles(
_paths = (await FilePicker.platform.pickFiles( type: _pickingType,
type: _pickingType, allowMultiple: false,
allowMultiple: false, allowedExtensions: (_extension?.isNotEmpty ?? false)
allowedExtensions: (_extension?.isNotEmpty ?? false) ? _extension?.replaceAll(' ', '').split(',')
? _extension?.replaceAll(' ', '').split(',') : null,
: null, ))
)) ?.files;
?.files;
} on PlatformException catch (e) {
print('Unsupported operation' + e.toString());
} catch (ex) {
print(ex);
}
var _fileName = var _fileName =
_paths != null ? _paths!.map((e) => e.name).toString() : '...'; _paths != null ? _paths!.map((e) => e.name).toString() : '...';
if (_paths != null) { if (_paths != null) {
File file = File(_fileName); File file = File(_fileName);
// We simply return the absolute path to selected file. // We simply return the absolute path to selected file.
try { return widget.onImagePickCallback!(file);
String url = await widget.onImagePickCallback!(file);
print('Image uploaded and its url is $url');
return url;
} catch (error) {
print('Upload image error $error');
}
return null;
} else { } else {
// User canceled the picker // User canceled the picker
} }
@ -567,23 +545,16 @@ class _ImageButtonState extends State<ImageButton> {
} }
Future<String> _pickImageDesktop() async { Future<String> _pickImageDesktop() async {
try { var filePath = await FilesystemPicker.open(
var filePath = await FilesystemPicker.open( context: context,
context: context, rootDirectory: await getApplicationDocumentsDirectory(),
rootDirectory: await getApplicationDocumentsDirectory(), fsType: FilesystemType.file,
fsType: FilesystemType.file, fileTileSelectMode: FileTileSelectMode.wholeTile,
fileTileSelectMode: FileTileSelectMode.wholeTile, );
); if (filePath != null && filePath.isEmpty) return '';
if (filePath != null && filePath.isEmpty) return '';
final File file = File(filePath!);
final File file = File(filePath!); return widget.onImagePickCallback!(file);
String url = await widget.onImagePickCallback!(file);
print('Image uploaded and its url is $url');
return url;
} catch (error) {
print('Upload image error $error');
}
return '';
} }
@override @override

Loading…
Cancel
Save