hls-retrie-plugin 0.1.1.1 → 1.0.0.0

raw patch · 2 files changed

+15/−17 lines, 2 filesdep ~ghcidedep ~hls-plugin-apiPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: ghcide, hls-plugin-api

API changes (from Hackage documentation)

Files

• hls-retrie-plugin.cabal +5/−5
• src/Ide/Plugin/Retrie.hs +10/−12

@@ -1,6 +1,6 @@ cabal-version: 2.2 name:          hls-retrie-plugin-version:       0.1.1.1+version:       1.0.0.0 synopsis:      Retrie integration plugin for Haskell Language Server license:       Apache-2.0 license-file:  LICENSE@@ -16,18 +16,18 @@   exposed-modules:  Ide.Plugin.Retrie   hs-source-dirs:   src   build-depends:    aeson-               ,    base       >=4.12 && <5+               ,    base                 >=4.12 && <5                ,    containers                ,    deepseq                ,    directory                ,    extra                ,    lsp                ,    lsp-types-               ,    hls-plugin-api+               ,    hls-plugin-api       ^>= 1.0.0.0                ,    ghc-               ,    ghcide+               ,    ghcide               ^>= 1.0.0.0                ,    hashable-               ,    retrie >=0.1.1.0+               ,    retrie               >=0.1.1.0                ,    safe-exceptions                ,    shake                ,    text

@@ -20,6 +20,7 @@ import           Control.Exception.Safe         (Exception (..), SomeException,                                                  catch, throwIO, try) import           Control.Monad                  (forM, unless)+import           Control.Monad.Extra            (maybeM) import           Control.Monad.IO.Class         (MonadIO (liftIO)) import           Control.Monad.Trans.Class      (MonadTrans (lift)) import           Control.Monad.Trans.Except     (ExceptT (..), runExceptT,@@ -146,14 +147,14 @@   , names <- listify p fun_matches   =     [ AddImport {..}-    | name <- names,-        Just ideclNameString <--        [moduleNameString . GHC.moduleName <$> nameModule_maybe name],-        let ideclSource = False,+    | let ideclSource = False,+        name <- names,         let r = nameRdrName name,         let ideclQualifiedBool = isQual r,         let ideclAsString = moduleNameString . fst <$> isQual_maybe r,-        let ideclThing = Just (IEVar $ occNameString $ rdrNameOcc r)+        let ideclThing = Just (IEVar $ occNameString $ rdrNameOcc r),+        Just ideclNameString <-+        [moduleNameString . GHC.moduleName <$> nameModule_maybe name]     ]     where         p name = nameModule_maybe name /= Just ms_mod@@ -178,8 +179,8 @@           ++ [ r                | TyClGroup {group_tyclds} <- hs_tyclds,                  L l g <- group_tyclds,-                 r <- suggestTypeRewrites uri ms_mod g,-                 pos `isInsideSrcSpan` l+                 pos `isInsideSrcSpan` l,+                 r <- suggestTypeRewrites uri ms_mod g               ] @@ -235,7 +236,6 @@               description = "Fold " <> pprNameText <> describeRestriction restrictToOriginatingFile            in (description, CodeActionRefactorExtract, RunRetrieParams {..})      in [unfoldRewrite False, unfoldRewrite True, foldRewrite False, foldRewrite True]-  where suggestBindRewrites _ _ _ _ = []  describeRestriction :: IsString p => Bool -> p@@ -409,9 +409,7 @@     -- TODO add the imports to the resulting edits     (_user, ast, change@(Change _replacements _imports)) <-       lift $ runRetrie fixityEnv retrie cpp-    case ast of-      _ ->-        return $ asTextEdits change+    return $ asTextEdits change    let (errors :: [CallRetrieError], replacements) = partitionEithers results       editParams :: WorkspaceEdit@@ -485,7 +483,7 @@ handleMaybe msg = maybe (throwE msg) return  handleMaybeM :: Monad m => e -> m (Maybe b) -> ExceptT e m b-handleMaybeM msg act = maybe (throwE msg) return =<< lift act+handleMaybeM msg act = maybeM (throwE msg) return $ lift act  response :: Monad m => ExceptT String m a -> m (Either ResponseError a) response =