Refactor fn2.dart, since it breached our 1000-line threshold.

sky/sdk/BUILD.gn

Index: sky/sdk/BUILD.gn
diff --git a/sky/sdk/BUILD.gn b/sky/sdk/BUILD.gn
index aee3614c76d9b2eeec52e2c275442410d639cd4d..e975ac75fb56c13ab6d8aa0048d4125e4b5f3433 100644
--- a/sky/sdk/BUILD.gn
+++ b/sky/sdk/BUILD.gn
@@ -43,28 +43,6 @@ dart_pkg("sdk") {
     "lib/framework/components/scaffold.dart",
     "lib/framework/components/scrollable.dart",
     "lib/framework/components/tool_bar.dart",
-    "lib/framework/components2/animated_component.dart",
-    "lib/framework/components2/button.dart",
-    "lib/framework/components2/button_base.dart",
-    "lib/framework/components2/checkbox.dart",
-    "lib/framework/components2/drawer.dart",
-    "lib/framework/components2/drawer_header.dart",
-    "lib/framework/components2/fixed_height_scrollable.dart",
-    "lib/framework/components2/floating_action_button.dart",
-    "lib/framework/components2/icon.dart",
-    "lib/framework/components2/icon_button.dart",
-    "lib/framework/components2/ink_well.dart",
-    "lib/framework/components2/input.dart",
-    "lib/framework/components2/material.dart",
-    "lib/framework/components2/menu_divider.dart",
-    "lib/framework/components2/menu_item.dart",
-    "lib/framework/components2/modal_overlay.dart",
-    "lib/framework/components2/popup_menu.dart",
-    "lib/framework/components2/popup_menu_item.dart",
-    "lib/framework/components2/radio.dart",
-    "lib/framework/components2/scaffold.dart",
-    "lib/framework/components2/scrollable.dart",
-    "lib/framework/components2/tool_bar.dart",
     "lib/framework/debug/shake-to-reload.sky",
     "lib/framework/debug/tracing.dart",
     "lib/framework/editing/editable_string.dart",
@@ -72,6 +50,7 @@ dart_pkg("sdk") {
     "lib/framework/editing/keyboard.dart",
     "lib/framework/editing2/editable_string.dart",
     "lib/framework/editing2/editable_text.dart",
+    "lib/framework/editing2/input.dart",
     "lib/framework/editing2/keyboard.dart",
     "lib/framework/elements/animation/controller.dart",
     "lib/framework/elements/animation/timer.dart",
@@ -93,7 +72,6 @@ dart_pkg("sdk") {
     "lib/framework/elements/sky-toolbar.sky",
     "lib/framework/embedder.dart",
     "lib/framework/fn.dart",
-    "lib/framework/fn2.dart",
     "lib/framework/layout.dart",
     "lib/framework/net/fetch.dart",
     "lib/framework/net/image_cache.dart",
@@ -117,6 +95,29 @@ dart_pkg("sdk") {
     "lib/framework/theme2/shadows.dart",
     "lib/framework/theme2/typography.dart",
     "lib/framework/theme2/view_configuration.dart",
+    "lib/framework/widgets/animated_component.dart",
+    "lib/framework/widgets/button.dart",
+    "lib/framework/widgets/button_base.dart",
+    "lib/framework/widgets/checkbox.dart",
+    "lib/framework/widgets/drawer.dart",
+    "lib/framework/widgets/drawer_header.dart",
+    "lib/framework/widgets/fixed_height_scrollable.dart",
+    "lib/framework/widgets/floating_action_button.dart",
+    "lib/framework/widgets/icon.dart",
+    "lib/framework/widgets/icon_button.dart",
+    "lib/framework/widgets/ink_well.dart",
+    "lib/framework/widgets/material.dart",
+    "lib/framework/widgets/menu_divider.dart",
+    "lib/framework/widgets/menu_item.dart",
+    "lib/framework/widgets/modal_overlay.dart",
+    "lib/framework/widgets/popup_menu.dart",
+    "lib/framework/widgets/popup_menu_item.dart",
+    "lib/framework/widgets/radio.dart",
+    "lib/framework/widgets/scaffold.dart",
+    "lib/framework/widgets/scrollable.dart",
+    "lib/framework/widgets/tool_bar.dart",
+    "lib/framework/widgets/ui_node.dart",
+    "lib/framework/widgets/wrappers.dart",
     "lib/sky_tool",
     "pubspec.yaml",
   ]