enable semanticTokens and notes

Author: soulomoon

.github/workflows/test.yml

@@ -248,11 +248,11 @@ jobs:
         name: Test hls-overloaded-record-dot-plugin test suite
         run: cabal test hls-overloaded-record-dot-plugin-tests || cabal test hls-overloaded-record-dot-plugin-tests
 
-      - if: matrix.test && matrix.ghc != '9.12'
+      - if: matrix.test
         name: Test hls-semantic-tokens-plugin test suite
         run: cabal test hls-semantic-tokens-plugin-tests || cabal test hls-semantic-tokens-plugin-tests
 
-      - if: matrix.test && matrix.ghc != '9.12'
+      - if: matrix.test
         name: Test hls-notes-plugin test suite
         run: cabal test hls-notes-plugin-tests || cabal test hls-notes-plugin-tests
 

ghcide/src/Development/IDE/GHC/Compat.hs

@@ -125,7 +125,6 @@ import           Compat.HieUtils
 import           Control.Applicative                     ((<|>))
 import qualified Data.ByteString                         as BS
 import           Data.Coerce                             (coerce)
-import           Data.List                               (foldl')
 import qualified Data.Map                                as Map
 import qualified Data.Set                                as S
 import           Data.String                             (IsString (fromString))

ghcide/test/exe/UnitTests.hs

@@ -30,7 +30,7 @@ import           System.IO.Extra                   hiding (withTempDir)
 import           System.Mem                        (performGC)
 import           Test.Hls                          (GhcVersion (GHC912),
                                                     IdeState, def,
-                                                    knownBrokenForGhcVersions,
+                                                    ignoreForGhcVersions,
                                                     runSessionWithServerInTmpDir,
                                                     waitForProgressDone)
 import           Test.Tasty
@@ -99,7 +99,7 @@ tests = do
            let msg = printf "Timestamps do not have millisecond resolution: %dus" resolution_us
            assertBool msg (resolution_us <= 1000)
      , Progress.tests
-     , knownBrokenForGhcVersions [GHC912] "referenceImplementation get stuck" FuzzySearch.tests
+     , ignoreForGhcVersions [GHC912] "Fuzzy search: ignore since referenceImplementation get stuck for ghc912" $ FuzzySearch.tests
      ]
 
 findResolution_us :: Int -> IO Int

haskell-language-server.cabal

@@ -1744,13 +1744,13 @@ flag semanticTokens
   manual:      True
 
 common semanticTokens
-  if flag(semanticTokens) && impl(ghc < 9.11)
+  if flag(semanticTokens) && impl(ghc < 9.13)
     build-depends: haskell-language-server:hls-semantic-tokens-plugin
     cpp-options: -Dhls_semanticTokens
 
 library hls-semantic-tokens-plugin
   import: defaults, pedantic, warnings
-  if !flag(semanticTokens) || impl(ghc > 9.11)
+  if !flag(semanticTokens) || impl(ghc > 9.13)
     buildable: False
   exposed-modules:
     Ide.Plugin.SemanticTokens
@@ -1791,7 +1791,7 @@ library hls-semantic-tokens-plugin
 
 test-suite hls-semantic-tokens-plugin-tests
   import:           defaults, pedantic, test-defaults, warnings
-  if !flag(semanticTokens) || impl(ghc > 9.11)
+  if !flag(semanticTokens) || impl(ghc > 9.13)
     buildable: False
   type:             exitcode-stdio-1.0
   hs-source-dirs:   plugins/hls-semantic-tokens-plugin/test
@@ -1823,13 +1823,13 @@ flag notes
   manual:      True
 
 common notes
-  if flag(notes) && impl(ghc < 9.11)
+  if flag(notes) && impl(ghc < 9.13)
     build-depends: haskell-language-server:hls-notes-plugin
     cpp-options: -Dhls_notes
 
 library hls-notes-plugin
   import: defaults, pedantic, warnings
-  if !flag(notes) || impl(ghc > 9.11)
+  if !flag(notes) || impl(ghc > 9.13)
     buildable: False
   exposed-modules:
     Ide.Plugin.Notes
@@ -1857,7 +1857,7 @@ library hls-notes-plugin
 
 test-suite hls-notes-plugin-tests
   import:           defaults, pedantic, test-defaults, warnings
-  if !flag(notes) || impl(ghc > 9.11)
+  if !flag(notes) || impl(ghc > 9.13)
     buildable: False
   type:             exitcode-stdio-1.0
   hs-source-dirs:   plugins/hls-notes-plugin/test

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

@@ -20,7 +20,17 @@ import qualified Data.Text.Rope                   as Char
 import qualified Data.Text.Utf16.Rope             as Utf16
 import           Data.Text.Utf16.Rope.Mixed       (Rope)
 import qualified Data.Text.Utf16.Rope.Mixed       as Rope
-import           Development.IDE.GHC.Compat
+import           Development.IDE.GHC.Compat       (HieAST (nodeChildren, nodeSpan, sourcedNodeInfo),
+                                                   Identifier,
+                                                   NodeInfo (NodeInfo),
+                                                   NodeOrigin (SourceInfo),
+                                                   RealSrcLoc, RealSrcSpan,
+                                                   SourcedNodeInfo (getSourcedNodeInfo),
+                                                   nameOccName, occNameString,
+                                                   realSrcSpanEnd,
+                                                   realSrcSpanStart, srcLocCol,
+                                                   srcLocLine, srcSpanEndLine,
+                                                   srcSpanStartLine)
 import           Development.IDE.GHC.Error        (realSrcSpanToCodePointRange)
 import           Ide.Plugin.SemanticTokens.Types  (HsSemanticTokenType (TModule),
                                                    RangeHsSemanticTokenTypes (..))

plugins/hls-semantic-tokens-plugin/test/SemanticTokensTest.hs

@@ -10,7 +10,7 @@ import           Data.Functor                       (void)
 import qualified Data.List                          as T
 import           Data.Map.Strict                    as Map hiding (map)
 import           Data.String                        (fromString)
-import           Data.Text                          hiding (length, map,
+import           Data.Text                          hiding (length, map, show,
                                                      unlines)
 import qualified Data.Text                          as Text
 import qualified Data.Text.Utf16.Rope.Mixed         as Rope