Merge branch 'master' into soulomoon/revert-removal-of-withLongTimeout

.github/workflows/bench.yml

@@ -17,6 +17,7 @@ on:
 jobs:
   pre_job:
     runs-on: ubuntu-latest
+    if: contains(github.event.pull_request.labels.*.name, 'performance')
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:

ghcide/src/Development/IDE/Plugin/Completions/Logic.hs

@@ -11,6 +11,7 @@ module Development.IDE.Plugin.Completions.Logic (
 , getCompletions
 , fromIdentInfo
 , getCompletionPrefix
+, getCompletionPrefixFromRope
 ) where
 
 import           Control.Applicative
@@ -897,7 +898,10 @@ mergeListsBy cmp all_lists = merge_lists all_lists
 
 -- |From the given cursor position, gets the prefix module or record for autocompletion
 getCompletionPrefix :: Position -> VFS.VirtualFile -> PosPrefixInfo
-getCompletionPrefix pos@(Position l c) (VFS.VirtualFile _ _ ropetext) =
+getCompletionPrefix pos (VFS.VirtualFile _ _ ropetext) = getCompletionPrefixFromRope pos ropetext
+
+getCompletionPrefixFromRope :: Position -> Rope.Rope -> PosPrefixInfo
+getCompletionPrefixFromRope pos@(Position l c) ropetext =
       fromMaybe (PosPrefixInfo "" "" "" pos) $ do -- Maybe monad
         let headMaybe = listToMaybe
             lastMaybe = headMaybe . reverse

ghcide/test/exe/Main.hs

@@ -30,13 +30,7 @@
 
 module Main (main) where
 -- import Test.QuickCheck.Instances ()
-import           Data.Function                ((&))
 import qualified HieDbRetry
-import           Ide.Logger                   (Pretty (pretty),
-                                               Priority (Debug),
-                                               WithPriority (WithPriority, priority),
-                                               cfilter, cmapWithPrio,
-                                               makeDefaultStderrRecorder)
 import           Test.Tasty
 import           Test.Tasty.Ingredients.Rerun
 
@@ -48,7 +42,6 @@ import           CompletionTests
 import           CPPTests
 import           CradleTests
 import           DependentFileTest
-import           Development.IDE              (LoggingColumn (..))
 import           DiagnosticTests
 import           ExceptionTests
 import           FindDefinitionAndHoverTests
@@ -74,15 +67,6 @@ import           WatchedFileTests
 
 main :: IO ()
 main = do
