diff --git a/cabal.project b/cabal.project index 4f273244d5..b45509d0c4 100644 --- a/cabal.project +++ b/cabal.project @@ -4,7 +4,6 @@ packages: ./shake-bench ./ghcide ./hls-plugin-api - ./hls-exactprint-utils ./plugins/tactics ./plugins/hls-class-plugin ./plugins/hls-eval-plugin diff --git a/ghcide/.hlint.yaml b/ghcide/.hlint.yaml index a17e4e52cc..1a4a53be7b 100644 --- a/ghcide/.hlint.yaml +++ b/ghcide/.hlint.yaml @@ -79,6 +79,7 @@ - Development.IDE.Core.Compile - Development.IDE.Core.Rules - Development.IDE.GHC.Compat + - Development.IDE.GHC.ExactPrint - Development.IDE.GHC.Orphans - Development.IDE.GHC.Util - Development.IDE.Import.FindImports diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 5a52f83b8a..f52f922189 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -51,6 +51,7 @@ library fuzzy, filepath, fingertree, + ghc-exactprint, Glob, haddock-library >= 1.8, hashable, @@ -66,6 +67,7 @@ library prettyprinter-ansi-terminal, prettyprinter, regex-tdfa >= 1.3.1.0, + retrie, rope-utf16-splay, safe, safe-exceptions, @@ -144,6 +146,7 @@ library Development.IDE.Core.Tracing Development.IDE.GHC.Compat Development.IDE.GHC.Error + Development.IDE.GHC.ExactPrint Development.IDE.GHC.Orphans Development.IDE.GHC.Util Development.IDE.Import.DependencyInformation diff --git a/hls-exactprint-utils/src/Ide/TreeTransform.hs b/ghcide/src/Development/IDE/GHC/ExactPrint.hs similarity index 96% rename from hls-exactprint-utils/src/Ide/TreeTransform.hs rename to ghcide/src/Development/IDE/GHC/ExactPrint.hs index 9d442744bc..175481741e 100644 --- a/hls-exactprint-utils/src/Ide/TreeTransform.hs +++ b/ghcide/src/Development/IDE/GHC/ExactPrint.hs @@ -1,14 +1,10 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE GADTs #-} -{-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE ScopedTypeVariables #-} -module Ide.TreeTransform +module Development.IDE.GHC.ExactPrint ( Graft(..), graft, graftDecls, @@ -34,6 +30,7 @@ import Control.Monad.Trans.Class import Control.Monad.Trans.Except import Control.Monad.Zip import qualified Data.DList as DL +import Data.Either.Extra (mapLeft) import Data.Functor.Classes import Data.Functor.Contravariant import qualified Data.Text as T @@ -309,7 +306,7 @@ annotate :: ASTElement ast => DynFlags -> Located ast -> TransformT (Either Stri annotate dflags ast = do uniq <- show <$> uniqueSrcSpanT let rendered = render dflags ast - (anns, expr') <- lift $ either (Left . show) Right $ parseAST dflags uniq rendered + (anns, expr') <- lift $ mapLeft show $ parseAST dflags uniq rendered let anns' = setPrecedingLines expr' 0 1 anns pure (anns', expr') @@ -318,7 +315,7 @@ annotateDecl :: DynFlags -> LHsDecl GhcPs -> TransformT (Either String) (Anns, L annotateDecl dflags ast = do uniq <- show <$> uniqueSrcSpanT let rendered = render dflags ast - (anns, expr') <- lift $ either (Left . show) Right $ parseDecl dflags uniq rendered + (anns, expr') <- lift $ mapLeft show $ parseDecl dflags uniq rendered let anns' = setPrecedingLines expr' 1 0 anns pure (anns', expr') ------------------------------------------------------------------------------ diff --git a/hie-cabal.yaml b/hie-cabal.yaml index 596efef8ba..8df7c6b67d 100644 --- a/hie-cabal.yaml +++ b/hie-cabal.yaml @@ -106,9 +106,6 @@ cradle: - path: "./hls-plugin-api/src" component: "lib:hls-plugin-api" - - path: "./hls-exactprint-utils/src" - component: "lib:hls-exactprint-utils" - - path: "./plugins/hls-class-plugin/src" component: "lib:hls-class-plugin" diff --git a/hie-stack.yaml b/hie-stack.yaml index 393770bb99..1037edf4ad 100644 --- a/hie-stack.yaml +++ b/hie-stack.yaml @@ -43,9 +43,6 @@ cradle: - path: "./hls-plugin-api/src" component: "hls-plugin-api:lib" - - path: "./hls-exactprint-utils/src" - component: "hls-exactprint-utils:lib" - # Plugins: - path: "./plugins/hls-class-plugin/src" diff --git a/hls-exactprint-utils/LICENSE b/hls-exactprint-utils/LICENSE deleted file mode 100644 index 261eeb9e9f..0000000000 --- a/hls-exactprint-utils/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - 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 [yyyy] [name of copyright owner] - - 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/hls-exactprint-utils/hls-exactprint-utils.cabal b/hls-exactprint-utils/hls-exactprint-utils.cabal deleted file mode 100644 index 44178ffa71..0000000000 --- a/hls-exactprint-utils/hls-exactprint-utils.cabal +++ /dev/null @@ -1,50 +0,0 @@ -cabal-version: 2.2 -name: hls-exactprint-utils -version: 0.5.0.1 -synopsis: Common utilities to interaction between ghc-exactprint and HLS plugins. -description: - Please see the README on GitHub at -homepage: https://github.com/haskell/haskell-language-server/hls-exactprint-utils -bug-reports: https://github.com/haskell/haskell-language-server/issues -license: Apache-2.0 -license-file: LICENSE -author: Sandy Maguire, Hiromi ISHII -maintainer: Sandy Maguire , HiromiISHII -copyright: Sandy Maguire, Hiromi ISHII -category: Web -build-type: Simple - -flag pedantic - description: Enable -Werror - default: False - manual: True - -source-repository head - type: git - location: https://github.com/haskell/haskell-language-server - -library - exposed-modules: - Ide.TreeTransform - - hs-source-dirs: src - build-depends: - base >=4.12 && <5 - , dlist - , ghc - , ghc-exactprint - , ghcide - , haskell-lsp-types - , hls-plugin-api - , retrie - , syb - , text - , transformers - - - ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns - - if flag(pedantic) - ghc-options: -Werror - - default-language: Haskell2010 diff --git a/nix/default.nix b/nix/default.nix index ade9a44552..8ebbb50932 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -20,7 +20,6 @@ let shake-bench = gitignoreSource ../shake-bench; hie-compat = gitignoreSource ../hie-compat; hls-plugin-api = gitignoreSource ../hls-plugin-api; - hls-exactprint-utils = gitignoreSource ../hls-exactprint-utils; 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-splice-plugin/hls-splice-plugin.cabal b/plugins/hls-splice-plugin/hls-splice-plugin.cabal index 99ff6ad796..0a1e917141 100644 --- a/plugins/hls-splice-plugin/hls-splice-plugin.cabal +++ b/plugins/hls-splice-plugin/hls-splice-plugin.cabal @@ -23,7 +23,6 @@ library , hls-plugin-api , ghc , ghc-exactprint - , hls-exactprint-utils , ghcide , lens , dlist diff --git a/plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs b/plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs index c77ac1dc88..44e6d3d3bc 100644 --- a/plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs +++ b/plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs @@ -45,7 +45,7 @@ import GhcMonad import GhcPlugins hiding (Var, getLoc, (<>)) import Ide.Plugin.Splice.Types import Ide.PluginUtils (mkLspCommand, responseError) -import Ide.TreeTransform +import Development.IDE.GHC.ExactPrint import Ide.Types import Language.Haskell.GHC.ExactPrint (TransformT, setPrecedingLines, uniqueSrcSpanT) import Language.Haskell.LSP.Core diff --git a/plugins/tactics/hls-tactics-plugin.cabal b/plugins/tactics/hls-tactics-plugin.cabal index 40ca5fe36f..e86bab8557 100644 --- a/plugins/tactics/hls-tactics-plugin.cabal +++ b/plugins/tactics/hls-tactics-plugin.cabal @@ -59,7 +59,6 @@ library , ghcide >=0.1 , haskell-lsp ^>=0.23 , hls-plugin-api - , hls-exactprint-utils , lens , mtl , refinery ^>=0.3 diff --git a/plugins/tactics/src/Ide/Plugin/Tactic.hs b/plugins/tactics/src/Ide/Plugin/Tactic.hs index e250401b3e..56be9158ca 100644 --- a/plugins/tactics/src/Ide/Plugin/Tactic.hs +++ b/plugins/tactics/src/Ide/Plugin/Tactic.hs @@ -54,7 +54,7 @@ import Ide.Plugin.Tactic.Tactics import Ide.Plugin.Tactic.TestTypes import Ide.Plugin.Tactic.Types import Ide.PluginUtils -import Ide.TreeTransform (transform, graft, useAnnotatedSource) +import Development.IDE.GHC.ExactPrint (graft, transform, useAnnotatedSource) import Ide.Types import Language.Haskell.LSP.Core (clientCapabilities) import Language.Haskell.LSP.Types diff --git a/shell.nix b/shell.nix index 46b458cb2d..a851b48c49 100644 --- a/shell.nix +++ b/shell.nix @@ -29,7 +29,6 @@ let defaultCompiler = "ghc" + lib.replaceStrings ["."] [""] haskellPackages.ghc. p.shake-bench p.hie-compat p.hls-plugin-api - p.hls-exactprint-utils p.hls-class-plugin p.hls-haddock-comments-plugin p.hls-eval-plugin diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml index f4cb816898..2d41ee63a8 100644 --- a/stack-8.10.1.yaml +++ b/stack-8.10.1.yaml @@ -6,7 +6,6 @@ packages: - ./ghcide/ # - ./shake-bench - ./hls-plugin-api -- ./hls-exactprint-utils - ./plugins/hls-class-plugin - ./plugins/hls-haddock-comments-plugin - ./plugins/hls-eval-plugin diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml index 934ff35708..f01608a11c 100644 --- a/stack-8.10.2.yaml +++ b/stack-8.10.2.yaml @@ -5,7 +5,6 @@ packages: - ./hie-compat - ./ghcide/ - ./hls-plugin-api - - ./hls-exactprint-utils # - ./shake-bench - ./plugins/hls-class-plugin - ./plugins/hls-haddock-comments-plugin diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml index be40edcd2d..983045719a 100644 --- a/stack-8.10.3.yaml +++ b/stack-8.10.3.yaml @@ -5,7 +5,6 @@ packages: - ./hie-compat - ./ghcide/ - ./hls-plugin-api - - ./hls-exactprint-utils # - ./shake-bench - ./plugins/hls-class-plugin - ./plugins/hls-haddock-comments-plugin diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 1ff6aa4916..8f92359e70 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -7,7 +7,6 @@ packages: - ./ghcide/ # - ./shake-bench - ./hls-plugin-api - - ./hls-exactprint-utils - ./plugins/hls-class-plugin - ./plugins/hls-haddock-comments-plugin - ./plugins/hls-eval-plugin diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index a0b91a4c5e..2525754b84 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -5,7 +5,6 @@ packages: - ./hie-compat - ./ghcide/ - ./hls-plugin-api - - ./hls-exactprint-utils # - ./shake-bench - ./plugins/hls-class-plugin - ./plugins/hls-haddock-comments-plugin diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index 44378ed62f..1e204d479f 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -5,7 +5,6 @@ packages: - ./hie-compat - ./ghcide/ - ./hls-plugin-api - - ./hls-exactprint-utils - ./shake-bench - ./plugins/hls-class-plugin - ./plugins/hls-haddock-comments-plugin diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index baef50a947..4528212b9b 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -6,7 +6,6 @@ packages: - ./ghcide/ - ./shake-bench - ./hls-plugin-api - - ./hls-exactprint-utils - ./plugins/hls-class-plugin - ./plugins/hls-haddock-comments-plugin - ./plugins/hls-eval-plugin diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml index c47abc2640..88b9d6fc72 100644 --- a/stack-8.8.4.yaml +++ b/stack-8.8.4.yaml @@ -6,7 +6,6 @@ packages: - ./ghcide/ - ./shake-bench - ./hls-plugin-api - - ./hls-exactprint-utils - ./plugins/hls-class-plugin - ./plugins/hls-haddock-comments-plugin - ./plugins/hls-eval-plugin diff --git a/stack.yaml b/stack.yaml index a0b91a4c5e..2525754b84 100644 --- a/stack.yaml +++ b/stack.yaml @@ -5,7 +5,6 @@ packages: - ./hie-compat - ./ghcide/ - ./hls-plugin-api - - ./hls-exactprint-utils # - ./shake-bench - ./plugins/hls-class-plugin - ./plugins/hls-haddock-comments-plugin