switch back to text

Author: wz1000

ghcide/src/Development/IDE/LSP/HoverDefinition.hs

@@ -48,7 +48,7 @@ references ide (ReferenceParams (TextDocumentIdentifier uri) pos _ _ _) = liftIO
     Nothing -> pure $ Left $ ResponseError InvalidParams ("Invalid URI " <> T.pack (show uri)) Nothing
 
 wsSymbols :: IdeState -> WorkspaceSymbolParams -> LSP.LspM c (Either ResponseError (List SymbolInformation))
-wsSymbols ide (WorkspaceSymbolParams _ _ (T.pack -> query)) = liftIO $ do
+wsSymbols ide (WorkspaceSymbolParams _ _ query) = liftIO $ do
   logDebug (ideLogger ide) $ "Workspace symbols request: " <> query
   runIdeAction "WorkspaceSymbols" (shakeExtras ide) $ Right . maybe (List []) List <$> workspaceSymbols query
 

ghcide/src/Development/IDE/LSP/Notifications.hs

@@ -137,7 +137,7 @@ setHandlersNotifications = mconcat
           watcher glob = FileSystemWatcher { _globPattern = glob, _kind = Just watchKind }
           -- We use multiple watchers instead of one using '{}' because lsp-test doesn't
           -- support that: https://github.com/bubba/lsp-test/issues/77
-          watchers = [ watcher glob | glob <- watchedGlobs opts ]
+          watchers = [ watcher (Text.pack glob) | glob <- watchedGlobs opts ]
 
         void $ LSP.sendRequest SClientRegisterCapability regParams (const $ pure ()) -- TODO handle response
       else liftIO $ logDebug (ideLogger ide) "Warning: Client does not support watched files. Falling back to OS polling"

ghcide/src/Development/IDE/LSP/Server.hs

@@ -23,7 +23,6 @@ import Data.Aeson (Value)
 import Development.IDE.Core.Tracing (otSetUri)
 import OpenTelemetry.Eventlog (SpanInFlight, setTag)
 import Data.Text.Encoding (encodeUtf8)
-import qualified Data.Text as T
 
 data ReactorMessage
   = ReactorNotification (IO ())
@@ -68,7 +67,7 @@ instance HasTracing DidChangeConfigurationParams
 instance HasTracing InitializeParams
 instance HasTracing (Maybe InitializedParams)
 instance HasTracing WorkspaceSymbolParams where
-  traceWithSpan sp (WorkspaceSymbolParams _ _ query) = setTag sp "query" (encodeUtf8 $ T.pack query)
+  traceWithSpan sp (WorkspaceSymbolParams _ _ query) = setTag sp "query" (encodeUtf8 query)
 
 setUriAnd ::
   (HasTextDocument params a, HasUri a Uri) =>

ghcide/src/Development/IDE/Plugin/HLS.hs

@@ -140,7 +140,7 @@ extensiblePlugins :: [(PluginId, PluginHandlers IdeState)] -> Plugin Config
 extensiblePlugins xs = Plugin mempty handlers
   where
     IdeHandlers handlers' = foldMap bakePluginId xs
-    bakePluginId :: (PluginId, PluginHandlers IdeState) -> IdeHandlers IdeState
+    bakePluginId :: (PluginId, PluginHandlers IdeState) -> IdeHandlers
     bakePluginId (pid,PluginHandlers hs) = IdeHandlers $ DMap.map
       (\(PluginHandler f) -> IdeHandler [(pid,f pid)])
       hs
@@ -185,15 +185,15 @@ combineErrors [x] = x
 combineErrors xs = ResponseError InternalError (T.pack (show xs)) Nothing
 
 -- | Combine the 'PluginHandler' for all plugins
-newtype IdeHandler a (m :: J.Method FromClient Request)
-  = IdeHandler [(PluginId,(a -> ExtraParams m -> MessageParams m -> LSP.LspM Config (NonEmpty (Either ResponseError (ResponseResult m)))))]
+newtype IdeHandler (m :: J.Method FromClient Request)
+  = IdeHandler [(PluginId,(IdeState -> ExtraParams m -> MessageParams m -> LSP.LspM Config (NonEmpty (Either ResponseError (ResponseResult m)))))]
 
 -- | Combine the 'PluginHandlers' for all plugins
-newtype IdeHandlers a = IdeHandlers (DMap IdeMethod (IdeHandler a))
+newtype IdeHandlers = IdeHandlers (DMap IdeMethod IdeHandler)
 
-instance Semigroup (IdeHandlers a) where
+instance Semigroup IdeHandlers where
   (IdeHandlers a) <> (IdeHandlers b) = IdeHandlers $ DMap.unionWithKey go a b
     where
       go _ (IdeHandler a) (IdeHandler b) = IdeHandler (a ++ b)
-instance Monoid (IdeHandlers a) where
+instance Monoid IdeHandlers where
   mempty = IdeHandlers mempty