Skip to content

Commit fb7cb40

Browse files
VenInfVenInf
committed
formatting and cleanup
1 parent 5942781 commit fb7cb40

File tree

3 files changed

+28
-42
lines changed

3 files changed

+28
-42
lines changed

‎plugins/hls-cabal-plugin/src/Ide/Plugin/Cabal/CabalAdd.hs

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
module Ide.Plugin.Cabal.CabalAdd
1111
( findResponsibleCabalFile
1212
, hiddenPackageAction
13-
, hiddenPackageSuggestion
1413
, cabalAddCommand
1514
, command
1615
, Log
@@ -19,34 +18,6 @@ where
1918

2019
import Control.Monad (filterM, void)
2120
import Control.Monad.IO.Class (MonadIO, liftIO)
22-
import Data.String (IsString)
23-
import qualified Data.Text as T
24-
import qualified Data.Text.Encoding as T
25-
import Development.IDE (IdeState,
26-
useWithStale)
27-
import Distribution.PackageDescription.Quirks (patchQuirks)
28-
import Ide.PluginUtils (WithDeletions (SkipDeletions),
29-
diffText,
30-
mkLspCommand)
31-
import Ide.Types (CommandFunction,
32-
CommandId (CommandId),
33-
HandlerM,
34-
PluginId,
35-
pluginGetClientCapabilities,
36-
pluginSendRequest)
37-
import Language.LSP.Protocol.Types (ApplyWorkspaceEditParams (ApplyWorkspaceEditParams),
38-
ClientCapabilities,
39-
CodeAction (CodeAction),
40-
CodeActionKind (CodeActionKind_QuickFix),
41-
Diagnostic (..),
42-
Null (Null),
43-
VersionedTextDocumentIdentifier,
44-
WorkspaceEdit,
45-
toNormalizedFilePath,
46-
type (|?) (InR))
47-
import System.Directory (doesFileExist,
48-
listDirectory)
49-
5021
import Control.Monad.Trans.Class (lift)
5122
import Control.Monad.Trans.Except
5223
import Data.Aeson.Types (FromJSON,
@@ -55,7 +26,12 @@ import Data.ByteString (ByteString)
5526
import qualified Data.ByteString.Char8 as B
5627
import Data.List.NonEmpty (NonEmpty (..),
5728
fromList)
29+
import Data.String (IsString)
30+
import qualified Data.Text as T
5831
import Data.Text.Encoding (encodeUtf8)
32+
import qualified Data.Text.Encoding as T
33+
import Development.IDE (IdeState,
34+
useWithStale)
5935
import Development.IDE.Core.Rules (runAction)
6036
import Development.IDE.Core.RuleTypes (GetFileContents (..))
6137
import Distribution.Client.Add as Add
@@ -64,6 +40,7 @@ import Distribution.PackageDescription (GenericPackageDe
6440
packageDescription,
6541
specVersion)
6642
import Distribution.PackageDescription.Configuration (flattenPackageDescription)
43+
import Distribution.PackageDescription.Quirks (patchQuirks)
6744
import Distribution.Pretty (pretty)
6845
import Distribution.Simple.BuildTarget (BuildTarget,
6946
buildTargetComponentName,
@@ -76,7 +53,27 @@ import Ide.Plugin.Cabal.Completion.Types (ParseCabalFields
7653
ParseCabalFile (..))
7754
import Ide.Plugin.Cabal.Orphans ()
7855
import Ide.Plugin.Error
56+
import Ide.PluginUtils (WithDeletions (SkipDeletions),
57+
diffText,
58+
mkLspCommand)
59+
import Ide.Types (CommandFunction,
60+
CommandId (CommandId),
61+
PluginId,
62+
pluginGetClientCapabilities,
63+
pluginSendRequest)
7964
import Language.LSP.Protocol.Message (SMethod (SMethod_WorkspaceApplyEdit))
65+
import Language.LSP.Protocol.Types (ApplyWorkspaceEditParams (ApplyWorkspaceEditParams),
66+
ClientCapabilities,
67+
CodeAction (CodeAction),
68+
CodeActionKind (CodeActionKind_QuickFix),
69+
Diagnostic (..),
70+
Null (Null),
71+
VersionedTextDocumentIdentifier,
72+
WorkspaceEdit,
73+
toNormalizedFilePath,
74+
type (|?) (InR))
75+
import System.Directory (doesFileExist,
76+
listDirectory)
8077
import System.FilePath (dropFileName,
8178
makeRelative,
8279
splitPath,

‎plugins/hls-cabal-plugin/test/Main.hs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -221,18 +221,6 @@ codeActionTests = testGroup "Code Actions"
221221
]) cas
222222
mapM_ executeCodeAction selectedCas
223223
pure ()
224-
-- , runHaskellTestCaseSession "Code Actions - Can add hidden package" ("cabal-add-testdata" </> "cabal-add-exe") $ do
225-
-- hsdoc <- openDoc ("src" </> "Main.hs") "haskell"
226-
-- cabDoc <- openDoc "cabal-add-exe.cabal" "cabal"
227-
-- _ <- waitForDiagnosticsFrom hsdoc
228-
-- cas <- Maybe.mapMaybe (^? _R) <$> getAllCodeActions hsdoc
229-
-- let selectedCas = filter (\ca -> "Add dependency" `T.isPrefixOf` (ca ^. L.title)) cas
230-
-- -- traceShowM("selectedCas", selectedCas)
231-
-- mapM_ executeCodeAction selectedCas
232-
-- _ <- skipManyTill anyMessage $ getDocumentEdit cabDoc
233-
-- contents <- documentContents cabDoc
234-
-- -- traceShowM("contents", contents)
235-
-- liftIO $ assertEqual "Split isn't found in the cabal file" (Text.indices "split" contents) [256]
236224
, runHaskellTestCaseSession "Code Actions - Can add hidden package" ("cabal-add-testdata" </> "cabal-add-exe")
237225
(generateHiddenPackageTestSession "cabal-add-exe.cabal" ("src" </> "Main.hs") "split" [253])
238226
, runHaskellTestCaseSession "Code Actions - Can add dashed hidden package" ("cabal-add-testdata" </> "cabal-add-dashed")

‎plugins/hls-cabal-plugin/test/Utils.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import Control.Monad (guard)
88
import Data.List (sort)
99
import Data.Proxy (Proxy (Proxy))
1010
import qualified Data.Text as T
11-
import Ide.Plugin.Cabal (descriptor, haskellFilesDescriptor)
11+
import Ide.Plugin.Cabal (descriptor,
12+
haskellFilesDescriptor)
1213
import qualified Ide.Plugin.Cabal
1314
import Ide.Plugin.Cabal.Completion.Types
1415
import System.FilePath

0 commit comments

Comments
 (0)