Fix eval tests

Author: Ailrun

plugins/hls-eval-plugin/hls-eval-plugin.cabal

@@ -19,11 +19,9 @@ build-type:         Simple
 extra-source-files:
   LICENSE
   README.md
-  test/testdata/*.cabal
   test/testdata/*.hs
   test/testdata/*.lhs
   test/testdata/*.yaml
-  test/testdata/cabal.project
 
 flag pedantic
   description: Enable -Werror

plugins/hls-eval-plugin/test/Main.hs

@@ -87,9 +87,8 @@ tests =
   , goldenWithEval "Evaluate expressions in Haddock comments in both single line and multi line format" "THaddock" "hs"
   , goldenWithEval "Compare results (for Haddock tests only)" "TCompare" "hs"
   , goldenWithEval "Local Modules imports are accessible in a test" "TLocalImport" "hs"
-  , -- , goldenWithEval "Local Modules can be imported in a test" "TLocalImportInTest" "hs"
-    expectFailBecause "Unexplained but minor issue" $
-      goldenWithEval "Setting language option TupleSections" "TLanguageOptionsTupleSections" "hs"
+  -- , goldenWithEval "Local Modules can be imported in a test" "TLocalImportInTest" "hs"
+  , goldenWithEval "Setting language option TupleSections" "TLanguageOptionsTupleSections" "hs"
   , goldenWithEval ":set accepts ghci flags" "TFlags" "hs"
   , goldenWithEval "IO expressions are supported, stdout/stderr output is ignored" "TIO" "hs"
   , goldenWithEval "Property checking" "TProperty" "hs"

plugins/hls-eval-plugin/test/testdata/T11.expected.hs

@@ -1,4 +1,4 @@
 module T11 where
 
 -- >>> :kind! a
--- Not in scope: type variable 'a'
+-- Not in scope: type variable ‘a’

plugins/hls-eval-plugin/test/testdata/T13.expected.hs

@@ -1,4 +1,4 @@
 module T13 where
 
 -- >>> :kind a
--- Not in scope: type variable 'a'
+-- Not in scope: type variable ‘a’

plugins/hls-eval-plugin/test/testdata/T17.expected.hs

@@ -1,4 +1,4 @@
 module T17 where
 
 -- >>> :type  +no 42
--- parse error on input '+'
+-- parse error on input ‘+’

plugins/hls-eval-plugin/test/testdata/T26.expected.hs

@@ -1,5 +1,5 @@
 module T26 where
-import T25 ()
+import Util ()
 
 -- >>> "hello"
 -- "hello"

plugins/hls-eval-plugin/test/testdata/T26.hs

@@ -1,4 +1,4 @@
 module T26 where
-import T25 ()
+import Util ()
 
 -- >>> "hello"

plugins/hls-eval-plugin/test/testdata/T8.expected.hs

@@ -5,7 +5,7 @@ module T8 where
 -- Variable not in scope: noFunctionWithThisName
 
 -- >>> "a" + "bc"
--- No instance for (Num [Char]) arising from a use of '+'
+-- No instance for (Num [Char]) arising from a use of ‘+’
 
 -- >>> "
 -- lexical error in string/character literal at end of input

plugins/hls-eval-plugin/test/testdata/TFlags.expected.hs

@@ -18,7 +18,7 @@ module TFlags where
 Options apply only in the section where they are defined (unless they are in the setup section), so this will fail:
 
 >>> class L a b c
-Too many parameters for class 'L'
+Too many parameters for class ‘L’
 (Enable MultiParamTypeClasses to allow multi-parameter classes)
 -}
 
@@ -29,7 +29,7 @@ Options apply to all tests in the same section after their declaration.
 Not set yet:
 
 >>> class D
-No parameters for class 'D'
+No parameters for class ‘D’
 (Enable MultiParamTypeClasses to allow no-parameter classes)
 
 Now it works:

plugins/hls-eval-plugin/test/testdata/THaddock.expected.hs

@@ -18,6 +18,7 @@ module THaddock () where
 "bc"
 -}
 
+double :: Num a => a -> a
 double a = a + a
 -- ^ Single line backward comments
 -- >>> double 11
@@ -37,4 +38,5 @@ twice a = a ++ a
 
      >>> IGNORED as it does not start on the first column
 -}
+five :: Integer
 five = 5

plugins/hls-eval-plugin/test/testdata/THaddock.hs

@@ -16,6 +16,7 @@ module THaddock () where
 >>> "b"++"c"
 -}
 
+double :: Num a => a -> a
 double a = a + a
 -- ^ Single line backward comments
 -- >>> double 11
@@ -32,4 +33,5 @@ twice a = a ++ a
 
      >>> IGNORED as it does not start on the first column
 -}
+five :: Integer
 five = 5

plugins/hls-eval-plugin/test/testdata/TLHSLateX.expected.lhs renamed to plugins/hls-eval-plugin/test/testdata/TLHSLaTeX.expected.lhs

@@ -5,4 +5,5 @@ module TLanguageOptionsTupleSection where
 -- What is special about TupleSections?
 -- >>> :set -XTupleSections
 -- >>> ("a",) "b"
--- ("a","b")
+-- ("a","b")
+

plugins/hls-eval-plugin/test/testdata/TLanguageOptionsTupleSections.expected.hs

@@ -25,4 +25,5 @@ module TPlain where
 
      >>> IGNORED as it does not start on the first column
 -}
+five :: Integer
 five = 5

plugins/hls-eval-plugin/test/testdata/TPlainComment.expected.hs

@@ -22,4 +22,5 @@ module TPlain where
 
      >>> IGNORED as it does not start on the first column
 -}
+five :: Integer
 five = 5

plugins/hls-eval-plugin/test/testdata/TPlainComment.hs

@@ -1,4 +1,3 @@
 cradle:
-  cabal:
-    - path: "././"
-      component: "lib:test"
+  direct:
+    arguments: []