Fix double provider information

IntersectMBO · shmish111 · Jan 5, 2021 · Dec 11, 2020 · Dec 15, 2020 · Dec 15, 2020
commit 5ab6c74f69dccaed9b2e3f9f07763c28ba587369
diff --git a/marlowe-playground-client/src/MarloweEditor/State.purs b/marlowe-playground-client/src/MarloweEditor/State.purs
@@ -53,7 +53,14 @@ handleAction _ (HandleEditorMessage (Monaco.TextChanged text)) = do
     (Tuple markerData additionalContext) = Linter.markers unreachableContracts parsedContract
   markers <- query _marloweEditorPageSlot unit (Monaco.SetModelMarkers markerData identity)
   void $ traverse editorSetMarkers markers
-  -- QUESTION: Why do we need to update providers on every text change?
+  {-
+    There are three different Monaco objects that require the linting information:
+      * Markers
+      * Code completion (type aheads)
+      * Code suggestions (Quick fixes)
+     To avoid having to recalculate the linting multiple times, we add aditional context to the providers
+     whenever the code changes.
+  -}
   providers <- query _marloweEditorPageSlot unit (Monaco.GetObjects identity)
   case providers of
     Just { codeActionProvider: Just caProvider, completionItemProvider: Just ciProvider } -> pure $ updateAdditionalContext caProvider ciProvider additionalContext

diff --git a/marlowe-playground-client/src/Simulation.purs b/marlowe-playground-client/src/Simulation.purs
@@ -44,20 +44,21 @@ import Halogen.HTML.Events (onClick, onSelectedIndexChange, onValueChange)
 import Halogen.HTML.Properties (InputType(..), alt, class_, classes, enabled, placeholder, src, type_, value)
 import Halogen.HTML.Properties as HTML
 import Halogen.Monaco (Message(..), Query(..)) as Monaco
-import Halogen.Monaco (monacoComponent)
+import Halogen.Monaco (Settings, monacoComponent)
 import Help (HelpContext(..), toHTML)
+import Language.Haskell.Monaco (languageExtensionPoint, refLabel)
 import LocalStorage as LocalStorage
 import MainFrame.Types (ChildSlots, _hasUnsavedChanges', _marloweEditorSlot)
 import Marlowe (SPParams_)
 import Marlowe as Server
 import Marlowe.Holes (fromTerm)
 import Marlowe.Linter as Linter
-import Marlowe.Monaco (updateAdditionalContext)
+import Marlowe.Monaco (daylightTheme, updateAdditionalContext)
 import Marlowe.Monaco as MM
 import Marlowe.Parser (parseContract)
 import Marlowe.Semantics (AccountId, Bound(..), ChoiceId(..), Input(..), Party(..), PubKey, Token, emptyState, inBounds, showPrettyToken)
 import Marlowe.Symbolic.Types.Request as MSReq
-import Monaco (IMarker, isError, isWarning)
+import Monaco (Editor, IMarker, isError, isWarning)
 import Monaco (getModel, getMonaco, setTheme, setValue) as Monaco
 import Network.RemoteData (RemoteData(..))
 import Network.RemoteData as RemoteData
@@ -552,7 +553,23 @@ marloweEditor state = slot _marloweEditorSlot unit component unit (Just <<< Hand
       monaco <- Monaco.getMonaco
       Monaco.setTheme monaco MM.daylightTheme.name
 
-  component = monacoComponent $ MM.settings setup
+  component = monacoComponent $ settings setup
+
+-- FIXME while doing the refactor this settigns were colliding with the marlowe. Delete
+settings :: forall m. (Editor -> m Unit) -> Settings m
+settings setup =
+  { languageExtensionPoint
+  , theme: Just daylightTheme
+  , monarchTokensProvider: Nothing
+  , tokensProvider: Nothing
+  , hoverProvider: Nothing
+  , completionItemProvider: Nothing
+  , codeActionProvider: Nothing
+  , documentFormattingEditProvider: Nothing
+  , refLabel
+  , owner: "marloweEditor"
+  , setup
+  }
 
 sidebar ::
   forall p.

diff --git a/marlowe-playground-client/src/Simulation/Types.purs b/marlowe-playground-client/src/Simulation/Types.purs
@@ -355,7 +355,7 @@ type State
     -- FIXME: Remove selectedHole
     , selectedHole :: Maybe String
     , oldContract :: Maybe String
-    , source :: Lang
+    , source :: Lang -- FIXME: change to Workflow (and probably in the MainFrame)
     , hasUnsavedChanges :: Boolean
     }
 
@@ -421,7 +421,7 @@ isContractValid state =
 
 data Action
   = Init
-  -- editor
+  -- editor (FIXME to MarloweEditor)
   | HandleEditorMessage Monaco.Message
   | HandleDragEvent DragEvent
   | HandleDropEvent DragEvent
@@ -431,7 +431,7 @@ data Action
   | SetEditorText String
   | InitMarloweProject String
   | MarkProjectAsSaved
-  -- marlowe actions
+  -- marlowe actions (FIXME to SimulationPage)
   | SetInitialSlot Slot
   | StartSimulation
   | MoveSlot Slot
@@ -442,19 +442,19 @@ data Action
   | ResetContract
   | ResetSimulator
   | Undo
-  | SelectHole (Maybe String)
+  | SelectHole (Maybe String) -- FIXME (check, but most likely MarloweEditor)
   -- simulation view
   | ChangeSimulationView BottomPanelView
   | ChangeHelpContext HelpContext
   | ShowRightPanel Boolean
   | ShowBottomPanel Boolean
   | ShowErrorDetail Boolean
-  -- Editors
+  -- Editors -- FIXME: split to both
   | SetBlocklyCode
-  | EditHaskell
+  | EditHaskell -- FIXME: change to EditSource (and use Workflow)
   | EditJavascript
   | EditActus
-  -- websocket
+  -- websocket -- FIXME to MarloweEditor
   | AnalyseContract
   | AnalyseReachabilityContract
   | Save