From f33922552669973fe85e80c65c12626bb3cf0427 Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Wed, 23 Dec 2020 14:16:11 -0800
Subject: [PATCH 1/4] Wire up config across vimlist / vimtrees

---
 .../Accordion/Component_Accordion.re          |  4 +++
 src/Components/Output/Component_Output.re     |  2 ++
 src/Components/Output/Component_Output.rei    |  1 +
 src/Components/VimList/Component_VimList.re   |  9 ++++--
 src/Components/VimList/dune                   |  1 +
 src/Components/VimTree/Component_VimTree.re   |  2 ++
 src/Components/VimTree/Component_VimTree.rei  |  1 +
 .../Configuration/GlobalConfiguration.re      | 10 +++++++
 src/Feature/Editor/Feature_Editor.re          | 28 ++++++++++---------
 src/Feature/Pane/DiagnosticsPaneView.re       |  2 ++
 src/Feature/Pane/Feature_Pane.re              |  6 ++++
 src/Feature/Pane/LocationsPaneView.re         |  2 ++
 src/Feature/Pane/NotificationsPaneView.re     |  2 ++
 src/Feature/Search/Feature_Search.re          |  2 ++
 src/Feature/Search/Feature_Search.rei         |  1 +
 src/Store/Features.re                         | 15 ++++++----
 16 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/src/Components/Accordion/Component_Accordion.re b/src/Components/Accordion/Component_Accordion.re
