Merge pull request #201 from UnityTech/yczhang

Cleanup Warnings.

Author: kgdev

Runtime/debugger/diagnostics.cs

@@ -6,6 +6,8 @@
 using Unity.UIWidgets.ui;
 
 namespace Unity.UIWidgets.debugger {
+#pragma warning disable 0659
+#pragma warning disable 0661
     public class DiagnosticsNode : IEquatable<DiagnosticsNode> {
         readonly Dictionary<string, object> _json; // todo use json class such as simple json
         public readonly bool isProperty;
@@ -310,6 +312,8 @@ public List<DiagnosticsNode> inlineProperties {
             }
         }
     }
+#pragma warning restore 0659
+#pragma warning restore 0661
 
     public class InspectorInstanceRef : IEquatable<InspectorInstanceRef> {
         public readonly string id;

Runtime/flow/physical_shape_layer.cs

@@ -17,7 +17,9 @@ public PhysicalShapeLayer(
         Color _shadow_color;
         float _device_pixel_ratio;
         Path _path;
+#pragma warning disable 0414
         bool _isRect;
+#pragma warning restore 0414
         Rect _frameRRect;
         Clip _clip_behavior;
 

Runtime/foundation/key.cs

@@ -2,6 +2,9 @@
 using System.Collections.Generic;
 
 namespace Unity.UIWidgets.foundation {
+    
+#pragma warning disable 0660
+#pragma warning disable 0661
     public abstract class Key {
         protected Key() {
         }
@@ -18,6 +21,8 @@ public static Key key(string value) {
             return !Equals(left, right);
         }
     }
+#pragma warning restore 0660
+#pragma warning restore 0661
 
     public abstract class LocalKey : Key {
         protected LocalKey() {

Runtime/material/slider_theme.cs

@@ -929,6 +929,7 @@ TextPainter labelPainter
                     return true;
                 }
 
+#pragma warning disable 0162
                 Offset leftCenter = _topLobeCenter - new Offset(leftWidthNeeded, 0.0f) + neckStretch;
                 Offset rightCenter = _topLobeCenter + new Offset(rightWidthNeeded, 0.0f) + neckStretch;
                 Rect valueRect = Rect.fromLTRB(
@@ -943,6 +944,7 @@ TextPainter labelPainter
                 outlinePaint.strokeWidth = 1.0f;
                 canvas.drawRect(valueRect, outlinePaint);
                 return true;
+#pragma warning restore 0162
             });
 
             _addArc(

Runtime/material/text_field.cs

@@ -445,7 +445,7 @@ public override Widget build(BuildContext context) {
                 formatters.Add(new LengthLimitingTextInputFormatter(this.widget.maxLength));
             }
 
-            bool forcePressEnabled = false;
+            // bool forcePressEnabled = false; // TODO: wait for force press is ready
             TextSelectionControls textSelectionControls = MaterialUtils.materialTextSelectionControls;;
             bool paintCursorAboveText = false;
             bool cursorOpacityAnimates = false;

Runtime/painting/fractional_offset.cs

@@ -31,23 +31,25 @@ public float dy {
             get { return (this.y + 1.0f) / 2.0f; }
         }
 
-        public readonly FractionalOffset topLeft = new FractionalOffset(0.0f, 0.0f);
+#pragma warning disable 0108
+        public static readonly FractionalOffset topLeft = new FractionalOffset(0.0f, 0.0f);
 
-        public readonly FractionalOffset topCenter = new FractionalOffset(0.5f, 0.0f);
+        public static readonly FractionalOffset topCenter = new FractionalOffset(0.5f, 0.0f);
 
-        public readonly FractionalOffset topRight = new FractionalOffset(1.0f, 0.0f);
+        public static readonly FractionalOffset topRight = new FractionalOffset(1.0f, 0.0f);
 
-        public readonly FractionalOffset centerLeft = new FractionalOffset(0.0f, 0.5f);
+        public static readonly FractionalOffset centerLeft = new FractionalOffset(0.0f, 0.5f);
 
-        public readonly FractionalOffset center = new FractionalOffset(0.5f, 0.5f);
+        public static readonly FractionalOffset center = new FractionalOffset(0.5f, 0.5f);
 
-        public readonly FractionalOffset centerRight = new FractionalOffset(1.0f, 0.5f);
+        public static readonly FractionalOffset centerRight = new FractionalOffset(1.0f, 0.5f);
 
-        public readonly FractionalOffset bottomLeft = new FractionalOffset(0.0f, 1.0f);
+        public static readonly FractionalOffset bottomLeft = new FractionalOffset(0.0f, 1.0f);
 
-        public readonly FractionalOffset bottomCenter = new FractionalOffset(0.5f, 1.0f);
+        public static readonly FractionalOffset bottomCenter = new FractionalOffset(0.5f, 1.0f);
 
-        public readonly FractionalOffset bottomRight = new FractionalOffset(1.0f, 1.0f);
+        public static readonly FractionalOffset bottomRight = new FractionalOffset(1.0f, 1.0f);
+#pragma warning restore 0108
 
         public static Alignment operator -(FractionalOffset a, Alignment b) {
             if (!(b is FractionalOffset)) {

Runtime/rendering/object.mixin.gen.cs

@@ -7,7 +7,7 @@
 namespace Unity.UIWidgets.rendering {
 
     public abstract class RenderObjectWithChildMixinRenderObject<ChildType> : RenderObject, RenderObjectWithChildMixin<ChildType>, RenderObjectWithChildMixin where ChildType : RenderObject {
-        public bool debugValidateChild(RenderObject child) {
+        public virtual bool debugValidateChild(RenderObject child) {
             D.assert(() => {
                 if (!(child is ChildType)) {
                     throw new UIWidgetsError(
@@ -88,7 +88,7 @@ public override List<DiagnosticsNode> debugDescribeChildren() {
 
 
     public abstract class RenderObjectWithChildMixinRenderBox<ChildType> : RenderBox, RenderObjectWithChildMixin<ChildType>, RenderObjectWithChildMixin where ChildType : RenderObject {
-        public bool debugValidateChild(RenderObject child) {
+        public virtual bool debugValidateChild(RenderObject child) {
             D.assert(() => {
                 if (!(child is ChildType)) {
                     throw new UIWidgetsError(
@@ -994,7 +994,7 @@ public int childCount {
             get { return this._childCount; }
         }
 
-        public bool debugValidateChild(RenderObject child) {
+        public override bool debugValidateChild(RenderObject child) {
             D.assert(() => {
                 if (!(child is ChildType)) {
                     throw new UIWidgetsError(

Runtime/rendering/paragraph.cs

@@ -250,7 +250,10 @@ public bool hasFocus {
         }
 
         TextSpan _previousHoverSpan;
+
+#pragma warning disable 0414
         bool _pointerHoverInside;
+#pragma warning restore 0414
         bool _hasHoverRecognizer;
         MouseTrackerAnnotation _hoverAnnotation;
 

Runtime/widgets/nested_scroll_view.cs

@@ -330,7 +330,6 @@ public ScrollDirection userScrollDirection {
         ScrollDirection _userScrollDirection = ScrollDirection.idle;
 
         public void updateUserScrollDirection(ScrollDirection value) {
-            D.assert(value != null);
             if (this.userScrollDirection == value) {
                 return;
             }
@@ -1076,7 +1075,7 @@ internal void _markNeedsLayout() {
         }
 
         public override string ToString() {
-            string extra;
+            string extra = "";
             switch (this._writers) {
                 case 0:
                     extra = ", orphan";
@@ -1088,7 +1087,7 @@ public override string ToString() {
                     break;
             }
 
-            return "$GetType()($layoutExtent$extra)";
+            return $"{this.GetType()}({this.layoutExtent}{extra})";
         }
     }
 

Tests/Editor/SceneViewTests.cs

@@ -13,7 +13,9 @@ namespace UIWidgets.Tests {
     public class SceneViewTests {
         public static void show() {
             onPreSceneGUIDelegate += OnPreSceneGUI;
+#pragma warning disable 0618
             SceneView.onSceneGUIDelegate += OnSceneGUI;
+#pragma warning restore 0618
             EditorApplication.update += Update;
 
             SceneView.RepaintAll();
@@ -29,11 +31,14 @@ public static void show() {
 
         public static void hide() {
             onPreSceneGUIDelegate -= OnPreSceneGUI;
+#pragma warning disable 0618
             SceneView.onSceneGUIDelegate -= OnSceneGUI;
+#pragma warning restore 0618
             EditorApplication.update -= Update;
             SceneView.RepaintAll();
         }
 
+#pragma warning disable 0618
         public static SceneView.OnSceneFunc onPreSceneGUIDelegate {
             get {
                 var field = typeof(SceneView).GetField("onPreSceneGUIDelegate",
@@ -49,6 +54,7 @@ public static SceneView.OnSceneFunc onPreSceneGUIDelegate {
                 field.SetValue(null, value);
             }
         }
+#pragma warning restore 0618
 
         static Func<Widget>[] _options;