[fix] apply mappings per set of syntactic vs semantic tokens

Author: MangoIV

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

@@ -14,7 +14,6 @@
 {-# LANGUAGE TemplateHaskell       #-}
 {-# LANGUAGE TypeFamilies          #-}
 {-# LANGUAGE UnicodeSyntax         #-}
-{-# LANGUAGE ViewPatterns          #-}
 
 -- |
 -- This module provides the core functionality of the plugin.
@@ -33,7 +32,6 @@ import           Data.Data                                (Data (..))
 import           Data.List
 import qualified Data.Map.Strict                          as M
 import           Data.Maybe
-import           Data.Semigroup                           (First (..))
 import           Data.Text                                (Text)
 import qualified Data.Text                                as T
 import           Development.IDE                          (Action,
@@ -51,6 +49,7 @@ import           Development.IDE                          (Action,
                                                            useWithStale)
 import           Development.IDE.Core.PluginUtils         (runActionE, useE,
                                                            useWithStaleE)
+import           Development.IDE.Core.PositionMapping
 import           Development.IDE.Core.Rules               (toIdeResult)
 import           Development.IDE.Core.RuleTypes           (DocAndTyThingMap (..))
 import           Development.IDE.Core.Shake               (ShakeExtras (..),
@@ -101,16 +100,16 @@ computeSemanticTokens recorder pid _ nfp = do
   logWith recorder Debug (LogConfig config)
   semanticId <- lift getAndIncreaseSemanticTokensId
 
-  (sortOn fst -> tokenList, First mapping) <- do
+  tokenList <- sortOn fst <$> do
     rangesyntacticTypes <- lift $ useWithStale GetSyntacticTokens nfp
     rangesemanticTypes <- lift $ useWithStale GetSemanticTokens nfp
-    let mk w u (toks, mapping) = (map (fmap w) $ u toks, First mapping)
+    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)
       <>  (mk HsSemanticTokenType rangeSemanticList <$> rangesemanticTypes)
 
   -- NOTE: rangeSemanticsSemanticTokens actually assumes that the tokesn are in order. that means they have to be sorted by position
-  withExceptT PluginInternalError $ liftEither $ rangeSemanticsSemanticTokens semanticId config mapping tokenList
+  withExceptT PluginInternalError $ liftEither $ rangeSemanticsSemanticTokens semanticId config tokenList
 
 semanticTokensFull :: Recorder (WithPriority SemanticLog) -> PluginMethodHandler IdeState 'Method_TextDocumentSemanticTokensFull
 semanticTokensFull recorder state pid param = runActionE "SemanticTokens.semanticTokensFull" state computeSemanticTokensFull
@@ -168,9 +167,7 @@ getSyntacticTokensRule :: Recorder (WithPriority SemanticLog) -> Rules ()
 getSyntacticTokensRule recorder =
   define (cmapWithPrio LogShake recorder) $ \GetSyntacticTokens nfp -> handleError recorder $ do
     (parsedModule, _) <- withExceptT LogDependencyError $ useWithStaleE GetParsedModuleWithComments nfp
-    let tokList = computeRangeHsSyntacticTokenTypeList parsedModule
-    logWith recorder Debug $ LogSyntacticTokens tokList
-    pure tokList
+    pure $ computeRangeHsSyntacticTokenTypeList parsedModule
 
 astTraversalWith :: forall b r. Data b => b -> (forall a. Data a => a -> [r]) -> [r]
 astTraversalWith ast f = mconcat $ flip gmapQ ast \y -> f y <> astTraversalWith y f

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

@@ -70,9 +70,9 @@ nameSemanticFromHie hieKind rm n = idSemanticFromRefMap rm (Right n)
 
 -------------------------------------------------
 
-rangeSemanticsSemanticTokens :: SemanticTokenId -> SemanticTokensConfig -> PositionMapping -> [(Range, HsTokenType)] -> Either Text SemanticTokens
-rangeSemanticsSemanticTokens sid stc mapping =
-  makeSemanticTokensWithId (Just sid) . mapMaybe (\(ran, tk) -> toAbsSemanticToken <$> toCurrentRange mapping ran <*> return tk)
+rangeSemanticsSemanticTokens :: SemanticTokenId -> SemanticTokensConfig -> [(Maybe Range, HsTokenType)] -> Either Text SemanticTokens
+rangeSemanticsSemanticTokens sid stc =
+  makeSemanticTokensWithId (Just sid) . mapMaybe (\(ran, tk) -> toAbsSemanticToken <$> ran <*> return tk)
   where
     toAbsSemanticToken :: Range -> HsTokenType -> SemanticTokenAbsolute
     toAbsSemanticToken (Range (Position startLine startColumn) (Position _endLine endColumn)) tokenType =

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

@@ -44,6 +44,9 @@ docName tt = case tt of
   HsSyntacticTokenType TKeyword        -> "keyword"
   HsSyntacticTokenType TStringLit      -> "string literal"
   HsSyntacticTokenType TComment        -> "comment"
+  HsSyntacticTokenType TCharLit        -> "char literal"
+  HsSyntacticTokenType TNumberLit      -> "number literal"
+  HsSyntacticTokenType TRecordSelector -> "record selector"
 
 toConfigName :: String -> String
 toConfigName = ("st" <>)

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

@@ -181,7 +181,6 @@ data SemanticLog
   | LogConfig SemanticTokensConfig
   | LogMsg String
   | LogNoVF
-  | LogSyntacticTokens RangeHsSyntacticTokenTypes
   | LogSemanticTokensDeltaMisMatch Text (Maybe Text)
 
 instance Pretty SemanticLog where
@@ -195,6 +194,5 @@ instance Pretty SemanticLog where
                       -> "SemanticTokensDeltaMisMatch: previousIdFromRequest: " <> pretty previousIdFromRequest
                       <> " previousIdFromCache: " <> pretty previousIdFromCache
     LogDependencyError err -> "SemanticTokens' dependency error: " <> pretty err
-    LogSyntacticTokens (RangeHsSyntacticTokenTypes synList) -> "Syntactic tokens: " <> pretty (show synList)
 
 type SemanticTokenId = Text