diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 55a40406b5..7de52ea385 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -135,3 +135,9 @@ jobs: if: ${{ matrix.test }} run: LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-tactics-plugin --test-options="-j1" + - name: Test brittany plugin + if: ${{ matrix.test }} + env: + HLS_TEST_EXE: hls + HLS_WRAPPER_TEST_EXE: hls-wrapper + run: cabal test hls-brittany-plugin || cabal test hls-brittany-plugin --test-options="-j1" diff --git a/README.md b/README.md index 91fc32bb51..f289ed24fa 100644 --- a/README.md +++ b/README.md @@ -301,7 +301,7 @@ For example, `haskell-language-server` allows you to choose the formatting provi This option obviously would not make sense for language servers for other languages, or even for other Haskell language servers (which need not even support formatting). Here is a list of the additional settings currently supported by `haskell-language-server`, along with their setting key (you may not need to know this) and default: -- Formatting provider (`haskell.formattingProvider`, default `ormolu`): what formatter to use; one of `floskell`, `ormolu`, `fourmolu`, `stylish-haskell`, or `brittany` (if compiled with AGPL) +- Formatting provider (`haskell.formattingProvider`, default `ormolu`): what formatter to use; one of `floskell`, `ormolu`, `fourmolu`, `stylish-haskell`, or `brittany` (if compiled with the brittany plugin) - Format on imports (`haskell.formatOnImportOn`, default true): whether to format after adding an import - Maximum number of problems to report (`haskell.maxNumberOfProblems`, default 100): the maximum number of problems the server will send to the client - Diagnostics on change (`haskell.diagnosticsOnChange`, default true): (currently unused) @@ -648,7 +648,7 @@ This issue should be fixed in Stack versions >= 2.5. #### Problems with dynamic linking As haskell-language-server prebuilt binaries are statically linked, they don't play well with projects using dynamic linking. -An usual symptom is the presence of errors containing `unknown symbol` and it is typical in arch linux, where a dynamically linked version of ghc is used. +An usual symptom is the presence of errors containing `unknown symbol` and it is typical in arch linux, where a dynamically linked version of ghc is used. The workaround is to use a version of haskell-language-server compiled from source with `-dynamic` enabled`. See more details [here](https://github.com/haskell/haskell-language-server/issues/1160#issuecomment-756566273). diff --git a/cabal.project b/cabal.project index 41e26c6050..1bee6a77f5 100644 --- a/cabal.project +++ b/cabal.project @@ -5,6 +5,7 @@ packages: ./ghcide ./hls-plugin-api ./plugins/hls-tactics-plugin + ./plugins/hls-brittany-plugin ./plugins/hls-class-plugin ./plugins/hls-eval-plugin ./plugins/hls-explicit-imports-plugin diff --git a/docs/plugin-tutorial.md b/docs/plugin-tutorial.md index 21766253e5..e6210ebd3a 100644 --- a/docs/plugin-tutorial.md +++ b/docs/plugin-tutorial.md @@ -96,9 +96,7 @@ idePlugins = pluginDescToIdePlugins allPlugins , Ormolu.descriptor "ormolu" , StylishHaskell.descriptor "stylish-haskell" , Retrie.descriptor "retrie" -#if AGPL , Brittany.descriptor "brittany" -#endif , Eval.descriptor "eval" ] ``` diff --git a/exe/Plugins.hs b/exe/Plugins.hs index 1cbb78d65c..9fe8a1583a 100644 --- a/exe/Plugins.hs +++ b/exe/Plugins.hs @@ -71,7 +71,7 @@ import Ide.Plugin.Ormolu as Ormolu import Ide.Plugin.StylishHaskell as StylishHaskell #endif -#if AGPL && brittany +#if brittany import Ide.Plugin.Brittany as Brittany #endif diff --git a/ghcide/exe/Main.hs b/ghcide/exe/Main.hs index 1286d05a5a..e2b3b51512 100644 --- a/ghcide/exe/Main.hs +++ b/ghcide/exe/Main.hs @@ -88,7 +88,7 @@ main = do Typecheck x | not argLSP -> Just x _ -> Nothing - ,Main.argsLogger = logger + ,Main.argsLogger = pure logger ,Main.argsRules = do -- install the main and ghcide-plugin rules diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 137271bad5..d84a0c2781 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -2,7 +2,7 @@ cabal-version: 2.2 build-type: Simple category: Development name: ghcide -version: 1.0.0.0 +version: 1.1.0.0 license: Apache-2.0 license-file: LICENSE author: Digital Asset and Ghcide contributors diff --git a/ghcide/src/Development/IDE/Main.hs b/ghcide/src/Development/IDE/Main.hs index 6327829a5a..14f58a0a83 100644 --- a/ghcide/src/Development/IDE/Main.hs +++ b/ghcide/src/Development/IDE/Main.hs @@ -1,73 +1,83 @@ module Development.IDE.Main (Arguments(..), defaultMain) where -import Control.Concurrent.Extra (readVar) -import Control.Exception.Safe (Exception (displayException), - catchAny) -import Control.Monad.Extra (concatMapM, unless, when) -import Data.Default (Default (def)) -import qualified Data.HashMap.Strict as HashMap -import Data.List.Extra (intercalate, isPrefixOf, - nub, nubOrd, partition) -import Data.Maybe (catMaybes, fromMaybe, - isJust) -import qualified Data.Text as T -import Development.IDE (Action, Rules, noLogging) -import Development.IDE.Core.Debouncer (newAsyncDebouncer) -import Development.IDE.Core.FileStore (makeVFSHandle) -import Development.IDE.Core.OfInterest (FileOfInterestStatus (OnDisk), - kick, setFilesOfInterest) -import Development.IDE.Core.RuleTypes (GenerateCore (GenerateCore), - GetHieAst (GetHieAst), - GhcSession (GhcSession), - GhcSessionDeps (GhcSessionDeps), - TypeCheck (TypeCheck)) -import Development.IDE.Core.Rules (GhcSessionIO (GhcSessionIO), - mainRule) -import Development.IDE.Core.Service (initialise, runAction) -import Development.IDE.Core.Shake (IdeState (shakeExtras), - ShakeExtras (state), uses) -import Development.IDE.Core.Tracing (measureMemory) -import Development.IDE.Core.IdeConfiguration (registerIdeConfiguration, IdeConfiguration(..)) -import Development.IDE.LSP.LanguageServer (runLanguageServer) -import Development.IDE.Plugin (Plugin (pluginHandlers, pluginRules)) -import Development.IDE.Plugin.HLS (asGhcIdePlugin) -import qualified Development.IDE.Plugin.HLS.GhcIde as Ghcide -import Development.IDE.Session (SessionLoadingOptions, - getHieDbLoc, - loadSessionWithOptions, - runWithDb, - setInitialDynFlags) -import Development.IDE.Types.Location (toNormalizedFilePath') -import Development.IDE.Types.Logger (Logger) -import Development.IDE.Types.Options (IdeGhcSession, - IdeOptions (optCheckParents, optCheckProject, optReportProgress), - clientSupportsProgress, - defaultIdeOptions) -import Development.IDE.Types.Shake (Key (Key)) -import Development.Shake (action) -import HIE.Bios.Cradle (findCradle) -import Ide.Plugin.Config (CheckParents (NeverCheck), - Config, - getConfigFromNotification) -import Ide.PluginUtils (allLspCmdIds', - getProcessID, - pluginDescToIdePlugins) -import Ide.Types (IdePlugins) -import qualified Language.LSP.Server as LSP -import qualified System.Directory.Extra as IO -import System.Exit (ExitCode (ExitFailure), - exitWith) -import System.FilePath (takeExtension, - takeFileName) -import System.IO (hPutStrLn, hSetEncoding, - stderr, stdout, utf8) -import System.Time.Extra (offsetTime, showDuration) -import Text.Printf (printf) -import Data.Hashable (hashed) +import Control.Concurrent.Extra (newLock, readVar, + withLock) +import Control.Exception.Safe (Exception (displayException), + catchAny) +import Control.Monad.Extra (concatMapM, unless, + when) +import Data.Default (Default (def)) +import qualified Data.HashMap.Strict as HashMap +import Data.Hashable (hashed) +import Data.List.Extra (intercalate, isPrefixOf, + nub, nubOrd, partition) +import Data.Maybe (catMaybes, fromMaybe, + isJust) +import qualified Data.Text as T +import qualified Data.Text.IO as T +import Development.IDE (Action, Rules) +import Development.IDE.Core.Debouncer (newAsyncDebouncer) +import Development.IDE.Core.FileStore (makeVFSHandle) +import Development.IDE.Core.IdeConfiguration (IdeConfiguration (..), + registerIdeConfiguration) +import Development.IDE.Core.OfInterest (FileOfInterestStatus (OnDisk), + kick, + setFilesOfInterest) +import Development.IDE.Core.RuleTypes (GenerateCore (GenerateCore), + GetHieAst (GetHieAst), + GhcSession (GhcSession), + GhcSessionDeps (GhcSessionDeps), + TypeCheck (TypeCheck)) +import Development.IDE.Core.Rules (GhcSessionIO (GhcSessionIO), + mainRule) +import Development.IDE.Core.Service (initialise, runAction) +import Development.IDE.Core.Shake (IdeState (shakeExtras), + ShakeExtras (state), + uses) +import Development.IDE.Core.Tracing (measureMemory) +import Development.IDE.LSP.LanguageServer (runLanguageServer) +import Development.IDE.Plugin (Plugin (pluginHandlers, pluginRules)) +import Development.IDE.Plugin.HLS (asGhcIdePlugin) +import qualified Development.IDE.Plugin.HLS.GhcIde as Ghcide +import Development.IDE.Session (SessionLoadingOptions, + getHieDbLoc, + loadSessionWithOptions, + runWithDb, + setInitialDynFlags) +import Development.IDE.Types.Location (toNormalizedFilePath') +import Development.IDE.Types.Logger (Logger (Logger)) +import Development.IDE.Types.Options (IdeGhcSession, + IdeOptions (optCheckParents, optCheckProject, optReportProgress), + clientSupportsProgress, + defaultIdeOptions) +import Development.IDE.Types.Shake (Key (Key)) +import Development.Shake (action) +import HIE.Bios.Cradle (findCradle) +import Ide.Plugin.Config (CheckParents (NeverCheck), + Config, + getConfigFromNotification) +import Ide.PluginUtils (allLspCmdIds', + getProcessID, + pluginDescToIdePlugins) +import Ide.Types (IdePlugins) +import qualified Language.LSP.Server as LSP +import qualified System.Directory.Extra as IO +import System.Exit (ExitCode (ExitFailure), + exitWith) +import System.FilePath (takeExtension, + takeFileName) +import System.IO (BufferMode (LineBuffering), + hPutStrLn, + hSetBuffering, + hSetEncoding, stderr, + stdout, utf8) +import System.Time.Extra (offsetTime, + showDuration) +import Text.Printf (printf) data Arguments = Arguments { argsOTMemoryProfiling :: Bool , argFiles :: Maybe [FilePath] -- ^ Nothing: lsp server ; Just: typecheck and exit - , argsLogger :: Logger + , argsLogger :: IO Logger , argsRules :: Rules () , argsHlsPlugins :: IdePlugins IdeState , argsGhcidePlugin :: Plugin Config -- ^ Deprecated @@ -82,7 +92,7 @@ instance Default Arguments where def = Arguments { argsOTMemoryProfiling = False , argFiles = Nothing - , argsLogger = noLogging + , argsLogger = stderrLogger , argsRules = mainRule >> action kick , argsGhcidePlugin = mempty , argsHlsPlugins = pluginDescToIdePlugins Ghcide.descriptors @@ -93,9 +103,18 @@ instance Default Arguments where , argsGetHieDbLoc = getHieDbLoc } +-- | Cheap stderr logger that relies on LineBuffering +stderrLogger :: IO Logger +stderrLogger = do + lock <- newLock + return $ Logger $ \p m -> withLock lock $ + T.hPutStrLn stderr $ "[" <> T.pack (show p) <> "] " <> m + defaultMain :: Arguments -> IO () defaultMain Arguments{..} = do pid <- T.pack . show <$> getProcessID + logger <- argsLogger + hSetBuffering stderr LineBuffering let hlsPlugin = asGhcIdePlugin argsDefaultHlsConfig argsHlsPlugins hlsCommands = allLspCmdIds' pid argsHlsPlugins @@ -134,7 +153,7 @@ defaultMain Arguments{..} = do argsDefaultHlsConfig rules (Just env) - argsLogger + logger debouncer options vfs @@ -171,7 +190,7 @@ defaultMain Arguments{..} = do { optCheckParents = pure NeverCheck , optCheckProject = pure False } - ide <- initialise argsDefaultHlsConfig rules Nothing argsLogger debouncer options vfs hiedb hieChan + ide <- initialise argsDefaultHlsConfig rules Nothing logger debouncer options vfs hiedb hieChan registerIdeConfiguration (shakeExtras ide) $ IdeConfiguration mempty (hashed Nothing) putStrLn "\nStep 4/4: Type checking the files" @@ -199,7 +218,7 @@ defaultMain Arguments{..} = do Key GhcSessionDeps : [k | (_, k) <- HashMap.keys values, k /= Key GhcSessionIO] ++ [Key GhcSessionIO] - measureMemory argsLogger [keys] consoleObserver valuesRef + measureMemory logger [keys] consoleObserver valuesRef unless (null failed) (exitWith $ ExitFailure (length failed)) {-# ANN defaultMain ("HLint: ignore Use nubOrd" :: String) #-} diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 677942c898..9ffd20f0e4 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -20,11 +20,6 @@ extra-source-files: ChangeLog.md include/ghc-api-version.h -flag agpl - description: Enable AGPL dependencies - default: True - manual: True - flag pedantic description: Enable -Werror default: False @@ -34,10 +29,6 @@ source-repository head type: git location: https://github.com/haskell/haskell-language-server -common agpl - if flag(agpl) - cpp-options: -DAGPL - common common-deps build-depends: , base >=4.12 && <5 @@ -47,7 +38,7 @@ common common-deps , text library - import: agpl, common-deps + import: common-deps exposed-modules: Ide.Arguments Ide.Main @@ -64,7 +55,7 @@ library , cryptohash-sha1 , data-default , ghc - , ghcide ^>= 1.0.0.0 + , ghcide ^>= 1.1.0.0 , gitrev , lsp , hie-bios @@ -269,15 +260,11 @@ common stylishHaskell cpp-options: -DstylishHaskell common brittany - if (flag(brittany) || flag(all-formatters)) && flag(agpl) - hs-source-dirs: plugins/default/src - other-modules: Ide.Plugin.Brittany - build-depends: brittany >= 0.13.1.0 - cpp-options: -Dbrittany + if (flag(brittany) || flag(all-formatters)) + build-depends: hls-brittany-plugin ^>= 1.0.0.0 executable haskell-language-server - import: agpl - , common-deps + import: common-deps -- plugins , example-plugins , class @@ -349,7 +336,7 @@ executable haskell-language-server default-extensions: DataKinds, TypeOperators executable haskell-language-server-wrapper - import: agpl, common-deps + import: common-deps main-is: Wrapper.hs hs-source-dirs: exe other-modules: Paths_haskell_language_server @@ -382,7 +369,7 @@ executable haskell-language-server-wrapper -- We removed it due to issues with stack when loading the project using a stack based hie.yaml -- See https://github.com/haskell/haskell-language-server/issues/114 common hls-test-utils - import: agpl, common-deps + import: common-deps hs-source-dirs: test/utils other-modules: Test.Hls.Util build-depends: @@ -414,7 +401,7 @@ common hls-test-utils default-language: Haskell2010 test-suite func-test - import: agpl, common-deps, hls-test-utils + import: common-deps, hls-test-utils type: exitcode-stdio-1.0 default-language: Haskell2010 build-tool-depends: @@ -471,7 +458,7 @@ test-suite func-test ghc-options: -Werror -Wredundant-constraints test-suite wrapper-test - import: agpl, hls-test-utils + import: hls-test-utils type: exitcode-stdio-1.0 build-tool-depends: haskell-language-server:haskell-language-server-wrapper -any diff --git a/nix/default.nix b/nix/default.nix index 804b5a7203..480c81ff0f 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -21,6 +21,7 @@ let shake-bench = gitignoreSource ../shake-bench; hie-compat = gitignoreSource ../hie-compat; hls-plugin-api = gitignoreSource ../hls-plugin-api; + hls-brittany-plugin = gitignoreSource ../plugins/hls-brittany-plugin; hls-class-plugin = gitignoreSource ../plugins/hls-class-plugin; hls-haddock-comments-plugin = gitignoreSource ../plugins/hls-haddock-comments-plugin; hls-eval-plugin = gitignoreSource ../plugins/hls-eval-plugin; diff --git a/plugins/hls-brittany-plugin/LICENSE b/plugins/hls-brittany-plugin/LICENSE new file mode 100644 index 0000000000..16502c47e2 --- /dev/null +++ b/plugins/hls-brittany-plugin/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2021 The Haskell IDE team + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal b/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal new file mode 100644 index 0000000000..f2b6ce840f --- /dev/null +++ b/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal @@ -0,0 +1,69 @@ +cabal-version: 2.2 +name: hls-brittany-plugin +version: 1.0.0.0 +synopsis: Integration with the Brittany code formatter +license: Apache-2.0 +license-file: LICENSE +author: The Haskell IDE Team +copyright: The Haskell IDE Team +maintainer: alan.zimm@gmail.com +category: Development +build-type: Simple +extra-source-files: + LICENSE + +library + exposed-modules: Ide.Plugin.Brittany + hs-source-dirs: src + build-depends: base + , brittany >= 0.13.1.0 + , filepath + , ghc + , ghc-boot-th + , ghcide ^>= 1.1.0.0 + , lsp-types + , hls-plugin-api ^>= 1.0.0.0 + , lens + , text + , transformers + + default-language: Haskell2010 + +executable test-server + default-language: Haskell2010 + build-depends: + , base + , data-default + , ghcide + , hls-brittany-plugin + , hls-plugin-api + , shake + main-is: Server.hs + hs-source-dirs: test + ghc-options: -threaded + +test-suite tests + type: exitcode-stdio-1.0 + default-language: Haskell2010 + build-tool-depends: + hls-brittany-plugin:test-server -any, + hs-source-dirs: test + main-is: Main.hs + build-depends: + , aeson + , base + , bytestring + , data-default + , deepseq + , ghcide ^>= 1.1.0.0 + , hls-brittany-plugin + , hspec-expectations + , megaparsec + , lens + , lsp-test + , tasty + , tasty-ant-xml >=1.1.6 + , tasty-hunit + , tasty-golden + , tasty-rerun + , text diff --git a/plugins/default/src/Ide/Plugin/Brittany.hs b/plugins/hls-brittany-plugin/src/Ide/Plugin/Brittany.hs similarity index 100% rename from plugins/default/src/Ide/Plugin/Brittany.hs rename to plugins/hls-brittany-plugin/src/Ide/Plugin/Brittany.hs diff --git a/plugins/hls-brittany-plugin/test/Main.hs b/plugins/hls-brittany-plugin/test/Main.hs new file mode 100644 index 0000000000..1065db972d --- /dev/null +++ b/plugins/hls-brittany-plugin/test/Main.hs @@ -0,0 +1,54 @@ +{-# LANGUAGE OverloadedStrings #-} +module Main(main) where + +import Control.Monad.IO.Class +import Data.Aeson +import qualified Data.ByteString.Lazy as BS +import qualified Data.Text.Encoding as T +import qualified Data.Text.IO as T +import Language.LSP.Test +import Language.LSP.Types +import Test.Tasty +import Test.Tasty.Golden +import Test.Tasty.HUnit +import Test.Tasty.Runners ( + consoleTestReporter, + listingTests, + ) +import Test.Tasty.Ingredients.Rerun +import Test.Tasty.Runners.AntXML + +main :: IO () +main = defaultMainWithIngredients + [antXMLRunner, rerunningTests [listingTests, consoleTestReporter]] + tests + +testCommand = "test-server" + +tests :: TestTree +tests = testGroup "brittany" [ + goldenVsStringDiff "formats a document with LF endings" goldenGitDiff "test/testdata/BrittanyLF.formatted_document.hs" $ runSession testCommand fullCaps "test/testdata" $ do + doc <- openDoc "BrittanyLF.hs" "haskell" + formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing) + BS.fromStrict . T.encodeUtf8 <$> documentContents doc + + , goldenVsStringDiff "formats a document with CRLF endings" goldenGitDiff "test/testdata/BrittanyCRLF.formatted_document.hs" $ runSession testCommand fullCaps "test/testdata" $ do + doc <- openDoc "BrittanyCRLF.hs" "haskell" + formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing) + BS.fromStrict . T.encodeUtf8 <$> documentContents doc + + , goldenVsStringDiff "formats a range with LF endings" goldenGitDiff "test/testdata/BrittanyLF.formatted_range.hs" $ runSession testCommand fullCaps "test/testdata" $ do + doc <- openDoc "BrittanyLF.hs" "haskell" + let range = Range (Position 1 0) (Position 2 22) + formatRange doc (FormattingOptions 4 True Nothing Nothing Nothing) range + BS.fromStrict . T.encodeUtf8 <$> documentContents doc + + , goldenVsStringDiff "formats a range with CRLF endings" goldenGitDiff "test/testdata/BrittanyCRLF.formatted_range.hs" $ runSession testCommand fullCaps "test/testdata" $ do + doc <- openDoc "BrittanyCRLF.hs" "haskell" + let range = Range (Position 1 0) (Position 2 22) + formatRange doc (FormattingOptions 4 True Nothing Nothing Nothing) range + BS.fromStrict . T.encodeUtf8 <$> documentContents doc + ] + +goldenGitDiff :: FilePath -> FilePath -> [String] +goldenGitDiff fRef fNew = ["git", "diff", "--no-index", "--text", "--exit-code", fRef, fNew] diff --git a/plugins/hls-brittany-plugin/test/Server.hs b/plugins/hls-brittany-plugin/test/Server.hs new file mode 100644 index 0000000000..192103ec9c --- /dev/null +++ b/plugins/hls-brittany-plugin/test/Server.hs @@ -0,0 +1,19 @@ +{-# LANGUAGE ViewPatterns #-} +{-# LANGUAGE OverloadedStrings #-} +module Main(main) where + +import Data.Default +import Development.IDE.Main +import qualified Development.IDE.Plugin.HLS.GhcIde as Ghcide +import Ide.Plugin.Config +import Ide.Plugin.Brittany as B +import Ide.PluginUtils + +main :: IO () +main = defaultMain def + { argsHlsPlugins = pluginDescToIdePlugins $ + [ B.descriptor "brittany" + ] <> + Ghcide.descriptors + , argsDefaultHlsConfig = def { formattingProvider = "brittany" } + } diff --git a/test/testdata/format/BrittanyCRLF.formatted_document.hs b/plugins/hls-brittany-plugin/test/testdata/BrittanyCRLF.formatted_document.hs similarity index 100% rename from test/testdata/format/BrittanyCRLF.formatted_document.hs rename to plugins/hls-brittany-plugin/test/testdata/BrittanyCRLF.formatted_document.hs diff --git a/test/testdata/format/BrittanyCRLF.formatted_range.hs b/plugins/hls-brittany-plugin/test/testdata/BrittanyCRLF.formatted_range.hs similarity index 100% rename from test/testdata/format/BrittanyCRLF.formatted_range.hs rename to plugins/hls-brittany-plugin/test/testdata/BrittanyCRLF.formatted_range.hs diff --git a/test/testdata/format/BrittanyCRLF.hs b/plugins/hls-brittany-plugin/test/testdata/BrittanyCRLF.hs similarity index 100% rename from test/testdata/format/BrittanyCRLF.hs rename to plugins/hls-brittany-plugin/test/testdata/BrittanyCRLF.hs diff --git a/test/testdata/format/BrittanyLF.formatted_document.hs b/plugins/hls-brittany-plugin/test/testdata/BrittanyLF.formatted_document.hs similarity index 100% rename from test/testdata/format/BrittanyLF.formatted_document.hs rename to plugins/hls-brittany-plugin/test/testdata/BrittanyLF.formatted_document.hs diff --git a/test/testdata/format/BrittanyLF.formatted_range.hs b/plugins/hls-brittany-plugin/test/testdata/BrittanyLF.formatted_range.hs similarity index 100% rename from test/testdata/format/BrittanyLF.formatted_range.hs rename to plugins/hls-brittany-plugin/test/testdata/BrittanyLF.formatted_range.hs diff --git a/test/testdata/format/BrittanyLF.hs b/plugins/hls-brittany-plugin/test/testdata/BrittanyLF.hs similarity index 100% rename from test/testdata/format/BrittanyLF.hs rename to plugins/hls-brittany-plugin/test/testdata/BrittanyLF.hs diff --git a/plugins/hls-class-plugin/hls-class-plugin.cabal b/plugins/hls-class-plugin/hls-class-plugin.cabal index 4e118f1720..f210186435 100644 --- a/plugins/hls-class-plugin/hls-class-plugin.cabal +++ b/plugins/hls-class-plugin/hls-class-plugin.cabal @@ -24,7 +24,7 @@ library , hls-plugin-api ^>= 1.0.0.0 , ghc , ghc-exactprint - , ghcide ^>= 1.0.0.0 + , ghcide ^>= 1.1.0.0 , lens , shake , text diff --git a/plugins/hls-eval-plugin/hls-eval-plugin.cabal b/plugins/hls-eval-plugin/hls-eval-plugin.cabal index f4bbff3642..404b0303ee 100644 --- a/plugins/hls-eval-plugin/hls-eval-plugin.cabal +++ b/plugins/hls-eval-plugin/hls-eval-plugin.cabal @@ -49,7 +49,7 @@ library , ghc , ghc-boot-th , ghc-paths - , ghcide ^>= 1.0.0.0 + , ghcide ^>= 1.1.0.0 , hashable , lsp , lsp-types diff --git a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal index 51a30993cf..cb1ad143cf 100644 --- a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal +++ b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal @@ -23,7 +23,7 @@ library , lsp , hls-plugin-api ^>= 1.0.0.0 , ghc - , ghcide ^>= 1.0.0.0 + , ghcide ^>= 1.1.0.0 , shake , text , unordered-containers diff --git a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal index a95d90100e..7d91a6535c 100644 --- a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal +++ b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal @@ -23,7 +23,7 @@ library , containers , ghc , ghc-exactprint - , ghcide ^>= 1.0.0.0 + , ghcide ^>= 1.1.0.0 , lsp-types , hls-plugin-api ^>= 1.0.0.0 , text diff --git a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal index 6b2346eff9..927f3687ed 100644 --- a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal +++ b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal @@ -39,7 +39,7 @@ library , extra , filepath , ghc-exactprint >=0.6.3.4 - , ghcide ^>= 1.0.0.0 + , ghcide ^>= 1.1.0.0 , hashable , lsp , hlint >=3.2 diff --git a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal index 444c2e325f..5f401eff90 100644 --- a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal +++ b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal @@ -25,7 +25,7 @@ library , lsp-types , hls-plugin-api ^>= 1.0.0.0 , ghc - , ghcide ^>= 1.0.0.0 + , ghcide ^>= 1.1.0.0 , hashable , retrie >=0.1.1.0 , safe-exceptions diff --git a/plugins/hls-splice-plugin/hls-splice-plugin.cabal b/plugins/hls-splice-plugin/hls-splice-plugin.cabal index 7966fc8f2d..f0ed041828 100644 --- a/plugins/hls-splice-plugin/hls-splice-plugin.cabal +++ b/plugins/hls-splice-plugin/hls-splice-plugin.cabal @@ -24,7 +24,7 @@ library , hls-plugin-api ^>= 1.0.0.0 , ghc , ghc-exactprint - , ghcide ^>= 1.0.0.0 + , ghcide ^>= 1.1.0.0 , lens , dlist , retrie diff --git a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal index a507a5e657..a96106fb45 100644 --- a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal +++ b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal @@ -63,7 +63,7 @@ library , ghc-boot-th , ghc-exactprint , ghc-source-gen - , ghcide ^>= 1.0.0.0 + , ghcide ^>= 1.1.0.0 , lsp , hls-plugin-api ^>= 1.0.0.0 , lens diff --git a/shell.nix b/shell.nix index d3ac9b4967..74fc01ba22 100644 --- a/shell.nix +++ b/shell.nix @@ -29,6 +29,7 @@ let defaultCompiler = "ghc" + lib.replaceStrings ["."] [""] haskellPackages.ghc. p.shake-bench p.hie-compat p.hls-plugin-api + p.hls-brittany-plugin p.hls-class-plugin p.hls-haddock-comments-plugin p.hls-eval-plugin diff --git a/src/Ide/Main.hs b/src/Ide/Main.hs index 8005a90f5d..0f443fbfb8 100644 --- a/src/Ide/Main.hs +++ b/src/Ide/Main.hs @@ -94,7 +94,7 @@ runLspMode lspArgs@LspArguments{..} idePlugins = do Main.defaultMain def { Main.argFiles = if argLSP then Nothing else Just [] , Main.argsHlsPlugins = idePlugins - , Main.argsLogger = hlsLogger + , Main.argsLogger = pure hlsLogger , Main.argsIdeOptions = \_config sessionLoader -> let defOptions = Ghcide.defaultIdeOptions sessionLoader in defOptions diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml index da17e3636d..83db7ffdd5 100644 --- a/stack-8.10.2.yaml +++ b/stack-8.10.2.yaml @@ -14,6 +14,7 @@ packages: - ./plugins/hls-retrie-plugin - ./plugins/hls-splice-plugin - ./plugins/hls-tactics-plugin + - ./plugins/hls-brittany-plugin ghc-options: "$everything": -haddock diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml index bc2c9bf1a4..d835a7c732 100644 --- a/stack-8.10.3.yaml +++ b/stack-8.10.3.yaml @@ -14,6 +14,7 @@ packages: - ./plugins/hls-retrie-plugin - ./plugins/hls-splice-plugin - ./plugins/hls-tactics-plugin + - ./plugins/hls-brittany-plugin ghc-options: "$everything": -haddock diff --git a/stack-8.10.4.yaml b/stack-8.10.4.yaml index d1ecfa5a7f..0eef66637b 100644 --- a/stack-8.10.4.yaml +++ b/stack-8.10.4.yaml @@ -14,6 +14,7 @@ packages: - ./plugins/hls-retrie-plugin - ./plugins/hls-splice-plugin - ./plugins/hls-tactics-plugin + - ./plugins/hls-brittany-plugin ghc-options: "$everything": -haddock diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 9b932bd668..ef603eec52 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -15,6 +15,7 @@ packages: - ./plugins/hls-retrie-plugin - ./plugins/hls-splice-plugin - ./plugins/hls-tactics-plugin + - ./plugins/hls-brittany-plugin ghc-options: "$everything": -haddock diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index a96689d6fa..7f92e42109 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -14,6 +14,7 @@ packages: - ./plugins/hls-retrie-plugin - ./plugins/hls-splice-plugin - ./plugins/hls-tactics-plugin + - ./plugins/hls-brittany-plugin ghc-options: "$everything": -haddock diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index 7a74861048..decbb7bdd0 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -14,6 +14,7 @@ packages: - ./plugins/hls-retrie-plugin - ./plugins/hls-splice-plugin - ./plugins/hls-tactics-plugin + - ./plugins/hls-brittany-plugin ghc-options: "$everything": -haddock diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index 0934e0241f..a54820e57a 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -14,6 +14,7 @@ packages: - ./plugins/hls-retrie-plugin - ./plugins/hls-splice-plugin - ./plugins/hls-tactics-plugin + - ./plugins/hls-brittany-plugin ghc-options: "$everything": -haddock diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml index 4f69a8c7c3..9e782875b9 100644 --- a/stack-8.8.4.yaml +++ b/stack-8.8.4.yaml @@ -14,6 +14,7 @@ packages: - ./plugins/hls-retrie-plugin - ./plugins/hls-splice-plugin - ./plugins/hls-tactics-plugin + - ./plugins/hls-brittany-plugin ghc-options: "$everything": -haddock diff --git a/stack.yaml b/stack.yaml index 5c212f13a1..16e5bb20b3 100644 --- a/stack.yaml +++ b/stack.yaml @@ -14,6 +14,7 @@ packages: - ./plugins/hls-retrie-plugin - ./plugins/hls-splice-plugin - ./plugins/hls-tactics-plugin + - ./plugins/hls-brittany-plugin ghc-options: "$everything": -haddock diff --git a/test/functional/Format.hs b/test/functional/Format.hs index 006e1cbdb5..e11ef631e5 100644 --- a/test/functional/Format.hs +++ b/test/functional/Format.hs @@ -7,6 +7,7 @@ import Control.Monad.IO.Class import Data.Aeson import qualified Data.ByteString.Lazy as BS import qualified Data.Text.Encoding as T +import qualified Data.Text.IO as T import Language.LSP.Test import Language.LSP.Types import qualified Language.LSP.Types.Lens as LSP @@ -15,10 +16,6 @@ import Test.Tasty import Test.Tasty.Golden import Test.Tasty.HUnit -#if AGPL -import qualified Data.Text.IO as T -#endif - tests :: TestTree tests = testGroup "format document" [ goldenVsStringDiff "works" goldenGitDiff "test/testdata/format/Format.formatted_document.hs" $ runSession hlsCommand fullCaps "test/testdata/format" $ do @@ -32,9 +29,6 @@ tests = testGroup "format document" [ , rangeTests , providerTests , stylishHaskellTests -#if AGPL - , brittanyTests -#endif , ormoluTests , fourmoluTests ] @@ -111,37 +105,6 @@ stylishHaskellTests = testGroup "stylish-haskell" [ BS.fromStrict . T.encodeUtf8 <$> documentContents doc ] -#if AGPL -brittanyTests :: TestTree -brittanyTests = testGroup "brittany" [ - goldenVsStringDiff "formats a document with LF endings" goldenGitDiff "test/testdata/format/BrittanyLF.formatted_document.hs" $ runSession hlsCommand fullCaps "test/testdata/format" $ do - sendNotification SWorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "brittany")) - doc <- openDoc "BrittanyLF.hs" "haskell" - formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing) - BS.fromStrict . T.encodeUtf8 <$> documentContents doc - - , goldenVsStringDiff "formats a document with CRLF endings" goldenGitDiff "test/testdata/format/BrittanyCRLF.formatted_document.hs" $ runSession hlsCommand fullCaps "test/testdata/format" $ do - sendNotification SWorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "brittany")) - doc <- openDoc "BrittanyCRLF.hs" "haskell" - formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing) - BS.fromStrict . T.encodeUtf8 <$> documentContents doc - - , goldenVsStringDiff "formats a range with LF endings" goldenGitDiff "test/testdata/format/BrittanyLF.formatted_range.hs" $ runSession hlsCommand fullCaps "test/testdata/format" $ do - sendNotification SWorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "brittany")) - doc <- openDoc "BrittanyLF.hs" "haskell" - let range = Range (Position 1 0) (Position 2 22) - formatRange doc (FormattingOptions 4 True Nothing Nothing Nothing) range - BS.fromStrict . T.encodeUtf8 <$> documentContents doc - - , goldenVsStringDiff "formats a range with CRLF endings" goldenGitDiff "test/testdata/format/BrittanyCRLF.formatted_range.hs" $ runSession hlsCommand fullCaps "test/testdata/format" $ do - sendNotification SWorkspaceDidChangeConfiguration (DidChangeConfigurationParams (formatLspConfig "brittany")) - doc <- openDoc "BrittanyCRLF.hs" "haskell" - let range = Range (Position 1 0) (Position 2 22) - formatRange doc (FormattingOptions 4 True Nothing Nothing Nothing) range - BS.fromStrict . T.encodeUtf8 <$> documentContents doc - ] -#endif - ormoluTests :: TestTree ormoluTests = testGroup "ormolu" [ goldenVsStringDiff "formats correctly" goldenGitDiff "test/testdata/format/Format.ormolu.formatted.hs" $ runSession hlsCommand fullCaps "test/testdata/format" $ do @@ -173,11 +136,9 @@ fourmoluTests = testGroup "fourmolu" formatLspConfig :: Value -> Value formatLspConfig provider = object [ "haskell" .= object ["formattingProvider" .= (provider :: Value)] ] -#if AGPL -- | The same as 'formatLspConfig' but using the legacy section name formatLspConfigOld :: Value -> Value formatLspConfigOld provider = object [ "languageServerHaskell" .= object ["formattingProvider" .= (provider :: Value)] ] -#endif formatConfig :: Value -> SessionConfig formatConfig provider = defaultConfig { lspConfig = Just (formatLspConfig provider) } diff --git a/test/testdata/format/Format.brittany.formatted.hs b/test/testdata/format/Format.brittany.formatted.hs deleted file mode 100644 index 03aef77efa..0000000000 --- a/test/testdata/format/Format.brittany.formatted.hs +++ /dev/null @@ -1,18 +0,0 @@ -module Format where -import Data.List - -import Data.Int -import Prelude -foo :: Int -> Int -foo 3 = 2 -foo x = x -bar :: String -> IO String -bar s = do - x <- return "hello" - return "asdf" - -data Baz = Baz - { a :: Int - , b :: String - } - diff --git a/test/testdata/format/Format.brittany_post_floskell.formatted.hs b/test/testdata/format/Format.brittany_post_floskell.formatted.hs deleted file mode 100644 index 6ea6a00b8d..0000000000 --- a/test/testdata/format/Format.brittany_post_floskell.formatted.hs +++ /dev/null @@ -1,20 +0,0 @@ -module Format where - -import Data.Int -import Data.List -import Prelude - -foo :: Int -> Int -foo 3 = 2 -foo x = x - -bar :: String -> IO String -bar s = do - x <- return "hello" - return "asdf" - -data Baz = Baz - { a :: Int - , b :: String - } -