瀏覽代碼

Merge pull request #145 from memspace/remove-new-keyword

Removed 'new' keyword from zefyr package
Anatoly Pulyaevskiy 5 年之前
父節點
當前提交
faff567440
No account linked to committer's email address

+ 8
- 8
packages/zefyr/lib/src/widgets/buttons.dart 查看文件

@@ -82,11 +82,11 @@ class ZefyrButton extends StatelessWidget {
82 82
       );
83 83
     } else {
84 84
       assert(_text != null);
85
-      var style = _textStyle ?? new TextStyle();
85
+      var style = _textStyle ?? TextStyle();
86 86
       style = style.copyWith(color: iconColor);
87 87
       return RawZefyrButton(
88 88
         action: action,
89
-        child: new Text(_text, style: style),
89
+        child: Text(_text, style: style),
90 90
         color: _getColor(editor, toolbarTheme),
91 91
         onPressed: _getPressedHandler(editor, toolbar),
92 92
       );
@@ -155,7 +155,7 @@ class RawZefyrButton extends StatelessWidget {
155 155
     Color iconColor,
156 156
     @required this.color,
157 157
     @required this.onPressed,
158
-  })  : child = new Icon(icon, size: size, color: iconColor),
158
+  })  : child = Icon(icon, size: size, color: iconColor),
159 159
         super();
160 160
 
161 161
   /// Toolbar action associated with this button.
