intero 0.1.36 → 0.1.37

raw patch · 8 files changed

+45/−11 lines, 8 files

Files

CHANGELOG +3/−0
README.md +9/−1
elisp/intero.el +6/−1
intero.cabal +1/−1
src/GhciFind.hs +7/−2
src/InteractiveUI.hs +4/−4
src/Main.hs +2/−1
src/test/Main.hs +13/−1

CHANGELOG view

@@ -1,3 +1,6 @@+0.1.37:+	* Fix completion listing deferred names+ 0.1.36: 	* Fix handling of unicode for type/info queries

README.md view

@@ -21,6 +21,15 @@ `C-c C-k` | Clear REPL `C-c C-z` | Switch to and from the REPL +## Install requirements++Make sure you have this package installed on Linux:++    libtinfo-dev++(People on other platforms please contribute the equivalent+dependency.)+ ## Enabling intero  To enable `intero` in all `haskell-mode` buffers by default, enable@@ -46,7 +55,6 @@ `intero-whitelist`. In other words, whitelist entries take precedence. You can therefore blacklist `/` to disable `intero` in all projects unless they are whitelisted.-  ## Intero support for other editors and IDEs

elisp/intero.el view

@@ -1416,9 +1416,12 @@              'face 'font-lock-comment-face))     (let* ((script-buffer             (with-current-buffer (find-file-noselect (intero-make-temp-file "intero-script"))+              ;; Commented out this line due to this bug:+              ;; https://github.com/chrisdone/intero/issues/569+              ;; GHC 8.4.3 has some bug causing a panic on GHCi.+              ;; :set -fdefer-type-errors               (insert ":set prompt \"\" :set -fbyte-code-:set -fdefer-type-errors :set -fdiagnostics-color=never :set prompt \"\\4 \" ")@@ -2243,6 +2246,8 @@ We don't know why it failed. Please read the above output and try installing manually. If that doesn't work, report this as a problem.++Guess: You might need the \"tinfo\" package, e.g. libtinfo-dev.  WHAT TO DO NEXT

intero.cabal view

@@ -1,7 +1,7 @@ name:   intero version:-  0.1.36+  0.1.37 synopsis:   Complete interactive development program for Haskell license:

src/GhciFind.hs view

@@ -123,8 +123,13 @@           do var <- spaninfoVar si              let str = showppr df var              if isPrefixOf prefix str-                then Just str-                else Nothing+               then case getSrcLoc (getName var) of+                      RealSrcLoc {} -> Just str+                      -- Probably an internally generated name. Ignore it:+                      -- See here: https://github.com/chrisdone/intero/issues/531+                      -- We ignore defered-scope-error names like foo_a8s76+                      UnhelpfulLoc {} -> Nothing+               else Nothing  -- | Find any uses of the given identifier in the codebase. findNameUses :: (GhcMonad m)

src/InteractiveUI.hs view

@@ -894,16 +894,16 @@     st <- getFileStatus name     me <- getRealUserID     if fileOwner st /= me then do-        putStrLn $ "WARNING: " ++ name ++ " is owned by someone else, IGNORING!"-        return False+        putStrLn $ "WARNING: " ++ name ++ " is owned by someone else!"+        return True      else do         let mode = System.Posix.fileMode st         if (groupWriteMode == (mode `intersectFileModes` groupWriteMode))             || (otherWriteMode == (mode `intersectFileModes` otherWriteMode))             then do                 putStrLn $ "*** WARNING: " ++ name ++-                           " is writable by someone else, IGNORING!"-                return False+                           " is writable by someone else!"+                return True             else return True #endif

src/Main.hs view

@@ -106,7 +106,8 @@    hSetBuffering stderr LineBuffering    GHC.defaultErrorHandler defaultFatalMessager defaultFlushOut $ do     -- 1. extract the -B flag from the args-    argv00 <- getArgs+    argv00 <- fmap (filter (/= "-traditional"))+                   getArgs     if elem "--version" argv00        then do putStrLn ("Intero " ++ Data.Version.showVersion Paths_intero.version)                exitSuccess

src/test/Main.hs view

@@ -411,7 +411,19 @@                 (["\"sort\"", "\"sortBy\""])))   describe     "Completion in module context"-    (do it+    (do issue+          ":complete-at for defered scope names"+          "https://github.com/chrisdone/intero/issues/531"+          (atFile+             ":complete-at"+             "X.hs"+             -- All these type annotations are required for GHC 8.6.3+             -- to accept the input without error.+             "{-# OPTIONS -fdefer-type-errors #-}\nmodule X where\ng a = fiiila (filu :: Char) a (fi :: Int)\n where fiiila _ _ _ = 123"+             (2, 14, 2, 17, "fi")+             lines+             ["fiiila", "filter"])+        it           ":complete-at for put*"           (atFile              ":complete-at"