From c56fe393644aec5e815a5cb5265c61079ee967b4 Mon Sep 17 00:00:00 2001 From: fendor Date: Sun, 5 Jan 2020 20:26:00 +0100 Subject: [PATCH 1/3] Fallback to direct cradle if no project context can be found --- hie-plugin-api/Haskell/Ide/Engine/Cradle.hs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hie-plugin-api/Haskell/Ide/Engine/Cradle.hs b/hie-plugin-api/Haskell/Ide/Engine/Cradle.hs index 35d8b9ed6..9abb5f79d 100644 --- a/hie-plugin-api/Haskell/Ide/Engine/Cradle.hs +++ b/hie-plugin-api/Haskell/Ide/Engine/Cradle.hs @@ -432,8 +432,14 @@ cabalHelperCradle file = do return Cradle { cradleRootDir = cwd , cradleOptsProg = - CradleAction { actionName = "Cabal-Helper-None" - , runCradle = \_ _ -> return CradleNone + CradleAction { actionName = "Direct" + , runCradle = \_ _ -> + return + $ CradleSuccess + ComponentOptions + { componentOptions = [] + , componentDependencies = [] + } } } Just (Ex proj) -> do From e217af2152a0d164ad274f12405a680930b5b825 Mon Sep 17 00:00:00 2001 From: fendor Date: Sun, 5 Jan 2020 20:42:35 +0100 Subject: [PATCH 2/3] Add filepath as only argument for module graph --- hie-plugin-api/Haskell/Ide/Engine/Cradle.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hie-plugin-api/Haskell/Ide/Engine/Cradle.hs b/hie-plugin-api/Haskell/Ide/Engine/Cradle.hs index 9abb5f79d..5404925cd 100644 --- a/hie-plugin-api/Haskell/Ide/Engine/Cradle.hs +++ b/hie-plugin-api/Haskell/Ide/Engine/Cradle.hs @@ -437,7 +437,7 @@ cabalHelperCradle file = do return $ CradleSuccess ComponentOptions - { componentOptions = [] + { componentOptions = [file] , componentDependencies = [] } } From 72e138ebf017852377c2600d7100a36158c71f53 Mon Sep 17 00:00:00 2001 From: fendor Date: Sun, 5 Jan 2020 21:04:03 +0100 Subject: [PATCH 3/3] Add include dir so local imports work as expected --- hie-plugin-api/Haskell/Ide/Engine/Cradle.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hie-plugin-api/Haskell/Ide/Engine/Cradle.hs b/hie-plugin-api/Haskell/Ide/Engine/Cradle.hs index 5404925cd..76da7b516 100644 --- a/hie-plugin-api/Haskell/Ide/Engine/Cradle.hs +++ b/hie-plugin-api/Haskell/Ide/Engine/Cradle.hs @@ -437,7 +437,7 @@ cabalHelperCradle file = do return $ CradleSuccess ComponentOptions - { componentOptions = [file] + { componentOptions = [file, fixImportDirs cwd "-i."] , componentDependencies = [] } }