Merge pull request #265 from edwinb/find-ipkg-ide

In IDE mode, look for a ipkg file before loading
idris-lang · Jun 10, 2020 · 42676d2 · 42676d2
2 parents 90fb901 + cf23bae
commit 42676d2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/Idris/IDEMode/REPL.idr b/src/Idris/IDEMode/REPL.idr
@@ -20,6 +20,7 @@ import Data.So
 import Idris.Desugar
 import Idris.Error
 import Idris.ModTree
+import Idris.Package
 import Idris.Parser
 import Idris.Resugar
 import Idris.REPL
@@ -148,8 +149,11 @@ process : {auto c : Ref Ctxt Defs} ->
           IDECommand -> Core IDEResult
 process (Interpret cmd)
     = replWrap $ interpret cmd
-process (LoadFile fname _)
-    = replWrap $ Idris.REPL.process (Load fname) >>= outputSyntaxHighlighting fname
+process (LoadFile fname_in _)
+    = do let fname = case !(findIpkg (Just fname_in)) of
+                          Nothing => fname_in
+                          Just f' => f'
+         replWrap $ Idris.REPL.process (Load fname) >>= outputSyntaxHighlighting fname
 process (TypeOf n Nothing)
     = replWrap $ Idris.REPL.process (Check (PRef replFC (UN n)))
 process (TypeOf n (Just (l, c)))

diff --git a/tests/ideMode/ideMode001/dummy.ipkg b/tests/ideMode/ideMode001/dummy.ipkg
@@ -0,0 +1 @@
+package idemode001
diff --git a/tests/ideMode/ideMode003/dummy.ipkg b/tests/ideMode/ideMode003/dummy.ipkg
@@ -0,0 +1 @@
+package idemode003