From 02b4a735457a5099cb4f33db84598db149af4385 Mon Sep 17 00:00:00 2001
From: Peter Wicks Stringfield <peterwicksstringfield@gmail.com>
Date: Wed, 2 Dec 2020 18:54:59 -0600
Subject: [PATCH] Enable highlight test.

---
 test/functional/Highlight.hs | 6 ++----
 test/testdata/hie.yaml       | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/functional/Highlight.hs b/test/functional/Highlight.hs
index 27ddd5e73c..fce63001ce 100644
--- a/test/functional/Highlight.hs
+++ b/test/functional/Highlight.hs
@@ -1,20 +1,18 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Highlight (tests) where
 
-import Control.Applicative.Combinators
 import Control.Monad.IO.Class
 import Language.Haskell.LSP.Test
 import Language.Haskell.LSP.Types
 import Test.Hls.Util
 import Test.Tasty
-import Test.Tasty.ExpectedFailure (ignoreTestBecause)
 import Test.Tasty.HUnit
 
 tests :: TestTree
 tests = testGroup "highlight" [
-    ignoreTestBecause "Broken" $ testCase "works" $ runSession hlsCommand fullCaps "test/testdata" $ do
+    testCase "works" $ runSession hlsCommand fullCaps "test/testdata" $ do
         doc <- openDoc "Highlight.hs" "haskell"
-        _ <- count 2 $ skipManyTill loggingNotification noDiagnostics
+        _ <- waitForDiagnosticsFrom doc
         highlights <- getHighlights doc (Position 2 2)
         liftIO $ do
             let hls =
diff --git a/test/testdata/hie.yaml b/test/testdata/hie.yaml
index 20a1997eed..e72073b7ee 100644
--- a/test/testdata/hie.yaml
+++ b/test/testdata/hie.yaml
@@ -4,6 +4,7 @@ cradle:
       - "CodeActionImport"
       - "CodeActionOnly"
       - "CodeActionRename"
+      - "Highlight"
       - "TopLevelSignature"
       - "TypedHoles"
       - "TypedHoles2"