Editor refactor - Part 1: Feature project (onivim#1279)

* move FontAwesome and FontIcon to Components * move HighlightText to Components * initial move of EditorSurface to feature project - not compiling * initial move of Minimap - not compiling * move Filter to Core * factor out LanguageSupport feature project * move BufferHighlights to Oni_Syntax * factor out Editor feature project * remove leftover duplicate modules from Model * create Feature_Editor_Test project * create FeatureLanguageSupport_Test project
aubinlrx · Jan 31, 2020 · 174af59 · 174af59
1 parent d038760
commit 174af59
Show file tree

Hide file tree

Showing 108 changed files with 720 additions and 475 deletions.
diff --git a/bench/lib/BufferViewTokenizerBench.re b/bench/lib/BufferViewTokenizerBench.re
@@ -1,7 +1,7 @@
 open Oni_Core;
-open Oni_Model;
 open BenchFramework;
 open Revery;
+open Feature_Editor;
 
 let giantString =
   String.make(1000, 'a')

diff --git a/bench/lib/EditorDiffMarkersBench.re b/bench/lib/EditorDiffMarkersBench.re
@@ -1,6 +1,6 @@
 open Oni_Core;
-open Oni_UI;
 open BenchFramework;
+open Feature_Editor;
 
 // DATA
 

diff --git a/bench/lib/EditorSurfaceBench.re b/bench/lib/EditorSurfaceBench.re
@@ -1,5 +1,6 @@
-open Oni_UI;
+open Oni_Model;
 open BenchFramework;
+open Feature_Editor;
 
 open Helpers;
 
@@ -21,10 +22,24 @@ let editorSurfaceMinimalState = () => {
       rootNode,
       <EditorSurface
         isActiveSplit=true
-        editorGroup
         editor=simpleEditor
-        state=simpleState
+        activeBuffer={Selectors.getBufferForEditor(
+          thousandLineState,
+          simpleEditor,
+        )}
         metrics
+        onScroll={_ => ()}
+        onDimensionsChanged={_ => ()}
+        onCursorChange={_ => ()}
+        bufferHighlights={thousandLineState.bufferHighlights}
+        bufferSyntaxHighlights={thousandLineState.bufferSyntaxHighlights}
+        diagnostics={thousandLineState.diagnostics}
+        completions={thousandLineState.completions}
+        tokenTheme={thousandLineState.tokenTheme}
+        definition={thousandLineState.definition}
+        mode={thousandLineState.mode}
+        theme={thousandLineState.theme}
+        editorFont={thousandLineState.editorFont}
       />,
     );
   ();
@@ -36,10 +51,24 @@ let editorSurfaceThousandLineState = () => {
       rootNode,
       <EditorSurface
         isActiveSplit=true
-        editorGroup
         editor=simpleEditor
-        state=thousandLineState
+        activeBuffer={Selectors.getBufferForEditor(
+          thousandLineState,
+          simpleEditor,
+        )}
         metrics
+        onScroll={_ => ()}
+        onDimensionsChanged={_ => ()}
+        onCursorChange={_ => ()}
+        bufferHighlights={thousandLineState.bufferHighlights}
+        bufferSyntaxHighlights={thousandLineState.bufferSyntaxHighlights}
+        diagnostics={thousandLineState.diagnostics}
+        completions={thousandLineState.completions}
+        tokenTheme={thousandLineState.tokenTheme}
+        definition={thousandLineState.definition}
+        mode={thousandLineState.mode}
+        theme={thousandLineState.theme}
+        editorFont={thousandLineState.editorFont}
       />,
     );
   ();
@@ -51,10 +80,24 @@ let editorSurfaceThousandLineStateWithIndents = () => {
       rootNode,
       <EditorSurface
         isActiveSplit=true
-        editorGroup
         editor=simpleEditor
-        state=thousandLineStateWithIndents
+        activeBuffer={Selectors.getBufferForEditor(
+          thousandLineState,
+          simpleEditor,
+        )}
         metrics
+        onScroll={_ => ()}
+        onDimensionsChanged={_ => ()}
+        onCursorChange={_ => ()}
+        bufferHighlights={thousandLineState.bufferHighlights}
+        bufferSyntaxHighlights={thousandLineState.bufferSyntaxHighlights}
+        diagnostics={thousandLineState.diagnostics}
+        completions={thousandLineState.completions}
+        tokenTheme={thousandLineState.tokenTheme}
+        definition={thousandLineState.definition}
+        mode={thousandLineState.mode}
+        theme={thousandLineState.theme}
+        editorFont={thousandLineState.editorFont}
       />,
     );
   ();
@@ -66,10 +109,24 @@ let editorSurfaceHundredThousandLineState = () => {
       rootNode,
       <EditorSurface
         isActiveSplit=true
-        editorGroup
         editor=simpleEditor
-        state=hundredThousandLineState
+        activeBuffer={Selectors.getBufferForEditor(
+          thousandLineState,
+          simpleEditor,
+        )}
         metrics
+        onScroll={_ => ()}
+        onDimensionsChanged={_ => ()}
+        onCursorChange={_ => ()}
+        bufferHighlights={thousandLineState.bufferHighlights}
+        bufferSyntaxHighlights={thousandLineState.bufferSyntaxHighlights}
+        diagnostics={thousandLineState.diagnostics}
+        completions={thousandLineState.completions}
+        tokenTheme={thousandLineState.tokenTheme}
+        definition={thousandLineState.definition}
+        mode={thousandLineState.mode}
+        theme={thousandLineState.theme}
+        editorFont={thousandLineState.editorFont}
       />,
     );
   ();
@@ -87,10 +144,24 @@ let setupSurfaceThousandLineLayout = () => {
     container,
     <EditorSurface
       isActiveSplit=true
-      editorGroup
       editor=simpleEditor
-      state=thousandLineState
+      activeBuffer={Selectors.getBufferForEditor(
+        thousandLineState,
+        simpleEditor,
+      )}
       metrics
+      onScroll={_ => ()}
+      onDimensionsChanged={_ => ()}
+      onCursorChange={_ => ()}
+      bufferHighlights={thousandLineState.bufferHighlights}
+      bufferSyntaxHighlights={thousandLineState.bufferSyntaxHighlights}
+      diagnostics={thousandLineState.diagnostics}
+      completions={thousandLineState.completions}
+      tokenTheme={thousandLineState.tokenTheme}
+      definition={thousandLineState.definition}
+      mode={thousandLineState.mode}
+      theme={thousandLineState.theme}
+      editorFont={thousandLineState.editorFont}
     />,
   )
   |> ignore;

diff --git a/bench/lib/Helpers.re b/bench/lib/Helpers.re
@@ -3,6 +3,7 @@ open Oni_Core;
 open Utility;
 open Oni_Model;
 open Oni_Store;
+open Feature_Editor;
 
 let metrics = EditorMetrics.create();
 

diff --git a/integration_test/ExtHostDefinitionTest.re b/integration_test/ExtHostDefinitionTest.re
@@ -2,6 +2,8 @@ open Oni_Core;
 open Oni_Core.Utility;
 open Oni_Model;
 open Oni_IntegrationTestLib;
+open Feature_LanguageSupport;
+open Feature_Editor;
 
 // This test validates:
 // - The 'oni-dev' extension gets activated

diff --git a/integration_test/LanguageCssTest.re b/integration_test/LanguageCssTest.re
@@ -2,6 +2,7 @@ open Oni_Core;
 open Oni_Core.Utility;
 open Oni_Model;
 open Oni_IntegrationTestLib;
+open Feature_LanguageSupport;
 
 // This test validates:
 // - The 'oni-dev' extension gets activated
@@ -62,8 +63,7 @@ runTestWithInput(
 
       switch (bufferOpt) {
       | Some(buffer) =>
-        let diags =
-          Model.Diagnostics.getDiagnostics(state.diagnostics, buffer);
+        let diags = Diagnostics.getDiagnostics(state.diagnostics, buffer);
         List.length(diags) > 0;
       | _ => false
       };
@@ -92,8 +92,7 @@ runTestWithInput(
 
       switch (bufferOpt) {
       | Some(buffer) =>
-        let diags =
-          Model.Diagnostics.getDiagnostics(state.diagnostics, buffer);
+        let diags = Diagnostics.getDiagnostics(state.diagnostics, buffer);
         List.length(diags) == 0;
       | _ => false
       };

diff --git a/integration_test/LanguageTypeScriptTest.re b/integration_test/LanguageTypeScriptTest.re
@@ -2,6 +2,7 @@ open Oni_Core;
 open Oni_Core.Utility;
 open Oni_Model;
 open Oni_IntegrationTestLib;
+open Feature_LanguageSupport;
 
 runTestWithInput(
   ~name="LanguageTypeScriptTest", (input, dispatch, wait, _runEffects) => {
@@ -70,8 +71,7 @@ runTestWithInput(
 
       switch (bufferOpt) {
       | Some(buffer) =>
-        let diags =
-          Model.Diagnostics.getDiagnostics(state.diagnostics, buffer);
+        let diags = Diagnostics.getDiagnostics(state.diagnostics, buffer);
         List.length(diags) > 0;
       | _ => false
       };
@@ -97,8 +97,7 @@ runTestWithInput(
 
       switch (bufferOpt) {
       | Some(buffer) =>
-        let diags =
-          Model.Diagnostics.getDiagnostics(state.diagnostics, buffer);
+        let diags = Diagnostics.getDiagnostics(state.diagnostics, buffer);
         List.length(diags) == 0;
       | _ => false
       };

diff --git a/integration_test/Regression1097Test.re b/integration_test/Regression1097Test.re
@@ -5,6 +5,8 @@ open Oni_Core.Utility;
 open Oni_Model;
 open Oni_IntegrationTestLib;
 
+module BufferSyntaxHighlights = Feature_Editor.BufferSyntaxHighlights;
+
 let gotSyntaxServerClose = ref(false);
 
 let onAfterDispatch =

diff --git a/integration_test/SearchShowClearHighlightsTest.re b/integration_test/SearchShowClearHighlightsTest.re
@@ -1,6 +1,7 @@
 open Oni_Core;
 open Oni_Model;
 open Oni_IntegrationTestLib;
+open Oni_Syntax;
 
 runTest(
   ~name="InsertMode test - effects batched to runEffects",

diff --git a/integration_test/SyntaxHighlightTextMateTest.re b/integration_test/SyntaxHighlightTextMateTest.re
@@ -5,6 +5,8 @@ open Oni_Core.Utility;
 open Oni_Model;
 open Oni_IntegrationTestLib;
 
+module BufferSyntaxHighlights = Feature_Editor.BufferSyntaxHighlights;
+
 // Validate that textmate highlight runs
 runTest(~name="SyntaxHighlightTextMateTest", (dispatch, wait, _runEffects) => {
   wait(~name="Capture initial state", (state: State.t) =>

diff --git a/integration_test/SyntaxHighlightTreesitterTest.re b/integration_test/SyntaxHighlightTreesitterTest.re
@@ -5,6 +5,8 @@ open Oni_Core.Utility;
 open Oni_Model;
 open Oni_IntegrationTestLib;
 
+module BufferSyntaxHighlights = Feature_Editor.BufferSyntaxHighlights;
+
 let configuration = Some({|
 { "experimental.treeSitter": true }
 |});

diff --git a/integration_test/lib/ExtensionHelpers.re b/integration_test/lib/ExtensionHelpers.re
@@ -8,7 +8,7 @@ module Option = Core.Utility.Option;
 module Model = Oni_Model;
 
 module State = Model.State;
-module LanguageFeatures = Model.LanguageFeatures;
+module LanguageFeatures = Feature_LanguageSupport.LanguageFeatures;
 
 let waitForExtensionToActivate =
     (~extensionId, waitForState: Types.waitForState) => {

diff --git a/src/UI/FontAwesome.re → src/Components/FontAwesome.re b/src/UI/FontAwesome.re → src/Components/FontAwesome.re
diff --git a/src/UI/FontIcon.re → src/Components/FontIcon.re b/src/UI/FontIcon.re → src/Components/FontIcon.re
diff --git a/src/UI/HighlightText.re → src/Components/HighlightText.re b/src/UI/HighlightText.re → src/Components/HighlightText.re
diff --git a/src/Model/Filter.re → src/Core/Filter.re b/src/Model/Filter.re → src/Core/Filter.re
@@ -5,10 +5,10 @@
  */
 open ReasonFuzz;
 
-open Oni_Core.CamomileBundled.Camomile;
+open CamomileBundled.Camomile;
 
-module IndexEx = Oni_Core.Utility.IndexEx;
-module Zed_utf8 = Oni_Core.ZedBundled;
+module IndexEx = Utility.IndexEx;
+module Zed_utf8 = ZedBundled;
 
 module Option = {
   let map = f =>

diff --git a/src/Model/Filter.rei → src/Core/Filter.rei b/src/Model/Filter.rei → src/Core/Filter.rei
@@ -4,7 +4,7 @@
  * Module to filter & rank items using various strategies.
  */
 
-open Oni_Core.CamomileBundled.Camomile;
+open CamomileBundled.Camomile;
 
 type result('a) = {
   item: 'a,

diff --git a/src/Core/Oni_Core.re b/src/Core/Oni_Core.re
@@ -24,6 +24,7 @@ module EditorFont = EditorFont;
 module EditorSize = EditorSize;
 module EnvironmentVariables = Kernel.EnvironmentVariables;
 module Filesystem = Filesystem;
+module Filter = Filter;
 module Indentation = Indentation;
 module IndentationGuesser = IndentationGuesser;
 module IndentationSettings = IndentationSettings;

diff --git a/src/Core/dune b/src/Core/dune
@@ -18,5 +18,6 @@
         textmate
         editor-core-types
         timber
+        ReasonFuzz
     )
     (preprocess (pps ppx_deriving_yojson ppx_deriving.show)))
diff --git a/src/Model/BufferLineColorizer.re → src/Feature/Editor/BufferLineColorizer.re b/src/Model/BufferLineColorizer.re → src/Feature/Editor/BufferLineColorizer.re
diff --git a/src/Model/BufferLineColorizer.rei → src/Feature/Editor/BufferLineColorizer.rei b/src/Model/BufferLineColorizer.rei → src/Feature/Editor/BufferLineColorizer.rei
diff --git a/src/Model/BufferSyntaxHighlights.re → src/Feature/Editor/BufferSyntaxHighlights.re b/src/Model/BufferSyntaxHighlights.re → src/Feature/Editor/BufferSyntaxHighlights.re
diff --git a/src/Model/BufferViewTokenizer.re → src/Feature/Editor/BufferViewTokenizer.re b/src/Model/BufferViewTokenizer.re → src/Feature/Editor/BufferViewTokenizer.re
diff --git a/src/UI/CompletionsView.re → src/Feature/Editor/CompletionsView.re b/src/UI/CompletionsView.re → src/Feature/Editor/CompletionsView.re
@@ -3,14 +3,14 @@ open Revery.UI;
 
 open Oni_Core;
 open Oni_Syntax;
-open Oni_Model;
 open Oni_Components;
 open Utility;
 
-open Completions;
+open Feature_LanguageSupport.Completions;
 
 module Zed_utf8 = Oni_Core.ZedBundled;
 module Ext = Oni_Extensions;
+module CompletionItem = Feature_LanguageSupport.CompletionItem;
 
 open Ext.CompletionItemKind;
 
@@ -189,10 +189,19 @@ let detailView =
     <Text style={Styles.detailText(~editorFont, ~theme, ~tokenTheme)} text />
   </View>;
 
-let make = (~x: int, ~y: int, ~lineHeight: float, ~state: State.t, ()) => {
+let make =
+    (
+      ~x: int,
+      ~y: int,
+      ~lineHeight: float,
+      ~theme,
+      ~tokenTheme,
+      ~editorFont,
+      ~completions,
+      (),
+    ) => {
   /*let hoverEnabled =
     Configuration.getValue(c => c.editorHoverEnabled, state.configuration);*/
-  let {theme, tokenTheme, editorFont, completions, _}: State.t = state;
   let items = completions.filtered;
 
   let maxWidth =