index 73817334b5..c74d133ab8 100644
--- a/src/Components/Accordion/Component_Accordion.re
+++ b/src/Components/Accordion/Component_Accordion.re
@@ -135,6 +135,7 @@ module Common = {
 module VimList = {
   let make =
       (
+        ~config,
         ~showCount=true,
         ~title,
         ~expanded,
@@ -150,6 +151,7 @@ module VimList = {
     let count = Component_VimList.count(model);
     let contents =
       <Component_VimList.View
+        config
         font=uiFont
         isActive=isFocused
         focusedIndex=None
@@ -176,6 +178,7 @@ module VimList = {
 module VimTree = {
   let make =
       (
+        ~config,
         ~showCount=true,
         ~focusedIndex=None,
         ~title,
@@ -194,6 +197,7 @@ module VimTree = {
     let contents =
       count > 0
         ? <Component_VimTree.View
+            config
             isActive=isFocused
             font=uiFont
             focusedIndex
diff --git a/src/Components/Output/Component_Output.re b/src/Components/Output/Component_Output.re
index f57c114a21..005e1da435 100644
--- a/src/Components/Output/Component_Output.re
+++ b/src/Components/Output/Component_Output.re
@@ -65,6 +65,7 @@ module View = {
 
   let make =
       (
+        ~config,
         ~isActive,
         ~editorFont: Service_Font.font,
         ~uiFont: UiFont.t,
@@ -77,6 +78,7 @@ module View = {
     let fg = Feature_Theme.Colors.Terminal.foreground.from(theme);
     <View style=Style.[backgroundColor(bg), flexGrow(1)]>
       <Component_VimList.View
+        config
         isActive
         font=uiFont
         focusedIndex=None
diff --git a/src/Components/Output/Component_Output.rei b/src/Components/Output/Component_Output.rei
index ea71708469..c9b574a94b 100644
--- a/src/Components/Output/Component_Output.rei
+++ b/src/Components/Output/Component_Output.rei
@@ -41,6 +41,7 @@ module Contributions: {
 module View: {
   let make:
     (
+      ~config: Config.resolver,
       ~isActive: bool,
       ~editorFont: Service_Font.font,
       ~uiFont: UiFont.t,
diff --git a/src/Components/VimList/Component_VimList.re b/src/Components/VimList/Component_VimList.re
index 5f9cc74555..31545b3ccb 100644
--- a/src/Components/VimList/Component_VimList.re
+++ b/src/Components/VimList/Component_VimList.re
@@ -676,7 +676,6 @@ module View = {
   module Colors = Feature_Theme.Colors;
 
   module Constants = {
-    let scrollWheelMultiplier = 25;
     let additionalRowsToRender = 1;
     let scrollBarThickness = 6;
     let minimumThumbSize = 4;
@@ -822,6 +821,7 @@ module View = {
   let component = React.Expert.component("Component_VimList");
   let make:
     (
+      ~config: Config.resolver,
       ~isActive: bool,
       ~font: UiFont.t,
       ~focusedIndex: option(int),
@@ -839,7 +839,7 @@ module View = {
       unit
     ) =>
     _ =
-    (~isActive, ~font, ~focusedIndex, ~theme, ~model, ~dispatch, ~render, ()) => {
+    (~config, ~isActive, ~font, ~focusedIndex, ~theme, ~model, ~dispatch, ~render, ()) => {
       component(hooks => {
         let {rowHeight, viewportWidth, viewportHeight, _} = model;
 
@@ -858,8 +858,11 @@ module View = {
             hooks,
           );
         let scroll = (wheelEvent: NodeEvents.mouseWheelEventParams) => {
+
+          let mouseWheelPixels =
+          Feature_Configuration.GlobalConfiguration.Editor.mouseWheelScrollPixels.get(config);
           let delta =
-            wheelEvent.deltaY *. float(- Constants.scrollWheelMultiplier);
+            wheelEvent.deltaY *. -1. *. mouseWheelPixels;
 
           dispatch(MouseWheelScrolled({delta: delta}));
         };
diff --git a/src/Components/VimList/dune b/src/Components/VimList/dune
index a1ed07148b..3ed7ca4e4a 100644
--- a/src/Components/VimList/dune
+++ b/src/Components/VimList/dune
@@ -3,6 +3,7 @@
  (public_name Oni2.component.vimList)
  (inline_tests)
  (libraries Oni2.core Oni2.component.inputText Oni2.components Revery
+ Oni2.feature.configuration
    isolinear Oni2.feature.commands Oni2.feature.sneak)
  (preprocess
   (pps ppx_inline_test ppx_let ppx_deriving.show brisk-reconciler.ppx)))
diff --git a/src/Components/VimTree/Component_VimTree.re b/src/Components/VimTree/Component_VimTree.re
index f27f8b1691..bfc095bb05 100644
--- a/src/Components/VimTree/Component_VimTree.re
+++ b/src/Components/VimTree/Component_VimTree.re
@@ -452,6 +452,7 @@ module View = {
     </View>;
   let make =
       (
+        ~config,
         ~isActive,
         ~font,
         ~focusedIndex,
@@ -479,6 +480,7 @@ module View = {
     };
 
     <Component_VimList.View
+      config
       isActive
       font
       focusedIndex
diff --git a/src/Components/VimTree/Component_VimTree.rei b/src/Components/VimTree/Component_VimTree.rei
index 511f431a37..1c786cd194 100644
--- a/src/Components/VimTree/Component_VimTree.rei
+++ b/src/Components/VimTree/Component_VimTree.rei
@@ -77,6 +77,7 @@ module Contributions: {
 module View: {
   let make:
     (
+      ~config: Oni_Core.Config.resolver,
       ~isActive: bool,
       ~font: UiFont.t,
       ~focusedIndex: option(int),
diff --git a/src/Feature/Configuration/GlobalConfiguration.re b/src/Feature/Configuration/GlobalConfiguration.re
index 7ba7db5a60..ee9f692880 100644
--- a/src/Feature/Configuration/GlobalConfiguration.re
+++ b/src/Feature/Configuration/GlobalConfiguration.re
@@ -65,9 +65,19 @@ module Experimental = {
   };
 };
 
+module Editor = {
+  let mouseWheelScrollPixels =
+    setting(
+      "editor.mouseWheelScrollPixels",
+      float,
+      ~default=50.
+    )
+};
+
 let contributions = [
   inactiveWindowOpacity.spec,
   animation.spec,
   shadows.spec,
   Experimental.Editor.codeLensEnabled.spec,
+  Editor.mouseWheelScrollPixels.spec,
 ];
diff --git a/src/Feature/Editor/Feature_Editor.re b/src/Feature/Editor/Feature_Editor.re
index 9b6c786574..d41a7ad4f6 100644
--- a/src/Feature/Editor/Feature_Editor.re
+++ b/src/Feature/Editor/Feature_Editor.re
@@ -34,12 +34,14 @@ type outmsg =
 type model = Editor.t;
 
 module Constants = {
-  let editorWheelMultiplier = 50.;
-  let minimapWheelMultiplier = 150.;
-  let scrollbarWheelMultiplier = 300.;
+  let editorWheelMultiplier = 1.;
+  let minimapWheelMultiplier = 3.;
+  let scrollbarWheelMultiplier = 6.;
 };
 
-let update = (editor, msg) => {
+let update = (~config, editor, msg) => {
+  let mouseWheelScroll = 
+  Feature_Configuration.GlobalConfiguration.Editor.mouseWheelScrollPixels.get(config);
   switch (msg) {
   | VerticalScrollbarAfterTrackClicked({newPixelScrollY})
   | VerticalScrollbarBeforeTrackClicked({newPixelScrollY})
@@ -49,8 +51,8 @@ let update = (editor, msg) => {
     )
   | MinimapMouseWheel({deltaWheel}) => (
       Editor.scrollDeltaPixelY(
-        ~animated=false,
-        ~pixelY=deltaWheel *. Constants.minimapWheelMultiplier,
+        ~animated=true,
+        ~pixelY=deltaWheel *. mouseWheelScroll *. Constants.minimapWheelMultiplier,
         editor,
       ),
       Nothing,
@@ -65,18 +67,18 @@ let update = (editor, msg) => {
     )
   | EditorMouseWheel({deltaX, deltaY, shiftKey}) => (
       Editor.scrollDeltaPixelXY(
-        ~animated=false,
+        ~animated=true,
         ~pixelX=
-          (shiftKey ? deltaY : deltaX) *. Constants.editorWheelMultiplier,
-        ~pixelY=(shiftKey ? 0. : deltaY) *. Constants.editorWheelMultiplier,
+          (shiftKey ? deltaY : deltaX) *. mouseWheelScroll *. Constants.editorWheelMultiplier,
+        ~pixelY=(shiftKey ? 0. : deltaY) *. mouseWheelScroll *. Constants.editorWheelMultiplier,
         editor,
       ),
       Nothing,
     )
   | VerticalScrollbarMouseWheel({deltaWheel}) => (
       Editor.scrollDeltaPixelY(
-        ~animated=false,
-        ~pixelY=deltaWheel *. Constants.scrollbarWheelMultiplier,
+        ~animated=true,
+        ~pixelY=deltaWheel *. mouseWheelScroll *. Constants.scrollbarWheelMultiplier,
         editor,
       ),
       Nothing,
@@ -89,8 +91,8 @@ let update = (editor, msg) => {
     )
   | HorizontalScrollbarMouseWheel({deltaWheel}) => (
       Editor.scrollDeltaPixelX(
-        ~animated=false,
-        ~pixelX=deltaWheel *. Constants.scrollbarWheelMultiplier,
+        ~animated=true,
+        ~pixelX=deltaWheel *. mouseWheelScroll *. Constants.scrollbarWheelMultiplier,
         editor,
       ),
       Nothing,
diff --git a/src/Feature/Pane/DiagnosticsPaneView.re b/src/Feature/Pane/DiagnosticsPaneView.re
index 3f841187dd..e2b2f46b21 100644
--- a/src/Feature/Pane/DiagnosticsPaneView.re
+++ b/src/Feature/Pane/DiagnosticsPaneView.re
@@ -32,6 +32,7 @@ module Styles = {
 
 let make =
     (
+      ~config,
       ~isFocused: bool,
       ~diagnosticsList: Component_VimTree.model(string, LocationListItem.t),
       ~theme,
@@ -54,6 +55,7 @@ let make =
       </View>;
     } else {
       <Component_VimTree.View
+        config
         font=uiFont
         isActive=isFocused
         focusedIndex=None
diff --git a/src/Feature/Pane/Feature_Pane.re b/src/Feature/Pane/Feature_Pane.re
index d9e956e3cd..8f309d4deb 100644
--- a/src/Feature/Pane/Feature_Pane.re
+++ b/src/Feature/Pane/Feature_Pane.re
@@ -652,6 +652,7 @@ module View = {
   };
   let content =
       (
+        ~config,
         ~isFocused,
         ~selected,
         ~theme,
@@ -675,6 +676,7 @@ module View = {
     switch (selected) {
     | Locations =>
       <LocationsPaneView
+        config
         isFocused
         locationsList
         iconTheme
@@ -687,6 +689,7 @@ module View = {
 
     | Diagnostics =>
       <DiagnosticsPaneView
+        config
         isFocused
         diagnosticsList
         iconTheme
@@ -698,6 +701,7 @@ module View = {
       />
     | Notifications =>
       <NotificationsPaneView
+        config
         isFocused
         notificationsList
         theme
@@ -711,6 +715,7 @@ module View = {
       outputPane
       |> Option.map(model => {
            <Component_Output.View
+              config
              model
              isActive=isFocused
              editorFont
@@ -832,6 +837,7 @@ module View = {
       </View>
       <View style=Styles.content>
         <content
+          config
           isFocused
           iconTheme
           languageInfo
diff --git a/src/Feature/Pane/LocationsPaneView.re b/src/Feature/Pane/LocationsPaneView.re
index b5ade19c09..ac75f169d7 100644
--- a/src/Feature/Pane/LocationsPaneView.re
+++ b/src/Feature/Pane/LocationsPaneView.re
@@ -38,6 +38,7 @@ module Styles = {
 
 let make =
     (
+      ~config,
       ~isFocused: bool,
       ~locationsList:
          Component_VimTree.model(location, Oni_Components.LocationListItem.t),
@@ -61,6 +62,7 @@ let make =
       </View>;
     } else {
       <Component_VimTree.View
+        config
         font=uiFont
         isActive=isFocused
         focusedIndex=None
diff --git a/src/Feature/Pane/NotificationsPaneView.re b/src/Feature/Pane/NotificationsPaneView.re
index bcb688f8c6..1d22b95dbc 100644
--- a/src/Feature/Pane/NotificationsPaneView.re
+++ b/src/Feature/Pane/NotificationsPaneView.re
@@ -31,6 +31,7 @@ module Styles = {
 
 let make =
     (
+      ~config,
       ~isFocused: bool,
       ~notificationsList:
          Component_VimList.model(Feature_Notification.notification),
@@ -52,6 +53,7 @@ let make =
       </View>;
     } else {
       <Component_VimList.View
+        config
         font=uiFont
         isActive=isFocused
         focusedIndex=None
diff --git a/src/Feature/Search/Feature_Search.re b/src/Feature/Search/Feature_Search.re
index b9caf95bfe..5e3de8bf5f 100644
--- a/src/Feature/Search/Feature_Search.re
+++ b/src/Feature/Search/Feature_Search.re
@@ -257,6 +257,7 @@ module Styles = {
 
 let make =
     (
+      ~config,
       ~theme,
       ~uiFont: UiFont.t,
       ~iconTheme,
@@ -302,6 +303,7 @@ let make =
         text={Printf.sprintf("%n results", List.length(model.hits))}
       />
       <Component_VimTree.View
+        config
         isActive={isFocused && model.focus == ResultsPane}
         font=uiFont
         focusedIndex=None
diff --git a/src/Feature/Search/Feature_Search.rei b/src/Feature/Search/Feature_Search.rei
index 70ce825dd9..670a59b86f 100644
--- a/src/Feature/Search/Feature_Search.rei
+++ b/src/Feature/Search/Feature_Search.rei
@@ -32,6 +32,7 @@ let subscriptions:
 
 let make:
   (
+    ~config: Oni_Core.Config.resolver,
     ~theme: ColorTheme.Colors.t,
     ~uiFont: UiFont.t,
     ~iconTheme: IconTheme.t,
diff --git a/src/Store/Features.re b/src/Store/Features.re
index f4157640d2..a1dc026de5 100644
--- a/src/Store/Features.re
+++ b/src/Store/Features.re
@@ -71,12 +71,12 @@ module Internal = {
     Feature_Workspace.Effects.changeDirectory(path)
     |> Isolinear.Effect.map(msg => Actions.Workspace(msg));
 
-  let updateEditor = (~editorId, ~msg, layout) => {
+  let updateEditor = (~config, ~editorId, ~msg, layout) => {
     switch (Feature_Layout.editorById(editorId, layout)) {
     | Some(editor) =>
       open Feature_Editor;
 
-      let (updatedEditor, outmsg) = update(editor, msg);
+      let (updatedEditor, outmsg) = update(~config, editor, msg);
       let layout =
         Feature_Layout.map(
           editor => Editor.getId(editor) == editorId ? updatedEditor : editor,
@@ -115,6 +115,7 @@ module Internal = {
 
   let updateEditors =
       (
+        ~config: Config.resolver,
         ~scope: EditorScope.t,
         ~msg: Feature_Editor.msg,
         layout: Feature_Layout.model,
@@ -126,14 +127,14 @@ module Internal = {
           (prev, editor) => {
             let (layout, effects) = prev;
             let editorId = Feature_Editor.Editor.getId(editor);
-            let (layout', effect') = updateEditor(~editorId, ~msg, layout);
+            let (layout', effect') = updateEditor(~config, ~editorId, ~msg, layout);
             (layout', [effect', ...effects]);
           },
           (layout, []),
           layout,
         );
       (layout', Isolinear.Effect.batch(effects));
-    | Editor(editorId) => updateEditor(~editorId, ~msg, layout)
+    | Editor(editorId) => updateEditor(~config, ~editorId, ~msg, layout)
     };
   };
 
@@ -207,7 +208,8 @@ module Internal = {
     let msg: Feature_Editor.msg =
       ModeChanged({allowAnimation, mode, effects});
     let scope = EditorScope.Editor(activeEditorId);
-    let (layout, editorEffect) = updateEditors(~scope, ~msg, state.layout);
+      let config = Selectors.configResolver(state);
+    let (layout, editorEffect) = updateEditors(~config, ~scope, ~msg, state.layout);
 
     let isInInsertMode =
       Vim.Mode.isInsert(
@@ -1399,8 +1401,9 @@ let update =
     (state, eff);
 
   | Editor({scope, msg}) =>
+    let config = Selectors.configResolver(state);
     let (layout, effect) =
-      Internal.updateEditors(~scope, ~msg, state.layout);
+      Internal.updateEditors(~config, ~scope, ~msg, state.layout);
     let state = {...state, layout};
     (state, effect);
 

From 776cad9d5d2123e7ef19f4ec1ad00c5d091b72a5 Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Fri, 28 May 2021 14:46:14 -0700
Subject: [PATCH 2/4] Initial merge

---
 src/Feature/SCM/Feature_SCM.re | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Feature/SCM/Feature_SCM.re b/src/Feature/SCM/Feature_SCM.re
index a725b02114..1685aedac7 100644
--- a/src/Feature/SCM/Feature_SCM.re
+++ b/src/Feature/SCM/Feature_SCM.re
@@ -1037,6 +1037,7 @@ module Pane = {
 
   let groupView =
       (
+        ~config,
         ~provider,
         ~group: ResourceGroup.t,
         ~iconTheme,
@@ -1070,6 +1071,7 @@ module Pane = {
       />;
     };
     <Component_Accordion.VimList
+      config
       title=label
       expanded
       uiFont=font
@@ -1087,6 +1089,7 @@ module Pane = {
 
   let%component make =
                 (
+                  ~config,
                   ~model,
                   ~workingDirectory,
                   ~isFocused,
@@ -1129,6 +1132,7 @@ module Pane = {
               |> Option.value(~default=true);
 
             <groupView
+            config
               provider
               expanded
               group

From 18d2c68aadb705af2266ee0c60fe8768733fd458 Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Tue, 1 Jun 2021 12:42:05 -0700
Subject: [PATCH 3/4] More merging

---
 src/Feature/Notification/Pane.re |   3 +-
 src/Feature/Pane/Feature_Pane.re | 124 -------------------------------
 src/Feature/SCM/Feature_SCM.rei  |   1 +
 3 files changed, 3 insertions(+), 125 deletions(-)

diff --git a/src/Feature/Notification/Pane.re b/src/Feature/Notification/Pane.re
index 3f4fb34465..145343603d 100644
--- a/src/Feature/Notification/Pane.re
+++ b/src/Feature/Notification/Pane.re
@@ -162,7 +162,7 @@ module View = {
     ];
   };
   let make =
-      (~isFocused: bool, ~model: t, ~theme, ~uiFont: UiFont.t, ~dispatch, ()) => {
+      (~config, ~isFocused: bool, ~model: t, ~theme, ~uiFont: UiFont.t, ~dispatch, ()) => {
     let innerElement =
       if (Component_VimList.count(model.notificationsView) == 0) {
         <View style=Styles.noResultsContainer>
@@ -175,6 +175,7 @@ module View = {
         </View>;
       } else {
         <Component_VimList.View
+          config
           font=uiFont
           isActive=isFocused
           focusedIndex=None
diff --git a/src/Feature/Pane/Feature_Pane.re b/src/Feature/Pane/Feature_Pane.re
index 75e3989e1d..a60aeaca21 100644
--- a/src/Feature/Pane/Feature_Pane.re
+++ b/src/Feature/Pane/Feature_Pane.re
@@ -354,61 +354,6 @@ module View = {
         ~model,
         ~workingDirectory,
         (),
-<<<<<<< HEAD
-      ) =>
-    switch (selected) {
-    | Locations =>
-      <LocationsPaneView
-        config
-        isFocused
-        locationsList
-        iconTheme
-        languageInfo
-        theme
-        uiFont
-        workingDirectory
-        dispatch=locationsDispatch
-      />
-
-    | Diagnostics =>
-      <DiagnosticsPaneView
-        config
-        isFocused
-        diagnosticsList
-        iconTheme
-        languageInfo
-        theme
-        uiFont
-        workingDirectory
-        dispatch=diagnosticDispatch
-      />
-    | Notifications =>
-      <NotificationsPaneView
-        config
-        isFocused
-        notificationsList
-        theme
-        uiFont
-        dispatch=notificationsDispatch
-        onDismiss={notification =>
-          dispatch(DismissNotificationClicked(notification))
-        }
-      />
-    | Output =>
-      outputPane
-      |> Option.map(model => {
-           <Component_Output.View
-              config
-             model
-             isActive=isFocused
-             editorFont
-             uiFont
-             theme
-             dispatch=outputDispatch
-           />
-         })
-      |> Option.value(~default=React.empty)
-=======
       ) => {
     switch (activePane) {
     | None => React.empty
@@ -430,7 +375,6 @@ module View = {
           );
         }
       )
->>>>>>> master
     };
   };
 
@@ -518,73 +462,6 @@ module View = {
         : Feature_Configuration.GlobalConfiguration.inactiveWindowOpacity.get(
             config,
           );
-<<<<<<< HEAD
-    <View style={Styles.pane(~opacity, ~isFocused, ~theme, ~height)}>
-      <View style=Styles.resizer>
-        <ResizeHandle.Horizontal
-          onDrag={delta =>
-            dispatch(Msg.resizeHandleDragged(int_of_float(delta)))
-          }
-          onDragComplete={() => dispatch(Msg.resizeCommitted)}
-        />
-      </View>
-      <View style=Styles.header>
-        <View style=Styles.tabs>
-          <PaneTab
-            uiFont
-            theme
-            title="Problems"
-            onClick=problemsTabClicked
-            isActive={isSelected(Diagnostics, pane)}
-          />
-          <PaneTab
-            uiFont
-            theme
-            title="Notifications"
-            onClick=notificationsTabClicked
-            isActive={isSelected(Notifications, pane)}
-          />
-          <PaneTab
-            uiFont
-            theme
-            title="Locations"
-            onClick=locationsTabClicked
-            isActive={isSelected(Locations, pane)}
-          />
-          <PaneTab
-            uiFont
-            theme
-            title="Output"
-            onClick=outputTabClicked
-            isActive={isSelected(Output, pane)}
-          />
-        </View>
-        <closeButton dispatch theme />
-      </View>
-      <View style=Styles.content>
-        <content
-          config
-          isFocused
-          iconTheme
-          languageInfo
-          diagnosticsList={pane.diagnosticsView}
-          locationsList={pane.locationsView}
-          notificationsList={pane.notificationsView}
-          selected={selected(pane)}
-          outputPane={pane.outputPane}
-          theme
-          dispatch
-          uiFont
-          editorFont
-          diagnosticDispatch={msg => dispatch(DiagnosticsList(msg))}
-          locationsDispatch={msg => dispatch(LocationsList(msg))}
-          notificationsDispatch={msg => dispatch(NotificationsList(msg))}
-          outputDispatch={msg => dispatch(OutputPane(msg))}
-          workingDirectory
-        />
-      </View>
-    </View>;
-=======
     height == 0
       ? React.empty
       : <View
@@ -637,7 +514,6 @@ module View = {
             />
           </View>
         </View>;
->>>>>>> master
   };
 };
 
diff --git a/src/Feature/SCM/Feature_SCM.rei b/src/Feature/SCM/Feature_SCM.rei
index 82762f2eb6..98b752e6f8 100644
--- a/src/Feature/SCM/Feature_SCM.rei
+++ b/src/Feature/SCM/Feature_SCM.rei
@@ -100,6 +100,7 @@ module Pane: {
   let make:
     (
       ~key: Brisk_reconciler.Key.t=?,
+      ~config: Oni_Core.Config.resolver,
       ~model: model,
       ~workingDirectory: string,
       ~isFocused: bool,

From 45c5424e64d4f07f0b56c4969534bf3d970d322f Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Tue, 1 Jun 2021 13:59:16 -0700
Subject: [PATCH 4/4] Finish merge, clean-up

---
 src/Components/VimList/Component_VimList.re   | 21 ++++++++++++----
 .../Configuration/GlobalConfiguration.re      |  6 +----
 src/Feature/Editor/Feature_Editor.re          | 24 +++++++++++++------
 src/Feature/Extensions/Feature_Extensions.rei |  1 +
 src/Feature/Extensions/ListView.re            |  4 ++++
 .../Notification/Feature_Notification.re      |  3 ++-
 src/Feature/Notification/Pane.re              | 10 +++++++-
 src/Feature/Output/Pane.re                    | 16 +++++++++++--
 src/Feature/SCM/Feature_SCM.re                |  2 +-
 src/Store/Features.re                         |  6 ++---
 src/UI/SideBarView.re                         |  2 ++
 11 files changed, 70 insertions(+), 25 deletions(-)

diff --git a/src/Components/VimList/Component_VimList.re b/src/Components/VimList/Component_VimList.re
index 451491467b..5fcaa54cf3 100644
--- a/src/Components/VimList/Component_VimList.re
+++ b/src/Components/VimList/Component_VimList.re
@@ -986,7 +986,17 @@ module View = {
       unit
     ) =>
     _ =
-    (~config, ~isActive, ~font, ~focusedIndex, ~theme, ~model, ~dispatch, ~render, ()) => {
+    (
+      ~config,
+      ~isActive,
+      ~font,
+      ~focusedIndex,
+      ~theme,
+      ~model,
+      ~dispatch,
+      ~render,
+      (),
+    ) => {
       component(hooks => {
         let {rowHeight, viewportWidth, viewportHeight, _} = model;
 
@@ -1005,11 +1015,12 @@ module View = {
             hooks,
           );
         let scroll = (wheelEvent: NodeEvents.mouseWheelEventParams) => {
-
           let mouseWheelPixels =
-          Feature_Configuration.GlobalConfiguration.Editor.mouseWheelScrollPixels.get(config);
-          let delta =
-            wheelEvent.deltaY *. -1. *. mouseWheelPixels;
+            Feature_Configuration.GlobalConfiguration.Editor.mouseWheelScrollPixels.
+              get(
+              config,
+            );
+          let delta = wheelEvent.deltaY *. (-1.) *. mouseWheelPixels;
 
           dispatch(MouseWheelScrolled({delta: delta}));
         };
diff --git a/src/Feature/Configuration/GlobalConfiguration.re b/src/Feature/Configuration/GlobalConfiguration.re
index 912f7828ba..54b8dd3fa3 100644
--- a/src/Feature/Configuration/GlobalConfiguration.re
+++ b/src/Feature/Configuration/GlobalConfiguration.re
@@ -226,11 +226,7 @@ module Editor = {
     );
 
   let mouseWheelScrollPixels =
-    setting(
-      "editor.mouseWheelScrollPixels",
-      float,
-      ~default=50.
-    )
+    setting("editor.mouseWheelScrollPixels", float, ~default=50.);
   let lineHeight =
     setting(
       ~vim=VimSettings.lineSpace,
diff --git a/src/Feature/Editor/Feature_Editor.re b/src/Feature/Editor/Feature_Editor.re
index f5690b2f1a..bb677521cb 100644
--- a/src/Feature/Editor/Feature_Editor.re
+++ b/src/Feature/Editor/Feature_Editor.re
@@ -41,8 +41,10 @@ module Constants = {
 };
 
 let update = (~config, editor, msg) => {
-  let mouseWheelScroll = 
-  Feature_Configuration.GlobalConfiguration.Editor.mouseWheelScrollPixels.get(config);
+  let mouseWheelScroll =
+    Feature_Configuration.GlobalConfiguration.Editor.mouseWheelScrollPixels.get(
+      config,
+    );
   switch (msg) {
   | VerticalScrollbarAfterTrackClicked({newPixelScrollY})
   | VerticalScrollbarBeforeTrackClicked({newPixelScrollY})
@@ -53,7 +55,8 @@ let update = (~config, editor, msg) => {
   | MinimapMouseWheel({deltaWheel}) => (
       Editor.scrollDeltaPixelY(
         ~animated=true,
-        ~pixelY=deltaWheel *. mouseWheelScroll *. Constants.minimapWheelMultiplier,
+        ~pixelY=
+          deltaWheel *. mouseWheelScroll *. Constants.minimapWheelMultiplier,
         editor,
       ),
       Nothing,
@@ -70,8 +73,13 @@ let update = (~config, editor, msg) => {
       Editor.scrollDeltaPixelXY(
         ~animated=true,
         ~pixelX=
-          (shiftKey ? deltaY : deltaX) *. mouseWheelScroll *. Constants.editorWheelMultiplier,
-        ~pixelY=(shiftKey ? 0. : deltaY) *. mouseWheelScroll *. Constants.editorWheelMultiplier,
+          (shiftKey ? deltaY : deltaX)
+          *. mouseWheelScroll
+          *. Constants.editorWheelMultiplier,
+        ~pixelY=
+          (shiftKey ? 0. : deltaY)
+          *. mouseWheelScroll
+          *. Constants.editorWheelMultiplier,
         editor,
       ),
       Nothing,
@@ -79,7 +87,8 @@ let update = (~config, editor, msg) => {
   | VerticalScrollbarMouseWheel({deltaWheel}) => (
       Editor.scrollDeltaPixelY(
         ~animated=true,
-        ~pixelY=deltaWheel *. mouseWheelScroll *. Constants.scrollbarWheelMultiplier,
+        ~pixelY=
+          deltaWheel *. mouseWheelScroll *. Constants.scrollbarWheelMultiplier,
         editor,
       ),
       Nothing,
@@ -93,7 +102,8 @@ let update = (~config, editor, msg) => {
   | HorizontalScrollbarMouseWheel({deltaWheel}) => (
       Editor.scrollDeltaPixelX(
         ~animated=true,
-        ~pixelX=deltaWheel *. mouseWheelScroll *. Constants.scrollbarWheelMultiplier,
+        ~pixelX=
+          deltaWheel *. mouseWheelScroll *. Constants.scrollbarWheelMultiplier,
         editor,
       ),
       Nothing,
diff --git a/src/Feature/Extensions/Feature_Extensions.rei b/src/Feature/Extensions/Feature_Extensions.rei
index e2e0bf200e..aa478c0901 100644
--- a/src/Feature/Extensions/Feature_Extensions.rei
+++ b/src/Feature/Extensions/Feature_Extensions.rei
@@ -99,6 +99,7 @@ module ListView: {
   let make:
     (
       ~key: Brisk_reconciler.Key.t=?,
+      ~config: Config.resolver,
       ~model: model,
       ~proxy: Service_Net.Proxy.t,
       ~theme: ColorTheme.Colors.t,
diff --git a/src/Feature/Extensions/ListView.re b/src/Feature/Extensions/ListView.re
index bd1bc9aae6..e4a0cde510 100644
--- a/src/Feature/Extensions/ListView.re
+++ b/src/Feature/Extensions/ListView.re
@@ -123,6 +123,7 @@ let versionToString: option(Semver.t) => string =
 
 let%component make =
               (
+                ~config,
                 ~model,
                 ~proxy,
                 ~theme,
@@ -220,6 +221,7 @@ let%component make =
       [
         <Component_Accordion.VimList
           title="Installed"
+          config
           expanded={installedExpanded || isInstalledFocused}
           model={Model.ViewModel.installed(model.viewModel)}
           uiFont=font
@@ -233,6 +235,7 @@ let%component make =
         />,
         <Component_Accordion.VimList
           title="Bundled"
+          config
           expanded={bundledExpanded || isBundledFocused}
           model={Model.ViewModel.bundled(model.viewModel)}
           uiFont=font
@@ -249,6 +252,7 @@ let%component make =
     } else {
       let resultsList =
         <Component_VimList.View
+          config
           isActive={isInstalledFocused || isBundledFocused}
           font
           focusedIndex=None
diff --git a/src/Feature/Notification/Feature_Notification.re b/src/Feature/Notification/Feature_Notification.re
index 4f02fdf320..a6f73f8012 100644
--- a/src/Feature/Notification/Feature_Notification.re
+++ b/src/Feature/Notification/Feature_Notification.re
@@ -483,7 +483,7 @@ module Contributions = {
         ~sub=(~isFocused as _, _model) => Isolinear.Sub.none,
         ~view=
           (
-            ~config as _,
+            ~config,
             ~editorFont as _,
             ~font,
             ~isFocused,
@@ -495,6 +495,7 @@ module Contributions = {
             ~model,
           ) =>
             <Pane.View
+              config
               uiFont=font
               isFocused
               theme
diff --git a/src/Feature/Notification/Pane.re b/src/Feature/Notification/Pane.re
index 145343603d..353c908eb4 100644
--- a/src/Feature/Notification/Pane.re
+++ b/src/Feature/Notification/Pane.re
@@ -162,7 +162,15 @@ module View = {
     ];
   };
   let make =
-      (~config, ~isFocused: bool, ~model: t, ~theme, ~uiFont: UiFont.t, ~dispatch, ()) => {
+      (
+        ~config,
+        ~isFocused: bool,
+        ~model: t,
+        ~theme,
+        ~uiFont: UiFont.t,
+        ~dispatch,
+        (),
+      ) => {
     let innerElement =
       if (Component_VimList.count(model.notificationsView) == 0) {
         <View style=Styles.noResultsContainer>
diff --git a/src/Feature/Output/Pane.re b/src/Feature/Output/Pane.re
index 533c4ae8f6..49cf15a5cf 100644
--- a/src/Feature/Output/Pane.re
+++ b/src/Feature/Output/Pane.re
@@ -55,10 +55,21 @@ let update = (msg, model) => {
 
 module View = {
   open Revery.UI;
-  let make = (~model, ~isActive, ~editorFont, ~uiFont, ~theme, ~dispatch, ()) => {
+  let make =
+      (
+        ~config,
+        ~model,
+        ~isActive,
+        ~editorFont,
+        ~uiFont,
+        ~theme,
+        ~dispatch,
+        (),
+      ) => {
     model.output
     |> Option.map(model => {
          <Component_Output.View
+           config
            model
            isActive
            editorFont
@@ -84,7 +95,7 @@ let pane = {
       ~sub=(~isFocused as _, _model) => Isolinear.Sub.none,
       ~view=
         (
-          ~config as _,
+          ~config,
           ~editorFont,
           ~font,
           ~isFocused,
@@ -96,6 +107,7 @@ let pane = {
           ~model,
         ) =>
           <View
+            config
             editorFont
             uiFont=font
             isActive=isFocused
diff --git a/src/Feature/SCM/Feature_SCM.re b/src/Feature/SCM/Feature_SCM.re
index 1685aedac7..c11daeebca 100644
--- a/src/Feature/SCM/Feature_SCM.re
+++ b/src/Feature/SCM/Feature_SCM.re
@@ -1132,7 +1132,7 @@ module Pane = {
               |> Option.value(~default=true);
 
             <groupView
-            config
+              config
               provider
               expanded
               group
diff --git a/src/Store/Features.re b/src/Store/Features.re
index f84921fad4..654bfe49bf 100644
--- a/src/Store/Features.re
+++ b/src/Store/Features.re
@@ -195,7 +195,8 @@ module Internal = {
           layout,
         );
       (layout', Isolinear.Effect.batch(effects));
-    | Editor(editorId) => updateEditor(~config, ~client, ~editorId, ~msg, layout)
+    | Editor(editorId) =>
+      updateEditor(~config, ~client, ~editorId, ~msg, layout)
     };
   };
 
@@ -285,7 +286,6 @@ module Internal = {
       |> Feature_Layout.activeEditor
       |> Feature_Editor.Editor.getPrimaryCursor;
 
-    let config = Selectors.configResolver(state);
     let editor = Feature_Layout.activeEditor(state.layout);
     let maybeBuffer = Selectors.getActiveBuffer(state);
 
@@ -301,7 +301,7 @@ module Internal = {
     let msg: Feature_Editor.msg =
       ModeChanged({allowAnimation, mode, effects});
     let scope = EditorScope.Editor(activeEditorId);
-      let config = Selectors.configResolver(state);
+    let config = Selectors.configResolver(state);
     let (layout, editorEffect) =
       updateEditors(~config, ~client, ~scope, ~msg, state.layout);
 
diff --git a/src/UI/SideBarView.re b/src/UI/SideBarView.re
index ae0ebd1084..894944b0d5 100644
--- a/src/UI/SideBarView.re
+++ b/src/UI/SideBarView.re
@@ -101,6 +101,7 @@ let make = (~key=?, ~config, ~theme, ~state: State.t, ~dispatch, ()) => {
         | SCM =>
           <Feature_SCM.Pane
             model={state.scm}
+            config
             workingDirectory={Feature_Workspace.workingDirectory(
               state.workspace,
             )}
@@ -133,6 +134,7 @@ let make = (~key=?, ~config, ~theme, ~state: State.t, ~dispatch, ()) => {
         | Extensions =>
           let extensionDispatch = msg => dispatch(Actions.Extensions(msg));
           <Feature_Extensions.ListView
+            config
             model={state.extensions}
             proxy={state.proxy |> Feature_Proxy.proxy}
             theme