-  docWithPriorityRecorder <- makeDefaultStderrRecorder (Just [ThreadIdColumn, PriorityColumn, DataColumn])
-
-  let docWithFilteredPriorityRecorder =
-        docWithPriorityRecorder
-        & cfilter (\WithPriority{ priority } -> priority >= Debug)
-
-  let recorder = docWithFilteredPriorityRecorder
-               & cmapWithPrio pretty
-
   -- We mess with env vars so run single-threaded.
   defaultMainWithRerun $ testGroup "ghcide"
     [ OpenCloseTest.tests
@@ -99,7 +83,7 @@ main = do
     , THTests.tests
     , SymlinkTests.tests
     , SafeTests.tests
-    , UnitTests.tests recorder
+    , UnitTests.tests
     , HaddockTests.tests
     , PositionMappingTests.tests
     , WatchedFileTests.tests

ghcide/test/exe/SafeTests.hs

@@ -5,15 +5,15 @@ import qualified Data.Text            as T
 import           Development.IDE.Test (expectNoMoreDiagnostics)
 import           Language.LSP.Test
 
+import           Config
 import           Test.Tasty
-import           TestUtils
 
 tests :: TestTree
 tests =
   testGroup
     "SafeHaskell"
     [ -- Test for https://github.com/haskell/ghcide/issues/424
-      testSessionWait "load" $ do
+      testWithDummyPluginEmpty "load" $ do
         let sourceA =
               T.unlines
                 ["{-# LANGUAGE Trustworthy #-}"

ghcide/test/exe/SymlinkTests.hs

@@ -10,9 +10,9 @@ import           Language.LSP.Test
 import           System.Directory
 import           System.FilePath
 
+import           Config
 import           Test.Tasty
 import           Test.Tasty.HUnit
-import           TestUtils
 
 -- | Tests for projects that use symbolic links one way or another
 tests :: TestTree

ghcide/test/exe/UnitTests.hs

@@ -10,13 +10,11 @@ import           Data.List.Extra
 import           Data.String                       (IsString (fromString))
 import qualified Data.Text                         as T
 import           Development.IDE.Core.FileStore    (getModTime)
-import qualified Development.IDE.Main              as IDE
 import qualified Development.IDE.Plugin.HLS.GhcIde as Ghcide
 import qualified Development.IDE.Types.Diagnostics as Diagnostics
 import           Development.IDE.Types.Location
 import qualified FuzzySearch
-import           Ide.Logger                        (Recorder, WithPriority,
-                                                    cmapWithPrio)
+import           Ide.Logger                        (Recorder, WithPriority)
 import           Ide.PluginUtils                   (pluginDescToIdePlugins)
 import           Ide.Types
 import           Language.LSP.Protocol.Message
@@ -26,7 +24,6 @@ import           Language.LSP.Protocol.Types       hiding
                                                     SemanticTokensEdit (..),
                                                     mkRange)
 import           Language.LSP.Test
-import           LogType                           (Log (..))
 import           Network.URI
 import qualified Progress
 import           System.IO.Extra                   hiding (withTempDir)
@@ -37,11 +34,10 @@ import           Test.Hls                          (IdeState, def,
 import           Test.Tasty
 import           Test.Tasty.ExpectedFailure
 import           Test.Tasty.HUnit
-import           TestUtils
 import           Text.Printf                       (printf)
 
-tests :: Recorder (WithPriority Log) -> TestTree
-tests recorder = do
+tests :: TestTree
+tests = do
   testGroup "Unit"
      [ testCase "empty file path does NOT work with the empty String literal" $
          uriToFilePath' (fromNormalizedUri $ filePathToUri' "") @?= Just "."

ghcide/test/exe/WatchedFileTests.hs

@@ -3,6 +3,7 @@
 
 module WatchedFileTests (tests) where
 
+import           Config                          (testWithDummyPluginEmpty')
 import           Control.Applicative.Combinators
 import           Control.Monad.IO.Class          (liftIO)
 import qualified Data.Aeson                      as A
@@ -19,12 +20,11 @@ import           System.Directory
 import           System.FilePath
 import           Test.Tasty
 import           Test.Tasty.HUnit
-import           TestUtils
 
 tests :: TestTree
 tests = testGroup "watched files"
   [ testGroup "Subscriptions"
-    [ testSession' "workspace files" $ \sessionDir -> do
+    [ testWithDummyPluginEmpty' "workspace files" $ \sessionDir -> do
         liftIO $ writeFile (sessionDir </> "hie.yaml") "cradle: {direct: {arguments: [\"-isrc\", \"A\", \"WatchedFilesMissingModule\"]}}"
         _doc <- createDoc "A.hs" "haskell" "{-#LANGUAGE NoImplicitPrelude #-}\nmodule A where\nimport WatchedFilesMissingModule"
         setIgnoringRegistrationRequests False
@@ -33,7 +33,7 @@ tests = testGroup "watched files"
         -- Expect 2 subscriptions: one for all .hs files and one for the hie.yaml cradle
         liftIO $ length watchedFileRegs @?= 2
 
-    , testSession' "non workspace file" $ \sessionDir -> do
+    , testWithDummyPluginEmpty' "non workspace file" $ \sessionDir -> do
         tmpDir <- liftIO getTemporaryDirectory
         let yaml = "cradle: {direct: {arguments: [\"-i" <> tail(init(show tmpDir)) <> "\", \"A\", \"WatchedFilesMissingModule\"]}}"
         liftIO $ writeFile (sessionDir </> "hie.yaml") yaml
@@ -48,7 +48,7 @@ tests = testGroup "watched files"
     ]
   , testGroup "Changes"
     [
-      testSession' "workspace files" $ \sessionDir -> do
+      testWithDummyPluginEmpty' "workspace files" $ \sessionDir -> do
         liftIO $ writeFile (sessionDir </> "hie.yaml") "cradle: {direct: {arguments: [\"-isrc\", \"A\", \"B\"]}}"
         liftIO $ writeFile (sessionDir </> "B.hs") $ unlines
           ["module B where"

haskell-language-server.cabal

@@ -241,6 +241,7 @@ library hls-cabal-plugin
     Ide.Plugin.Cabal.Completion.Data
     Ide.Plugin.Cabal.Completion.Types
     Ide.Plugin.Cabal.LicenseSuggest
+    Ide.Plugin.Cabal.Orphans
     Ide.Plugin.Cabal.Parse
 
 

hls-test-utils/hls-test-utils.cabal

@@ -49,6 +49,7 @@ library
     , lsp
     , lsp-test                ^>=0.17
     , lsp-types               ^>=2.2
+    , neat-interpolation
     , safe-exceptions
     , tasty
     , tasty-expected-failure
@@ -57,6 +58,7 @@ library
     , tasty-rerun
     , temporary
     , text
+    , text-rope
 
   ghc-options:
     -Wall