@@ -346,7 +346,7 @@ class _LinkButtonState extends State<LinkButton> {
346 346
   void edit() {
347 347
     final toolbar = ZefyrToolbar.of(context);
348 348
     setState(() {
349
-      _inputKey = new UniqueKey();
349
+      _inputKey = UniqueKey();
350 350
       _inputController.text = getLink('https://');
351 351
       _inputController.addListener(_handleInputChange);
352 352
       toolbar.markNeedsRebuild();
@@ -405,7 +405,7 @@ class _LinkButtonState extends State<LinkButton> {
405 405
   void copyToClipboard() {
406 406
     var link = getLink();
407 407
     assert(link != null);
408
-    Clipboard.setData(new ClipboardData(text: link));
408
+    Clipboard.setData(ClipboardData(text: link));
409 409
   }
410 410
 
411 411
   void openInBrowser() async {
@@ -485,7 +485,7 @@ class _LinkInput extends StatefulWidget {
485 485
 
486 486
   @override
487 487
   _LinkInputState createState() {
488
-    return new _LinkInputState();
488
+    return _LinkInputState();
489 489
   }
490 490
 }
491 491
 
@@ -533,7 +533,7 @@ class _LinkInputState extends State<_LinkInput> {
533 533
       focusNode: _focusNode,
534 534
       controller: widget.controller,
535 535
       autofocus: true,
536
-      decoration: new InputDecoration(
536
+      decoration: InputDecoration(
537 537
         hintText: 'https://',
538 538
         filled: true,
539 539
         fillColor: toolbarTheme.color,
@@ -554,7 +554,7 @@ class _LinkView extends StatelessWidget {
554 554
   Widget build(BuildContext context) {
555 555
     final theme = Theme.of(context);
556 556
     final toolbarTheme = ZefyrTheme.of(context).toolbarTheme;
557
-    Widget widget = new ClipRect(
557
+    Widget widget = ClipRect(
558 558
       child: ListView(
559 559
         scrollDirection: Axis.horizontal,
560 560
         children: <Widget>[

+ 2
- 2
packages/zefyr/lib/src/widgets/caret.dart 查看文件

@@ -11,7 +11,7 @@ class CursorPainter {
11 11
   static const double _kCaretWidth = 1.0; // pixels
12 12
 
13 13
   static Rect buildPrototype(double lineHeight) {
14
-    return new Rect.fromLTWH(
14
+    return Rect.fromLTWH(
15 15
         0.0, 0.0, _kCaretWidth, lineHeight - _kCaretHeightOffset);
16 16
   }
17 17
 
@@ -35,7 +35,7 @@ class CursorPainter {
35 35
   }
36 36
 
37 37
   void paint(Canvas canvas, Offset offset) {
38
-    final Paint paint = new Paint()..color = _color;
38
+    final Paint paint = Paint()..color = _color;
39 39
     final Rect caretRect = _prototype.shift(offset);
40 40
     canvas.drawRect(caretRect, paint);
41 41
   }

+ 4
- 4
packages/zefyr/lib/src/widgets/code.dart 查看文件

@@ -23,16 +23,16 @@ class ZefyrCode extends StatelessWidget {
23 23
       items.add(_buildLine(line, theme.blockTheme.code.textStyle));
24 24
     }
25 25
 
26
-    return new Padding(
26
+    return Padding(
27 27
       padding: theme.blockTheme.code.padding,
28
-      child: new Container(
28
+      child: Container(
29 29
         // TODO: make decorations configurable
30 30
         decoration: BoxDecoration(
31 31
           color: Colors.blueGrey.shade50,
32 32
           borderRadius: BorderRadius.circular(3.0),
33 33
         ),
34 34
         padding: const EdgeInsets.all(16.0),
35
-        child: new Column(
35
+        child: Column(
36 36
           crossAxisAlignment: CrossAxisAlignment.stretch,
37 37
           children: items,
38 38
         ),
@@ -42,6 +42,6 @@ class ZefyrCode extends StatelessWidget {
42 42
 
43 43
   Widget _buildLine(Node node, TextStyle style) {
44 44
     LineNode line = node;
45
-    return new RawZefyrLine(node: line, style: style);
45
+    return RawZefyrLine(node: line, style: style);
46 46
   }
47 47
 }

+ 6
- 6
packages/zefyr/lib/src/widgets/common.dart 查看文件

@@ -35,11 +35,11 @@ class RawZefyrLine extends StatefulWidget {
35 35
   final EdgeInsets padding;
36 36
 
37 37
   @override
38
-  _RawZefyrLineState createState() => new _RawZefyrLineState();
38
+  _RawZefyrLineState createState() => _RawZefyrLineState();
39 39
 }
40 40
 
41 41
 class _RawZefyrLineState extends State<RawZefyrLine> {
42
-  final LayerLink _link = new LayerLink();
42
+  final LayerLink _link = LayerLink();
43 43
 
44 44
   @override
45 45
   Widget build(BuildContext context) {
@@ -113,21 +113,21 @@ class _RawZefyrLineState extends State<RawZefyrLine> {
113 113
     final List<TextSpan> children = widget.node.children
114 114
         .map((node) => _segmentToTextSpan(node, theme))
115 115
         .toList(growable: false);
116
-    return new TextSpan(style: widget.style, children: children);
116
+    return TextSpan(style: widget.style, children: children);
117 117
   }
118 118
 
119 119
   TextSpan _segmentToTextSpan(Node node, ZefyrThemeData theme) {
120 120
     final TextNode segment = node;
121 121
     final attrs = segment.style;
122 122
 
123
-    return new TextSpan(
123
+    return TextSpan(
124 124
       text: segment.value,
125 125
       style: _getTextStyle(attrs, theme),
126 126
     );
127 127
   }
128 128
 
129 129
   TextStyle _getTextStyle(NotusStyle style, ZefyrThemeData theme) {
130
-    TextStyle result = new TextStyle();
130
+    TextStyle result = TextStyle();
131 131
     if (style.containsSame(NotusAttribute.bold)) {
132 132
       result = result.merge(theme.boldStyle);
133 133
     }
@@ -149,7 +149,7 @@ class _RawZefyrLineState extends State<RawZefyrLine> {
149 149
     } else if (embed.type == EmbedType.image) {
150 150
       return ZefyrImage(node: node, delegate: scope.imageDelegate);
151 151
     } else {
152
-      throw new UnimplementedError('Unimplemented embed type ${embed.type}');
152
+      throw UnimplementedError('Unimplemented embed type ${embed.type}');
153 153
     }
154 154
   }
155 155
 }

+ 4
- 5
packages/zefyr/lib/src/widgets/controller.dart 查看文件

@@ -119,7 +119,7 @@ class ZefyrController extends ChangeNotifier {
119 119
       } else {
120 120
         // need to transform selection position in case actual delta
121 121
         // is different from user's version (in deletes and inserts).
122
-        Delta user = new Delta()
122
+        Delta user = Delta()
123 123
           ..retain(index)
124 124
           ..insert(text)
125 125
           ..delete(length);
@@ -144,8 +144,7 @@ class ZefyrController extends ChangeNotifier {
144 144
     // the change. This is needed in cases when format operation actually
145 145
     // inserts data into the document (e.g. embeds).
146 146
     final base = change.transformPosition(_selection.baseOffset);
147
-    final extent =
148
-        change.transformPosition(_selection.extentOffset);
147
+    final extent = change.transformPosition(_selection.extentOffset);
149 148
     final adjustedSelection =
150 149
         _selection.copyWith(baseOffset: base, extentOffset: extent);
151 150
     if (_selection != adjustedSelection) {
@@ -168,10 +167,10 @@ class ZefyrController extends ChangeNotifier {
168 167
   }
169 168
 
170 169
   TextEditingValue get plainTextEditingValue {
171
-    return new TextEditingValue(
170
+    return TextEditingValue(
172 171
       text: document.toPlainText(),
173 172
       selection: selection,
174
-      composing: new TextRange.collapsed(0),
173
+      composing: TextRange.collapsed(0),
175 174
     );
176 175
   }
177 176
 

+ 2
- 2
packages/zefyr/lib/src/widgets/editable_box.dart 查看文件

@@ -33,7 +33,7 @@ class EditableBox extends SingleChildRenderObjectWidget {
33 33
 
34 34
   @override
35 35
   RenderEditableProxyBox createRenderObject(BuildContext context) {
36
-    return new RenderEditableProxyBox(
36
+    return RenderEditableProxyBox(
37 37
       node: node,
38 38
       layerLink: layerLink,
39 39
       renderContext: renderContext,
@@ -238,7 +238,7 @@ class RenderEditableProxyBox extends RenderBox
238 238
   @override
239 239
   bool hitTest(HitTestResult result, {Offset position}) {
240 240
     if (size.contains(position)) {
241
-      result.add(new BoxHitTestEntry(this, position));
241
+      result.add(BoxHitTestEntry(this, position));
242 242
       return true;
243 243
     }
244 244
     return false;

+ 10
- 10
packages/zefyr/lib/src/widgets/editable_text.dart 查看文件

@@ -76,7 +76,7 @@ class ZefyrEditableText extends StatefulWidget {
76 76
   final EdgeInsets padding;
77 77
 
78 78
   @override
79
-  _ZefyrEditableTextState createState() => new _ZefyrEditableTextState();
79
+  _ZefyrEditableTextState createState() => _ZefyrEditableTextState();
80 80
 }
81 81
 
82 82
 class _ZefyrEditableTextState extends State<ZefyrEditableText>
@@ -160,7 +160,7 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
160 160
     _focusNode = widget.focusNode;
161 161
     super.initState();
162 162
     _focusAttachment = _focusNode.attach(context);
163
-    _input = new InputConnectionController(_handleRemoteValueChange);
163
+    _input = InputConnectionController(_handleRemoteValueChange);
164 164
     _updateSubscriptions();
165 165
   }
166 166
 
@@ -228,26 +228,26 @@ class _ZefyrEditableTextState extends State<ZefyrEditableText>
228 228
   Widget _defaultChildBuilder(BuildContext context, Node node) {
229 229
     if (node is LineNode) {
230 230
       if (node.hasEmbed) {
231
-        return new RawZefyrLine(node: node);
231
+        return RawZefyrLine(node: node);
232 232
       } else if (node.style.contains(NotusAttribute.heading)) {
233
-        return new ZefyrHeading(node: node);
233
+        return ZefyrHeading(node: node);
234 234
       }
235
-      return new ZefyrParagraph(node: node);
235
+      return ZefyrParagraph(node: node);
236 236
     }
237 237
 
238 238
     final BlockNode block = node;
239 239
     final blockStyle = block.style.get(NotusAttribute.block);
240 240
     if (blockStyle == NotusAttribute.block.code) {
241
-      return new ZefyrCode(node: block);
241
+      return ZefyrCode(node: block);
242 242
     } else if (blockStyle == NotusAttribute.block.bulletList) {
243
-      return new ZefyrList(node: block);
243
+      return ZefyrList(node: block);
244 244
     } else if (blockStyle == NotusAttribute.block.numberList) {
245
-      return new ZefyrList(node: block);
245
+      return ZefyrList(node: block);
246 246
     } else if (blockStyle == NotusAttribute.block.quote) {
247
-      return new ZefyrQuote(node: block);
247
+      return ZefyrQuote(node: block);
248 248
     }
249 249
 
250
-    throw new UnimplementedError('Block format $blockStyle.');
250
+    throw UnimplementedError('Block format $blockStyle.');
251 251
   }
252 252
 
253 253
   void _updateSubscriptions([ZefyrEditableText oldWidget]) {

+ 2
- 2
packages/zefyr/lib/src/widgets/editor.dart 查看文件

@@ -70,7 +70,7 @@ class ZefyrEditor extends StatefulWidget {
70 70
   final EdgeInsets padding;
71 71
 
72 72
   @override
73
-  _ZefyrEditorState createState() => new _ZefyrEditorState();
73
+  _ZefyrEditorState createState() => _ZefyrEditorState();
74 74
 }
75 75
 
76 76
 class _ZefyrEditorState extends State<ZefyrEditor> {
@@ -178,7 +178,7 @@ class _ZefyrEditorState extends State<ZefyrEditor> {
178 178
 
179 179
   @override
180 180
   Widget build(BuildContext context) {
181
-    Widget editable = new ZefyrEditableText(
181
+    Widget editable = ZefyrEditableText(
182 182
       controller: _scope.controller,
183 183
       focusNode: _scope.focusNode,
184 184
       imageDelegate: _scope.imageDelegate,

+ 16
- 17
packages/zefyr/lib/src/widgets/image.dart 查看文件

@@ -75,7 +75,7 @@ class _EditableImage extends SingleChildRenderObjectWidget {
75 75
 
76 76
   @override
77 77
   RenderEditableImage createRenderObject(BuildContext context) {
78
-    return new RenderEditableImage(node: node);
78
+    return RenderEditableImage(node: node);
79 79
   }
80 80
 
81 81
   @override
@@ -129,16 +129,16 @@ class RenderEditableImage extends RenderBox
129 129
     if (local.isCollapsed) {
130 130
       final dx = local.extentOffset == 0 ? _childOffset.dx : size.width;
131 131
       return [
132
-        new ui.TextBox.fromLTRBD(
132
+        ui.TextBox.fromLTRBD(
133 133
             dx, 0.0, dx, size.height - kPaddingBottom, TextDirection.ltr),
134 134
       ];
135 135
     }
136 136
 
137 137
     final rect = _childRect;
138 138
     return [
139
-      new ui.TextBox.fromLTRBD(
139
+      ui.TextBox.fromLTRBD(
140 140
           rect.left, rect.top, rect.left, rect.bottom, TextDirection.ltr),
141
-      new ui.TextBox.fromLTRBD(
141
+      ui.TextBox.fromLTRBD(
142 142
           rect.right, rect.top, rect.right, rect.bottom, TextDirection.ltr),
143 143
     ];
144 144
   }
@@ -150,13 +150,13 @@ class RenderEditableImage extends RenderBox
150 150
     if (offset.dx > size.width / 2) {
151 151
       position++;
152 152
     }
153
-    return new TextPosition(offset: position);
153
+    return TextPosition(offset: position);
154 154
   }
155 155
 
156 156
   @override
157 157
   TextRange getWordBoundary(TextPosition position) {
158 158
     final start = _node.documentOffset;
159
-    return new TextRange(start: start, end: start + 1);
159
+    return TextRange(start: start, end: start + 1);
160 160
   }
161 161
 
162 162
   @override
@@ -169,10 +169,10 @@ class RenderEditableImage extends RenderBox
169 169
   @override
170 170
   Offset getOffsetForCaret(TextPosition position, Rect caretPrototype) {
171 171
     final pos = position.offset - node.documentOffset;
172
-    Offset caretOffset = _childOffset - new Offset(kHorizontalPadding, 0.0);
172
+    Offset caretOffset = _childOffset - Offset(kHorizontalPadding, 0.0);
173 173
     if (pos == 1) {
174
-      caretOffset = caretOffset +
175
-          new Offset(_lastChildSize.width + kHorizontalPadding, 0.0);
174
+      caretOffset =
175
+          caretOffset + Offset(_lastChildSize.width + kHorizontalPadding, 0.0);
176 176
     }
177 177
     return caretOffset;
178 178
   }
@@ -183,12 +183,12 @@ class RenderEditableImage extends RenderBox
183 183
     final localSelection = getLocalSelection(selection);
184 184
     assert(localSelection != null);
185 185
     if (!localSelection.isCollapsed) {
186
-      final Paint paint = new Paint()
186
+      final Paint paint = Paint()
187 187
         ..color = selectionColor
188 188
         ..style = PaintingStyle.stroke
189 189
         ..strokeWidth = 3.0;
190
-      final rect = new Rect.fromLTWH(
191
-          0.0, 0.0, _lastChildSize.width, _lastChildSize.height);
190
+      final rect =
191
+          Rect.fromLTWH(0.0, 0.0, _lastChildSize.width, _lastChildSize.height);
192 192
       context.canvas.drawRect(rect.shift(offset + _childOffset), paint);
193 193
     }
194 194
   }
@@ -204,12 +204,12 @@ class RenderEditableImage extends RenderBox
204 204
   Offset get _childOffset {
205 205
     final dx = (size.width - _lastChildSize.width) / 2 + kHorizontalPadding;
206 206
     final dy = (size.height - _lastChildSize.height - kPaddingBottom) / 2;
207
-    return new Offset(dx, dy);
207
+    return Offset(dx, dy);
208 208
   }
209 209
 
210 210
   Rect get _childRect {
211
-    return new Rect.fromLTWH(_childOffset.dx, _childOffset.dy,
212
-        _lastChildSize.width, _lastChildSize.height);
211
+    return Rect.fromLTWH(_childOffset.dx, _childOffset.dy, _lastChildSize.width,
212
+        _lastChildSize.height);
213 213
   }
214 214
 
215 215
   @override
@@ -226,8 +226,7 @@ class RenderEditableImage extends RenderBox
226 226
       );
227 227
       child.layout(childConstraints, parentUsesSize: true);
228 228
       _lastChildSize = child.size;
229
-      size = new Size(
230
-          constraints.maxWidth, _lastChildSize.height + kPaddingBottom);
229
+      size = Size(constraints.maxWidth, _lastChildSize.height + kPaddingBottom);
231 230
     } else {
232 231
       performResize();
233 232
     }

+ 1
- 1
packages/zefyr/lib/src/widgets/input.dart 查看文件

@@ -37,7 +37,7 @@ class InputConnectionController implements TextInputClient {
37 37
       _lastKnownRemoteTextEditingValue = value;
38 38
       _textInputConnection = TextInput.attach(
39 39
         this,
40
-        new TextInputConfiguration(
40
+        TextInputConfiguration(
41 41
           inputType: TextInputType.multiline,
42 42
           obscureText: false,
43 43
           autocorrect: true,

+ 5
- 5
packages/zefyr/lib/src/widgets/list.dart 查看文件

@@ -31,15 +31,15 @@ class ZefyrList extends StatelessWidget {
31 31
         : theme.blockTheme.bulletList.padding;
32 32
     padding = padding.copyWith(left: theme.indentSize);
33 33
 
34
-    return new Padding(
34
+    return Padding(
35 35
       padding: padding,
36
-      child: new Column(children: items),
36
+      child: Column(children: items),
37 37
     );
38 38
   }
39 39
 
40 40
   Widget _buildItem(Node node, int index) {
41 41
     LineNode line = node;
42
-    return new ZefyrListItem(index: index, node: line);
42
+    return ZefyrListItem(index: index, node: line);
43 43
   }
44 44
 }
45 45
 
@@ -66,10 +66,10 @@ class ZefyrListItem extends StatelessWidget {
66 66
       final headingTheme = ZefyrHeading.themeOf(node, context);
67 67
       textStyle = headingTheme.textStyle;
68 68
       padding = headingTheme.padding;
69
-      content = new ZefyrHeading(node: node);
69
+      content = ZefyrHeading(node: node);
70 70
     } else {
71 71
       textStyle = theme.paragraphTheme.textStyle;
72
-      content = new RawZefyrLine(node: node, style: textStyle);
72
+      content = RawZefyrLine(node: node, style: textStyle);
73 73
     }
74 74
 
75 75
     Widget bullet =

+ 3
- 3
packages/zefyr/lib/src/widgets/paragraph.dart 查看文件

@@ -22,7 +22,7 @@ class ZefyrParagraph extends StatelessWidget {
22 22
     if (blockStyle != null) {
23 23
       style = style.merge(blockStyle);
24 24
     }
25
-    return new RawZefyrLine(
25
+    return RawZefyrLine(
26 26
       node: node,
27 27
       style: style,
28 28
       padding: theme.paragraphTheme.padding,
@@ -46,7 +46,7 @@ class ZefyrHeading extends StatelessWidget {
46 46
     if (blockStyle != null) {
47 47
       style = style.merge(blockStyle);
48 48
     }
49
-    return new RawZefyrLine(
49
+    return RawZefyrLine(
50 50
       node: node,
51 51
       style: style,
52 52
       padding: theme.padding,
@@ -63,6 +63,6 @@ class ZefyrHeading extends StatelessWidget {
63 63
     } else if (style == NotusAttribute.heading.level3) {
64 64
       return theme.headingTheme.level3;
65 65
     }
66
-    throw new UnimplementedError('Unsupported heading style $style');
66
+    throw UnimplementedError('Unsupported heading style $style');
67 67
   }
68 68
 }

+ 12
- 12
packages/zefyr/lib/src/widgets/rich_text.dart 查看文件

@@ -23,7 +23,7 @@ class ZefyrRichText extends LeafRenderObjectWidget {
23 23
 
24 24
   @override
25 25
   RenderObject createRenderObject(BuildContext context) {
26
-    return new RenderZefyrParagraph(
26
+    return RenderZefyrParagraph(
27 27
       text,
28 28
       node: node,
29 29
       textDirection: Directionality.of(context),
@@ -51,8 +51,8 @@ class RenderZefyrParagraph extends RenderParagraph
51 51
     double textScaleFactor: 1.0,
52 52
     int maxLines,
53 53
   })  : _node = node,
54
-        _prototypePainter = new TextPainter(
55
-          text: new TextSpan(text: '.', style: text.style),
54
+        _prototypePainter = TextPainter(
55
+          text: TextSpan(text: '.', style: text.style),
56 56
           textAlign: textAlign,
57 57
           textDirection: textDirection,
58 58
           textScaleFactor: textScaleFactor,
@@ -94,7 +94,7 @@ class RenderZefyrParagraph extends RenderParagraph
94 94
   @override
95 95
   TextPosition getPositionForOffset(Offset offset) {
96 96
     final position = super.getPositionForOffset(offset);
97
-    return new TextPosition(
97
+    return TextPosition(
98 98
       offset: _node.documentOffset + position.offset,
99 99
       affinity: position.affinity,
100 100
     );
@@ -102,12 +102,12 @@ class RenderZefyrParagraph extends RenderParagraph
102 102
 
103 103
   @override
104 104
   TextRange getWordBoundary(TextPosition position) {
105
-    final localPosition = new TextPosition(
105
+    final localPosition = TextPosition(
106 106
       offset: position.offset - _node.documentOffset,
107 107
       affinity: position.affinity,
108 108
     );
109 109
     final localRange = super.getWordBoundary(localPosition);
110
-    return new TextRange(
110
+    return TextRange(
111 111
       start: _node.documentOffset + localRange.start,
112 112
       end: _node.documentOffset + localRange.end,
113 113
     );
@@ -115,7 +115,7 @@ class RenderZefyrParagraph extends RenderParagraph
115 115
 
116 116
   @override
117 117
   Offset getOffsetForCaret(TextPosition position, Rect caretPrototype) {
118
-    final localPosition = new TextPosition(
118
+    final localPosition = TextPosition(
119 119
       offset: position.offset - _node.documentOffset,
120 120
       affinity: position.affinity,
121 121
     );
@@ -131,7 +131,7 @@ class RenderZefyrParagraph extends RenderParagraph
131 131
       final caret = CursorPainter.buildPrototype(preferredLineHeight);
132 132
       final offset = getOffsetForCaret(local.extent, caret);
133 133
       return [
134
-        new ui.TextBox.fromLTRBD(
134
+        ui.TextBox.fromLTRBD(
135 135
           offset.dx,
136 136
           offset.dy,
137 137
           offset.dx,
@@ -164,13 +164,13 @@ class RenderZefyrParagraph extends RenderParagraph
164 164
       final box = result.first;
165 165
       final dx = isBaseShifted == -1 ? box.right : box.left;
166 166
       result.removeAt(0);
167
-      result.insert(0,
168
-          new ui.TextBox.fromLTRBD(dx, box.top, dx, box.bottom, box.direction));
167
+      result.insert(
168
+          0, ui.TextBox.fromLTRBD(dx, box.top, dx, box.bottom, box.direction));
169 169
     }
170 170
     if (isExtentShifted) {
171 171
       final box = result.last;
172 172
       result.removeLast;
173
-      result.add(new ui.TextBox.fromLTRBD(
173
+      result.add(ui.TextBox.fromLTRBD(
174 174
           box.left, box.top, box.left, box.bottom, box.direction));
175 175
     }
176 176
     return result;
@@ -182,7 +182,7 @@ class RenderZefyrParagraph extends RenderParagraph
182 182
 
183 183
   @override
184 184
   void set text(InlineSpan value) {
185
-    _prototypePainter.text = new TextSpan(text: '.', style: value.style);
185
+    _prototypePainter.text = TextSpan(text: '.', style: value.style);
186 186
     _selectionRects = null;
187 187
     super.text = value;
188 188
   }

+ 16
- 18
packages/zefyr/lib/src/widgets/selection.dart 查看文件

@@ -31,8 +31,7 @@ class ZefyrSelectionOverlay extends StatefulWidget {
31 31
   final TextSelectionControls controls;
32 32
 
33 33
   @override
34
-  _ZefyrSelectionOverlayState createState() =>
35
-      new _ZefyrSelectionOverlayState();
34
+  _ZefyrSelectionOverlayState createState() => _ZefyrSelectionOverlayState();
36 35
 }
37 36
 
38 37
 class _ZefyrSelectionOverlayState extends State<ZefyrSelectionOverlay>
@@ -164,27 +163,27 @@ class _ZefyrSelectionOverlayState extends State<ZefyrSelectionOverlay>
164 163
 
165 164
   @override
166 165
   Widget build(BuildContext context) {
167
-    final overlay = new GestureDetector(
166
+    final overlay = GestureDetector(
168 167
       behavior: HitTestBehavior.translucent,
169 168
       onTapDown: _handleTapDown,
170 169
       onTap: _handleTap,
171 170
       onTapCancel: _handleTapCancel,
172 171
       onLongPress: _handleLongPress,
173
-      child: new Stack(
172
+      child: Stack(
174 173
         fit: StackFit.expand,
175 174
         children: <Widget>[
176
-          new SelectionHandleDriver(
175
+          SelectionHandleDriver(
177 176
             position: _SelectionHandlePosition.base,
178 177
             selectionOverlay: this,
179 178
           ),
180
-          new SelectionHandleDriver(
179
+          SelectionHandleDriver(
181 180
             position: _SelectionHandlePosition.extent,
182 181
             selectionOverlay: this,
183 182
           ),
184 183
         ],
185 184
       ),
186 185
     );
187
-    return new Container(child: overlay);
186
+    return Container(child: overlay);
188 187
   }
189 188
 
190 189
   //
@@ -241,7 +240,7 @@ class _ZefyrSelectionOverlayState extends State<ZefyrSelectionOverlay>
241 240
     assert(_lastTapDownPosition != null);
242 241
     final globalPoint = _lastTapDownPosition;
243 242
     _lastTapDownPosition = null;
244
-    HitTestResult result = new HitTestResult();
243
+    HitTestResult result = HitTestResult();
245 244
     WidgetsBinding.instance.hitTest(result, globalPoint);
246 245
 
247 246
     RenderEditableProxyBox box = _getEditableBox(result);
@@ -252,7 +251,7 @@ class _ZefyrSelectionOverlayState extends State<ZefyrSelectionOverlay>
252 251
 
253 252
     final localPoint = box.globalToLocal(globalPoint);
254 253
     final position = box.getPositionForOffset(localPoint);
255
-    final selection = new TextSelection.collapsed(
254
+    final selection = TextSelection.collapsed(
256 255
       offset: position.offset,
257 256
       affinity: position.affinity,
258 257
     );
@@ -272,7 +271,7 @@ class _ZefyrSelectionOverlayState extends State<ZefyrSelectionOverlay>
272 271
   void _handleLongPress() {
273 272
     final Offset globalPoint = _longPressPosition;
274 273
     _longPressPosition = null;
275
-    HitTestResult result = new HitTestResult();
274
+    HitTestResult result = HitTestResult();
276 275
     WidgetsBinding.instance.hitTest(result, globalPoint);
277 276
     final box = _getEditableBox(result);
278 277
     if (box == null) {
@@ -281,7 +280,7 @@ class _ZefyrSelectionOverlayState extends State<ZefyrSelectionOverlay>
281 280
     final localPoint = box.globalToLocal(globalPoint);
282 281
     final position = box.getPositionForOffset(localPoint);
283 282
     final word = box.getWordBoundary(position);
284
-    final selection = new TextSelection(
283
+    final selection = TextSelection(
285 284
       baseOffset: word.start,
286 285
       extentOffset: word.end,
287 286
     );
@@ -315,8 +314,7 @@ class SelectionHandleDriver extends StatefulWidget {
315 314
   final _ZefyrSelectionOverlayState selectionOverlay;
316 315
 
317 316
   @override
318
-  _SelectionHandleDriverState createState() =>
319
-      new _SelectionHandleDriverState();
317
+  _SelectionHandleDriverState createState() => _SelectionHandleDriverState();
320 318
 }
321 319
 
322 320
 class _SelectionHandleDriverState extends State<SelectionHandleDriver>
@@ -376,7 +374,7 @@ class _SelectionHandleDriverState extends State<SelectionHandleDriver>
376 374
   @override
377 375
   Widget build(BuildContext context) {
378 376
     if (widget.selectionOverlay.shouldHideControls) {
379
-      return new Container();
377
+      return Container();
380 378
     }
381 379
     final block = _scope.renderContext.boxForTextOffset(documentOffset);
382 380
     if (block == null) {
@@ -543,7 +541,7 @@ class _SelectionToolbar extends StatefulWidget {
543 541
   final _ZefyrSelectionOverlayState selectionOverlay;
544 542
 
545 543
   @override
546
-  _SelectionToolbarState createState() => new _SelectionToolbarState();
544
+  _SelectionToolbarState createState() => _SelectionToolbarState();
547 545
 }
548 546
 
549 547
 class _SelectionToolbarState extends State<_SelectionToolbar> {
@@ -565,7 +563,7 @@ class _SelectionToolbarState extends State<_SelectionToolbar> {
565 563
     }
566 564
     final boxes = block.getEndpointsForSelection(selection);
567 565
     // Find the horizontal midpoint, just above the selected text.
568
-    Offset midpoint = new Offset(
566
+    Offset midpoint = Offset(
569 567
       (boxes.length == 1)
570 568
           ? (boxes[0].start + boxes[0].end) / 2.0
571 569
           : (boxes[0].start + boxes[1].start) / 2.0,
@@ -588,7 +586,7 @@ class _SelectionToolbarState extends State<_SelectionToolbar> {
588 586
       ];
589 587
     }
590 588
 
591
-    final Rect editingRegion = new Rect.fromPoints(
589
+    final Rect editingRegion = Rect.fromPoints(
592 590
       block.localToGlobal(Offset.zero),
593 591
       block.localToGlobal(block.size.bottomRight(Offset.zero)),
594 592
     );
@@ -600,7 +598,7 @@ class _SelectionToolbarState extends State<_SelectionToolbar> {
600 598
         midpoint,
601 599
         endpoints,
602 600
         widget.selectionOverlay);
603
-    return new CompositedTransformFollower(
601
+    return CompositedTransformFollower(
604 602
       link: block.layerLink,
605 603
       showWhenUnlinked: false,
606 604
       offset: -editingRegion.topLeft,

+ 9
- 9
packages/zefyr/lib/src/widgets/toolbar.dart 查看文件

@@ -88,7 +88,7 @@ class ZefyrToolbarScaffold extends StatelessWidget {
88 88
     } else if (autoImplyTrailing) {
89 89
       children.add(toolbar.buildButton(context, ZefyrToolbarAction.close));
90 90
     }
91
-    return new Container(
91
+    return Container(
92 92
       constraints: constraints,
93 93
       child: Material(color: theme.color, child: Row(children: children)),
94 94
     );
@@ -122,7 +122,7 @@ class ZefyrToolbar extends StatefulWidget implements PreferredSizeWidget {
122 122
   ZefyrToolbarState createState() => ZefyrToolbarState();
123 123
 
124 124
   @override
125
-  ui.Size get preferredSize => new Size.fromHeight(ZefyrToolbar.kToolbarHeight);
125
+  ui.Size get preferredSize => Size.fromHeight(ZefyrToolbar.kToolbarHeight);
126 126
 }
127 127
 
128 128
 class _ZefyrToolbarScope extends InheritedWidget {
@@ -165,7 +165,7 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
165 165
 
166 166
   Future<void> showOverlay(WidgetBuilder builder) async {
167 167
     assert(_overlayBuilder == null);
168
-    final completer = new Completer<void>();
168
+    final completer = Completer<void>();
169 169
     setState(() {
170 170
       _overlayBuilder = builder;
171 171
       _overlayCompleter = completer;
@@ -192,9 +192,9 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
192 192
   @override
193 193
   void initState() {
194 194
     super.initState();
195
-    _delegate = widget.delegate ?? new _DefaultZefyrToolbarDelegate();
196
-    _overlayAnimation = new AnimationController(
197
-        vsync: this, duration: Duration(milliseconds: 100));
195
+    _delegate = widget.delegate ?? _DefaultZefyrToolbarDelegate();
196
+    _overlayAnimation =
197
+        AnimationController(vsync: this, duration: Duration(milliseconds: 100));
198 198
     _selection = editor.selection;
199 199
   }
200 200
 
@@ -202,7 +202,7 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
202 202
   void didUpdateWidget(ZefyrToolbar oldWidget) {
203 203
     super.didUpdateWidget(oldWidget);
204 204
     if (widget.delegate != oldWidget.delegate) {
205
-      _delegate = widget.delegate ?? new _DefaultZefyrToolbarDelegate();
205
+      _delegate = widget.delegate ?? _DefaultZefyrToolbarDelegate();
206 206
     }
207 207
   }
208 208
 
@@ -227,7 +227,7 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
227 227
     layers.add(toolbar);
228 228
 
229 229
     if (hasOverlay) {
230
-      Widget widget = new Builder(builder: _overlayBuilder);
230
+      Widget widget = Builder(builder: _overlayBuilder);
231 231
       assert(widget != null);
232 232
       final overlay = FadeTransition(
233 233
         key: _overlayKey,
@@ -275,7 +275,7 @@ class ZefyrButtonList extends StatefulWidget {
275 275
 }
276 276
 
277 277
 class _ZefyrButtonListState extends State<ZefyrButtonList> {
278
-  final ScrollController _controller = new ScrollController();
278
+  final ScrollController _controller = ScrollController();
279 279
   bool _showLeftArrow = false;
280 280
   bool _showRightArrow = false;
281 281
 

+ 3
- 3
packages/zefyr/lib/util.dart 查看文件

@@ -12,8 +12,8 @@ import 'package:quill_delta/quill_delta.dart';
12 12
 export 'src/fast_diff.dart';
13 13
 
14 14
 int getPositionDelta(Delta user, Delta actual) {
15
-  final userIter = new DeltaIterator(user);
16
-  final actualIter = new DeltaIterator(actual);
15
+  final userIter = DeltaIterator(user);
16
+  final actualIter = DeltaIterator(actual);
17 17
   int diff = 0;
18 18
   while (userIter.hasNext || actualIter.hasNext) {
19 19
     num length = math.min(userIter.peekLength(), actualIter.peekLength());
@@ -26,7 +26,7 @@ int getPositionDelta(Delta user, Delta actual) {
26 26
     } else if (userOp.isDelete && actualOp.isRetain) {
27 27
       diff += userOp.length;
28 28
     } else if (userOp.isRetain && actualOp.isInsert) {
29
-      if (actualOp.data.startsWith('\n') ) {
29
+      if (actualOp.data.startsWith('\n')) {
30 30
         // At this point user input reached its end (retain). If a heuristic
31 31
         // rule inserts a new line we should keep cursor on it's original position.
32 32
         continue;