[ fix ] Send HighlightingInfos to the frontend instead of holding it back

Author: banacorn

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.1.4 - 2021-10-04
+
+### Fixed 
+- Resume sending HighlightingInfos to agda-mode
+
 ## v0.1.3 - 2021-10-04
 
 ### Fixed 

agda-language-server.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           agda-language-server
-version:        0.1.1
+version:        0.1.4
 synopsis:       An implementation of language server protocal (LSP) for Agda 2.
 description:    Please see the README on GitHub at <https://github.com/banacorn/agda-language-server#readme>
 category:       Development

package.yaml

@@ -1,5 +1,5 @@
 name:                agda-language-server
-version:             0.1.3
+version:             0.1.4
 github:              "banacorn/agda-language-server"
 license:             MIT
 author:              "Ting-Gian LUA"

src/Monad.hs

@@ -28,7 +28,6 @@ data Env = Env
   , envResponseChan       :: Chan Response
   , envResponseController :: ResponseController
   , envDevMode            :: Bool
-  , envHighlightingInfos   :: IORef [HighlightingInfo]
   }
 
 createInitEnv :: Bool -> IO Env
@@ -39,7 +38,6 @@ createInitEnv devMode =
     <*> newChan
     <*> ResponseController.new
     <*> pure devMode
-    <*> newIORef []
 
 --------------------------------------------------------------------------------
 
@@ -87,27 +85,4 @@ signalCommandFinish = do
 
 -- | Sends a Response to the client via "envResponseChan"
 sendResponse :: (Monad m, MonadIO m) => Env -> Response -> TCMT m ()
-sendResponse env response = do
-  case response of
-    -- NOTE: highlighting-releated reponses are intercepted for later use of semantic highlighting
-    ResponseHighlightingInfoDirect (HighlightingInfos _ highlightingInfos) -> do
-      appendHighlightingInfos env highlightingInfos
-    ResponseHighlightingInfoIndirect{} -> return ()
-    ResponseClearHighlightingTokenBased{} -> removeHighlightingInfos env 
-    ResponseClearHighlightingNotOnlyTokenBased{} -> removeHighlightingInfos env 
-    -- other kinds of responses
-    _ -> liftIO $ writeChan (envResponseChan env) response
-
--- | Get highlighting informations 
-getHighlightingInfos :: (Monad m, MonadIO m) => ServerM m [HighlightingInfo]
-getHighlightingInfos = do
-  ref <- asks envHighlightingInfos
-  liftIO (readIORef ref)
-
-appendHighlightingInfos :: (Monad m, MonadIO m) => Env -> [HighlightingInfo] -> TCMT m ()
-appendHighlightingInfos env highlightingInfos = 
-  liftIO (modifyIORef' (envHighlightingInfos env) (<> highlightingInfos))
-
-removeHighlightingInfos :: (Monad m, MonadIO m) => Env -> TCMT m ()
-removeHighlightingInfos env =
-  liftIO (writeIORef (envHighlightingInfos env) [])
+sendResponse env response = liftIO $ writeChan (envResponseChan env) response

src/Server/Handler.hs

@@ -113,31 +113,6 @@ onHover uri pos = do
                         (pack typeString)
                   return $ Just $ LSP.Hover content (Just range)
 
-onHighlight
-  :: LSP.Uri
-  -> ServerM (LspM ()) (Either LSP.ResponseError (Maybe LSP.SemanticTokens))
-onHighlight uri = do
-  result <- LSP.getVirtualFile (LSP.toNormalizedUri uri)
-  case result of
-    Nothing   -> return $ Right Nothing
-    Just file -> do
-      let source = VFS.virtualFileText file
-      let legend = LSP.SemanticTokensLegend
-            (LSP.List LSP.knownSemanticTokenTypes)
-            (LSP.List LSP.knownSemanticTokenModifiers)
-
-      highlightingInfos <- getHighlightingInfos
-      -- writeLog $ "[Handler] Semantic Highlighting " <> Text.pack (show highlightingInfos)
-      let tokens = LSP.makeSemanticTokens
-            legend
-            (map fromHighlightingInfo highlightingInfos)
-      -- writeLog $ "[Handler] Semantic Highlighting " <> Text.pack (show highlightingInfos)
-      writeLog $ "[Handler][Highlighting] length " <> Text.pack
-        (show (length $ map fromHighlightingInfo highlightingInfos))
-      case tokens of
-        Left t -> return $ Left $ LSP.ResponseError LSP.InternalError t Nothing
-        Right tokens' -> return $ Right $ Just tokens'
-
 --------------------------------------------------------------------------------
 -- Helper functions for converting stuff to SemanticTokenAbsolute