From 76326ff0f8638dae3b09746041fcc806d201c0d1 Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Fri, 12 Jan 2024 15:34:39 +0530 Subject: [PATCH 1/2] Bump to hiedb 0.5.0.0 to fix #3542 --- cabal.project | 2 +- ghcide/ghcide.cabal | 2 +- .../src/Ide/Plugin/CallHierarchy/Query.hs | 11 +++++------ stack-lts21.yaml | 2 +- stack.yaml | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/cabal.project b/cabal.project index f8d1ab6a77..1d2d459a00 100644 --- 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 index 72423db76b..473d4dc33f 100644 --- 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 index 9a855958c1..1eee277caf 100644 --- 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 index b114550a17..187079312c 100644 --- 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 index 6eae9d00dd..5a3af693eb 100644 --- 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 From 362678d21839353e5c9e60ac0b43df0095b0a540 Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Fri, 12 Jan 2024 22:18:44 +0530 Subject: [PATCH 2/2] Bump to hiedb 0.5.0.1 incorporating a bug fix to the Read Symbol instance. --- cabal.project | 2 +- ghcide/ghcide.cabal | 2 +- stack-lts21.yaml | 2 +- stack.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cabal.project b/cabal.project index 1d2d459a00..1f42c90346 100644 --- 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-12T19:06:05Z +index-state: 2024-01-13T19:06:05Z tests: True test-show-details: direct diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 473d4dc33f..acf03f17b1 100644 --- 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.5.0 + , hiedb ^>= 0.5.0.1 , 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/stack-lts21.yaml b/stack-lts21.yaml index 187079312c..50823b9d7b 100644 --- a/stack-lts21.yaml +++ b/stack-lts21.yaml @@ -45,7 +45,7 @@ allow-newer: true extra-deps: - floskell-0.11.1 -- hiedb-0.5.0.0 +- hiedb-0.5.0.1 - 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 index 5a3af693eb..63101b21e9 100644 --- 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.5.0.0 +- hiedb-0.5.0.1 - implicit-hie-0.1.4.0 - hie-bios-0.13.1 - lsp-2.3.0.0