Fix error in hls-plugin-api

Author: jhrcek

.github/workflows/flags.yml

@@ -69,11 +69,16 @@ jobs:
           ghc: ${{ matrix.ghc }}
           os:  ${{ runner.os }}
 
+      # The purpose of this job is to ensure that the build works even with flags
+      # in their non-default settings. Below we:
+      # - enable flags that are off by default
+      # - disable flags that are on by default
       - name: Configue flags for all components
         run: |
           cabal configure \
               --constraint "hls-graph +embed-files +stm-stats" \
               --constraint "ghcide +ekg +executable +test-exe" \
+              --constraint "hls-plugin-api -use-fingertree" \
               --constraint "all +pedantic"
           cat cabal.project.local
 

hls-plugin-api/bench/Main.hs

@@ -2,17 +2,17 @@
 -- vs RangeMap-based "in-range filtering" approaches
 module Main (main) where
 
-import           Control.DeepSeq        (force)
-import           Control.Exception      (evaluate)
-import           Control.Monad          (replicateM)
+import           Control.DeepSeq             (force)
+import           Control.Exception           (evaluate)
+import           Control.Monad               (replicateM)
 import qualified Criterion
 import qualified Criterion.Main
-import           Data.Random            (RVar)
-import qualified Data.Random            as Fu
-import qualified Ide.Plugin.RangeMap    as RangeMap
-import           Language.LSP.Types     (Position (..), Range (..), UInt,
-                                         isSubrangeOf)
-import qualified System.Random.Stateful as Random
+import           Data.Random                 (RVar)
+import qualified Data.Random                 as Fu
+import qualified Ide.Plugin.RangeMap         as RangeMap
+import           Language.LSP.Protocol.Types (Position (..), Range (..), UInt,
+                                              isSubrangeOf)
+import qualified System.Random.Stateful      as Random
 
 
 genRangeList :: Int -> RVar [Range]

hls-plugin-api/hls-plugin-api.cabal

@@ -142,6 +142,6 @@ benchmark rangemap-benchmark
     , criterion
     , deepseq
     , hls-plugin-api
-    , lsp-types
+    , lsp-test
     , random
     , random-fu

hls-plugin-api/src/Ide/Plugin/RangeMap.hs

@@ -14,14 +14,16 @@ module Ide.Plugin.RangeMap
     fromList',
     filterByRange,
   ) where
+
 import           Development.IDE.Graph.Classes            (NFData)
-import           Language.LSP.Protocol.Types              (Range, isSubrangeOf)
 #ifdef USE_FINGERTREE
 import           Data.Bifunctor                           (first)
 import           Data.Foldable                            (foldl')
 import qualified HaskellWorks.Data.IntervalMap.FingerTree as IM
 import           Language.LSP.Protocol.Types              (Position,
                                                            Range (Range))
+#else
+import           Language.LSP.Protocol.Types              (Range, isSubrangeOf)
 #endif
 
 -- | A map from code ranges to values.