Really actually use new lib resolution

Author: nvarner

src/Server/Model.hs

@@ -2,7 +2,6 @@ module Server.Model
   ( Model (Model),
     empty,
     getKnownAgdaLib,
-    getAgdaLib,
     withAgdaLib,
     getAgdaFile,
     setAgdaFile,
@@ -37,11 +36,6 @@ agdaFiles f a = f (_modelAgdaFiles a) <&> \x -> a {_modelAgdaFiles = x}
 getKnownAgdaLib :: LSP.NormalizedUri -> Model -> Maybe AgdaLib
 getKnownAgdaLib uri = find (`isAgdaLibForUri` uri) . _modelAgdaLibs
 
--- | Get the Agda library for the given URI if known. Otherwise, get a generic
--- default Agda library.
-getAgdaLib :: (MonadIO m) => LSP.NormalizedUri -> Model -> m AgdaLib
-getAgdaLib uri = maybe initAgdaLib return . getKnownAgdaLib uri
-
 -- | Add an 'AgdaLib' to the model
 withAgdaLib :: AgdaLib -> Model -> Model
 withAgdaLib lib model = model {_modelAgdaLibs = lib : _modelAgdaLibs model}

src/Server/Model/Handler.hs

@@ -100,7 +100,7 @@ requestHandlerWithAgdaFile m handlerWithAgdaFile = LSP.requestHandler m $ \req r
       let message = "Request for unknown Agda file at URI: " <> LSP.getUri uri
       responder $ Left $ LSP.TResponseError (LSP.InR LSP.ErrorCodes_InvalidParams) message Nothing
     Just agdaFile -> do
-      agdaLib <- Model.getAgdaLib normUri model
+      agdaLib <- findAgdaLib normUri
       let responderWithAgdaFile = lift . responder
       let handler = tryTC $ runWithAgdaFileT agdaLib agdaFile $ handlerWithAgdaFile req responderWithAgdaFile