Merge branch 'main' into feature/preserve-comments

swarm-game · May 12, 2024 · 1e1219e · 1e1219e
2 parents c1b15bb + f9c5df9
commit 1e1219e
Show file tree

Hide file tree

Showing 36 changed files with 3 additions and 1 deletion.
diff --git a/src/Swarm/TUI/Border.hs → src/swarm-tui/Swarm/TUI/Border.hs b/src/Swarm/TUI/Border.hs → src/swarm-tui/Swarm/TUI/Border.hs
diff --git a/src/Swarm/TUI/Controller.hs → src/swarm-tui/Swarm/TUI/Controller.hs b/src/Swarm/TUI/Controller.hs → src/swarm-tui/Swarm/TUI/Controller.hs
diff --git a/src/Swarm/TUI/Controller/Util.hs → src/swarm-tui/Swarm/TUI/Controller/Util.hs b/src/Swarm/TUI/Controller/Util.hs → src/swarm-tui/Swarm/TUI/Controller/Util.hs
diff --git a/src/Swarm/TUI/Editor/Controller.hs → src/swarm-tui/Swarm/TUI/Editor/Controller.hs b/src/Swarm/TUI/Editor/Controller.hs → src/swarm-tui/Swarm/TUI/Editor/Controller.hs
diff --git a/src/Swarm/TUI/Editor/Json.hs → src/swarm-tui/Swarm/TUI/Editor/Json.hs b/src/Swarm/TUI/Editor/Json.hs → src/swarm-tui/Swarm/TUI/Editor/Json.hs
diff --git a/src/Swarm/TUI/Editor/Masking.hs → src/swarm-tui/Swarm/TUI/Editor/Masking.hs b/src/Swarm/TUI/Editor/Masking.hs → src/swarm-tui/Swarm/TUI/Editor/Masking.hs
diff --git a/src/Swarm/TUI/Editor/Model.hs → src/swarm-tui/Swarm/TUI/Editor/Model.hs b/src/Swarm/TUI/Editor/Model.hs → src/swarm-tui/Swarm/TUI/Editor/Model.hs
diff --git a/src/Swarm/TUI/Editor/Palette.hs → src/swarm-tui/Swarm/TUI/Editor/Palette.hs b/src/Swarm/TUI/Editor/Palette.hs → src/swarm-tui/Swarm/TUI/Editor/Palette.hs
diff --git a/src/Swarm/TUI/Editor/Util.hs → src/swarm-tui/Swarm/TUI/Editor/Util.hs b/src/Swarm/TUI/Editor/Util.hs → src/swarm-tui/Swarm/TUI/Editor/Util.hs
diff --git a/src/Swarm/TUI/Editor/View.hs → src/swarm-tui/Swarm/TUI/Editor/View.hs b/src/Swarm/TUI/Editor/View.hs → src/swarm-tui/Swarm/TUI/Editor/View.hs
diff --git a/src/Swarm/TUI/Inventory/Sorting.hs → src/swarm-tui/Swarm/TUI/Inventory/Sorting.hs b/src/Swarm/TUI/Inventory/Sorting.hs → src/swarm-tui/Swarm/TUI/Inventory/Sorting.hs
diff --git a/src/Swarm/TUI/Launch/Controller.hs → src/swarm-tui/Swarm/TUI/Launch/Controller.hs b/src/Swarm/TUI/Launch/Controller.hs → src/swarm-tui/Swarm/TUI/Launch/Controller.hs
diff --git a/src/Swarm/TUI/Launch/Model.hs → src/swarm-tui/Swarm/TUI/Launch/Model.hs b/src/Swarm/TUI/Launch/Model.hs → src/swarm-tui/Swarm/TUI/Launch/Model.hs
diff --git a/src/Swarm/TUI/Launch/Prep.hs → src/swarm-tui/Swarm/TUI/Launch/Prep.hs b/src/Swarm/TUI/Launch/Prep.hs → src/swarm-tui/Swarm/TUI/Launch/Prep.hs
diff --git a/src/Swarm/TUI/Launch/View.hs → src/swarm-tui/Swarm/TUI/Launch/View.hs b/src/Swarm/TUI/Launch/View.hs → src/swarm-tui/Swarm/TUI/Launch/View.hs
diff --git a/src/Swarm/TUI/List.hs → src/swarm-tui/Swarm/TUI/List.hs b/src/Swarm/TUI/List.hs → src/swarm-tui/Swarm/TUI/List.hs
diff --git a/src/Swarm/TUI/Model.hs → src/swarm-tui/Swarm/TUI/Model.hs b/src/Swarm/TUI/Model.hs → src/swarm-tui/Swarm/TUI/Model.hs
diff --git a/src/Swarm/TUI/Model/Goal.hs → src/swarm-tui/Swarm/TUI/Model/Goal.hs b/src/Swarm/TUI/Model/Goal.hs → src/swarm-tui/Swarm/TUI/Model/Goal.hs
diff --git a/src/Swarm/TUI/Model/Menu.hs → src/swarm-tui/Swarm/TUI/Model/Menu.hs b/src/Swarm/TUI/Model/Menu.hs → src/swarm-tui/Swarm/TUI/Model/Menu.hs
diff --git a/src/Swarm/TUI/Model/Name.hs → src/swarm-tui/Swarm/TUI/Model/Name.hs b/src/Swarm/TUI/Model/Name.hs → src/swarm-tui/Swarm/TUI/Model/Name.hs
diff --git a/src/Swarm/TUI/Model/Repl.hs → src/swarm-tui/Swarm/TUI/Model/Repl.hs b/src/Swarm/TUI/Model/Repl.hs → src/swarm-tui/Swarm/TUI/Model/Repl.hs
diff --git a/src/Swarm/TUI/Model/StateUpdate.hs → src/swarm-tui/Swarm/TUI/Model/StateUpdate.hs b/src/Swarm/TUI/Model/StateUpdate.hs → src/swarm-tui/Swarm/TUI/Model/StateUpdate.hs
diff --git a/src/Swarm/TUI/Model/Structure.hs → src/swarm-tui/Swarm/TUI/Model/Structure.hs b/src/Swarm/TUI/Model/Structure.hs → src/swarm-tui/Swarm/TUI/Model/Structure.hs
diff --git a/src/Swarm/TUI/Model/UI.hs → src/swarm-tui/Swarm/TUI/Model/UI.hs b/src/Swarm/TUI/Model/UI.hs → src/swarm-tui/Swarm/TUI/Model/UI.hs
diff --git a/src/Swarm/TUI/Panel.hs → src/swarm-tui/Swarm/TUI/Panel.hs b/src/Swarm/TUI/Panel.hs → src/swarm-tui/Swarm/TUI/Panel.hs
diff --git a/src/Swarm/TUI/View.hs → src/swarm-tui/Swarm/TUI/View.hs b/src/Swarm/TUI/View.hs → src/swarm-tui/Swarm/TUI/View.hs
diff --git a/src/Swarm/TUI/View/Achievement.hs → src/swarm-tui/Swarm/TUI/View/Achievement.hs b/src/Swarm/TUI/View/Achievement.hs → src/swarm-tui/Swarm/TUI/View/Achievement.hs
diff --git a/src/Swarm/TUI/View/Attribute/Attr.hs → ...warm-tui/Swarm/TUI/View/Attribute/Attr.hs b/src/Swarm/TUI/View/Attribute/Attr.hs → ...warm-tui/Swarm/TUI/View/Attribute/Attr.hs
diff --git a/...Swarm/TUI/View/Attribute/CustomStyling.hs → ...Swarm/TUI/View/Attribute/CustomStyling.hs b/...Swarm/TUI/View/Attribute/CustomStyling.hs → ...Swarm/TUI/View/Attribute/CustomStyling.hs
diff --git a/src/Swarm/TUI/View/Attribute/Util.hs → ...warm-tui/Swarm/TUI/View/Attribute/Util.hs b/src/Swarm/TUI/View/Attribute/Util.hs → ...warm-tui/Swarm/TUI/View/Attribute/Util.hs
diff --git a/src/Swarm/TUI/View/CellDisplay.hs → src/swarm-tui/Swarm/TUI/View/CellDisplay.hs b/src/Swarm/TUI/View/CellDisplay.hs → src/swarm-tui/Swarm/TUI/View/CellDisplay.hs
diff --git a/src/Swarm/TUI/View/Logo.hs → src/swarm-tui/Swarm/TUI/View/Logo.hs b/src/Swarm/TUI/View/Logo.hs → src/swarm-tui/Swarm/TUI/View/Logo.hs
diff --git a/src/Swarm/TUI/View/Objective.hs → src/swarm-tui/Swarm/TUI/View/Objective.hs b/src/Swarm/TUI/View/Objective.hs → src/swarm-tui/Swarm/TUI/View/Objective.hs
diff --git a/src/Swarm/TUI/View/Structure.hs → src/swarm-tui/Swarm/TUI/View/Structure.hs b/src/Swarm/TUI/View/Structure.hs → src/swarm-tui/Swarm/TUI/View/Structure.hs
diff --git a/src/Swarm/TUI/View/Util.hs → src/swarm-tui/Swarm/TUI/View/Util.hs b/src/Swarm/TUI/View/Util.hs → src/swarm-tui/Swarm/TUI/View/Util.hs
diff --git a/swarm.cabal b/swarm.cabal
@@ -593,6 +593,8 @@ library swarm-doc
 
 library swarm-tui
   import: stan-config, common, ghc2021-extensions
+  visibility: public
+  -- cabal-gild: discover src/swarm-tui
   exposed-modules:
     Swarm.TUI.Border
     Swarm.TUI.Controller
@@ -675,7 +677,7 @@ library swarm-tui
     swarm:swarm-scenario,
     swarm:swarm-util,
 
-  hs-source-dirs: src
+  hs-source-dirs: src/swarm-tui
   default-language: Haskell2010
   default-extensions:
     -- Avoid unexpected unevaluated thunk buildup