[fix] use normalized file path in applyHint

Author: MangoIV

plugins/hls-hlint-plugin/src/Ide/Plugin/Hlint.hs

@@ -520,8 +520,9 @@ applyHint recorder ide nuri mhint verTxtDocId =
     ideas <- bimapExceptT (PluginInternalError . T.pack . showParseError) id $ ExceptT $ runAction' $ getIdeas recorder nuri
     let ideas' = maybe ideas (`filterIdeas` ideas) mhint
     let commands = map ideaRefactoring ideas'
-    logWith recorder Debug $ LogGeneratedIdeas nuri commands
-    let fp = fromNormalizedFilePath nuri
+    nfp <- getNormalizedFilePathE $ fromNormalizedUri nuri
+    logWith recorder Debug $ LogGeneratedIdeas nfp commands
+    let fp = fromNormalizedFilePath nfp
     mbOldContent <- fmap (fmap Rope.toText) $ liftIO $ runAction' $ getFileContents nuri
     oldContent <- maybe (liftIO $ fmap T.decodeUtf8 (BS.readFile fp)) return mbOldContent
     modsum <- liftIO $ runAction' $ use_ GetModSummary nuri

plugins/hls-semantic-tokens-plugin/src/Ide/Plugin/SemanticTokens/Internal.hs

@@ -34,7 +34,6 @@ import qualified Data.Map.Strict                          as M
 import           Data.Maybe
 import           Data.Text                                (Text)
 import qualified Data.Text                                as T
-import           Debug.Trace
 import           Development.IDE                          (Action,
                                                            GetDocMap (GetDocMap),
                                                            GetHieAst (GetHieAst),
@@ -61,7 +60,6 @@ import           Development.IDE.GHC.Compat.Util          (mkFastString)
 import           GHC.Parser.Annotation
 import           Ide.Logger                               (logWith)
 import           Ide.Plugin.Error                         (PluginError (PluginInternalError, PluginRuleFailed),
-                                                           getNormalizedFilePathE,
                                                            handleMaybe,
                                                            handleMaybeM)
 import           Ide.Plugin.SemanticTokens.Mappings
@@ -73,10 +71,9 @@ import           Ide.Types
 import qualified Language.LSP.Protocol.Lens               as L
 import           Language.LSP.Protocol.Message            (MessageResult,
                                                            Method (Method_TextDocumentSemanticTokensFull, Method_TextDocumentSemanticTokensFullDelta))
-import           Language.LSP.Protocol.Types              (NormalizedFilePath,
+import           Language.LSP.Protocol.Types              (NormalizedUri, toNormalizedUri, fromNormalizedUri, getUri,
                                                            Range,
                                                            SemanticTokens,
-                                                           fromNormalizedFilePath,
                                                            type (|?) (InL, InR))
 import           Prelude                                  hiding (span)
 import qualified StmContainers.Map                        as STM
@@ -100,8 +97,8 @@ computeSemanticTokens recorder pid _ nuri = do
   semanticId <- lift getAndIncreaseSemanticTokensId
 
   tokenList <- sortOn fst <$> do
-    rangesyntacticTypes <- lift $ useWithStale GetSyntacticTokens nfp
-    rangesemanticTypes <- lift $ useWithStale GetSemanticTokens nfp
+    rangesyntacticTypes <- lift $ useWithStale GetSyntacticTokens nuri
+    rangesemanticTypes <- lift $ useWithStale GetSemanticTokens nuri
     let mk w u (toks, mapping) = map (\(ran, tok) -> (toCurrentRange mapping ran, w tok)) $ u toks
     maybeToExceptT (PluginRuleFailed "no syntactic nor semantic tokens") $ hoistMaybe $
       (mk HsSyntacticTokenType rangeSyntacticList <$> rangesyntacticTypes)