Bump to hiedb 0.5.0.0 to fix #3542

haskell · Jan 12, 2024 · 76326ff · 76326ff
1 parent 2fe2d70
commit 76326ff
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/cabal.project b/cabal.project
@@ -36,7 +36,7 @@ packages:
          ./plugins/hls-overloaded-record-dot-plugin
          ./plugins/hls-semantic-tokens-plugin
 
-index-state: 2024-01-05T19:06:05Z
+index-state: 2024-01-12T19:06:05Z
 
 tests: True
 test-show-details: direct

diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal
@@ -78,7 +78,7 @@ library
     , hashable
     , hie-bios                     ==0.13.1
     , hie-compat                   ^>=0.3.0.0
-    , hiedb                        >=0.4.4    && <0.4.5
+    , hiedb                        ^>= 0.5.0
     , hls-graph                    == 2.5.0.0
     , hls-plugin-api               == 2.5.0.0
     , implicit-hie                 >= 0.1.4.0 && < 0.1.5

diff --git a/plugins/hls-call-hierarchy-plugin/src/Ide/Plugin/CallHierarchy/Query.hs b/plugins/hls-call-hierarchy-plugin/src/Ide/Plugin/CallHierarchy/Query.hs
@@ -11,8 +11,7 @@ module Ide.Plugin.CallHierarchy.Query (
 import qualified Data.Text                      as T
 import           Database.SQLite.Simple
 import           Development.IDE.GHC.Compat
-import           HieDb                          (HieDb (getConn), Symbol (..),
-                                                 toNsChar)
+import           HieDb                          (HieDb (getConn), Symbol (..))
 import           Ide.Plugin.CallHierarchy.Types
 
 incomingCalls :: HieDb -> Symbol -> IO [Vertex]
@@ -73,9 +72,9 @@ getSymbolPosition (getConn -> conn) Vertex{..} = do
             ]
         ) (occ, sl, sc, sl, el, ec, el)
 
-parseSymbol :: Symbol -> (String, String, String)
+parseSymbol :: Symbol -> (OccName, ModuleName, Unit)
 parseSymbol Symbol{..} =
-    let o = toNsChar (occNameSpace symName) : occNameString symName
-        m = moduleNameString $ moduleName symModule
-        u = unitString $ moduleUnit symModule
+    let o = symName
+        m = moduleName symModule
+        u = moduleUnit symModule
     in  (o, m, u)
diff --git a/stack-lts21.yaml b/stack-lts21.yaml
@@ -45,7 +45,7 @@ allow-newer: true
 
 extra-deps:
 - floskell-0.11.1
-- hiedb-0.4.4.0
+- hiedb-0.5.0.0
 - hie-bios-0.13.1
 - implicit-hie-0.1.4.0
 - monad-dijkstra-0.1.1.3

diff --git a/stack.yaml b/stack.yaml
@@ -45,7 +45,7 @@ allow-newer: true
 extra-deps:
 - floskell-0.11.1
 - retrie-1.2.2
-- hiedb-0.4.4.0
+- hiedb-0.5.0.0
 - implicit-hie-0.1.4.0
 - hie-bios-0.13.1
 - lsp-2.3.0.0