Merge branch 'master' into branching-deps

Author: soulomoon

.github/scripts/build.sh

@@ -11,9 +11,6 @@ uname
 pwd
 env
 
-# setup the locale as HLS contains non-ascii modules and content.
-setup_locale
-
 # ensure ghcup
 install_ghcup
 

.github/scripts/common.sh

@@ -207,32 +207,3 @@ mktempdir() {
 			;;
 	esac
 }
-
-# "Inspired" from GHC GitLab CI
-# https://gitlab.haskell.org/ghc/ghc/-/blob/214b2b6916f2d016ab9db0b766060e7828bb47a0/.gitlab/ci.sh#L60
-setup_locale() {
-  # BSD grep terminates early with -q, consequently locale -a will get a
-  # SIGPIPE and the pipeline will fail with pipefail.
-  shopt -o -u pipefail
-  if locale -a | grep -q C.UTF-8; then
-    # Debian
-    export LANG=C.UTF-8
-  elif locale -a | grep -q C.utf8; then
-    # Fedora calls it this
-    export LANG=C.utf8
-  elif locale -a | grep -q en_US.UTF-8; then
-    # Centos doesn't have C.UTF-8
-    export LANG=en_US.UTF-8
-  elif locale -a | grep -q en_US.utf8; then
-    # Centos doesn't have C.UTF-8
-    export LANG=en_US.utf8
-  else
-    error "Failed to find usable locale"
-    info "Available locales:"
-    locale -a
-    fail "No usable locale, aborting..."
-  fi
-  info "Using locale $LANG..."
-  export LC_ALL=$LANG
-  shopt -o -s pipefail
-}

haskell-language-server.cabal

@@ -22,10 +22,14 @@ extra-source-files:
   test/testdata/**/*.cabal
   test/testdata/**/*.yaml
   test/testdata/**/*.hs
+  test/testdata/**/*.json
 
+  -- These globs should only match test/testdata
   plugins/**/*.project
+  plugins/**/*.expected
   plugins/**/*.cabal
   plugins/**/*.yaml
+  plugins/**/*.txt
   plugins/**/*.hs
 
   bindist/wrapper.in

plugins/hls-semantic-tokens-plugin/test/SemanticTokensTest.hs

@@ -178,7 +178,7 @@ semanticTokensFullDeltaTests :: TestTree
 semanticTokensFullDeltaTests =
   testGroup "semanticTokensFullDeltaTests" $
     [ testCase "null delta since unchanged" $ do
-        let file1 = "TModula𐐀bA.hs"
+        let file1 = "TModuleA.hs"
         let expectDelta = InR (InL (SemanticTokensDelta (Just "1") []))
         Test.Hls.runSessionWithServerInTmpDir def semanticTokensPlugin (mkFs $ FS.directProjectMulti [file1]) $ do
           doc1 <- openDoc file1 "haskell"
@@ -188,7 +188,7 @@ semanticTokensFullDeltaTests =
           liftIO $ delta @?= expectDelta
 
       , testCase "add tokens" $ do
-        let file1 = "TModula𐐀bA.hs"
+        let file1 = "TModuleA.hs"
         let expectDelta = InR (InL (SemanticTokensDelta (Just "1") [SemanticTokensEdit 20 0 (Just [2,0,3,8,0])]))
         --                                                                                         r c l t m
         --                                      where r = row, c = column, l = length, t = token, m = modifier
@@ -207,7 +207,7 @@ semanticTokensFullDeltaTests =
           liftIO $ delta @?= expectDelta
 
       , testCase "remove tokens" $ do
-        let file1 = "TModula𐐀bA.hs"
+        let file1 = "TModuleA.hs"
         let expectDelta = InR (InL (SemanticTokensDelta (Just "1") [SemanticTokensEdit 0 20 (Just [])]))
         -- delete all tokens
         Test.Hls.runSessionWithServerInTmpDir def semanticTokensPlugin (mkFs $ FS.directProjectMulti [file1]) $ do
@@ -229,7 +229,7 @@ semanticTokensTests :: TestTree
 semanticTokensTests =
   testGroup "other semantic Token test" $
     [ testCase "module import test" $ do
-        let file1 = "TModula𐐀bA.hs"
+        let file1 = "TModuleA.hs"
         let file2 = "TModuleB.hs"
         Test.Hls.runSessionWithServerInTmpDir def semanticTokensPlugin (mkFs $ FS.directProjectMulti [file1, file2]) $ do
           doc1 <- openDoc file1 "haskell"
@@ -245,14 +245,14 @@ semanticTokensTests =
 
           result <- docSemanticTokensString def doc2
           let expect = unlines [
-                    "3:8-18 TModule \"TModula\\66560bA\""
-                    , "4:18-28 TModule \"TModula\\66560bA\""
+                    "3:8-16 TModule \"TModuleA\""
+                    , "4:18-26 TModule \"TModuleA\""
                     , "6:1-3 TVariable \"go\""
                     , "6:6-10 TDataConstructor \"Game\""
                     , "8:1-5 TVariable \"a\\66560bb\""
-                    , "8:8-19 TModule \"TModula\\66560bA.\""
-                    , "8:19-22 TRecordField \"a\\66560b\""
-                    , "8:23-25 TVariable \"go\""
+                    , "8:8-17 TModule \"TModuleA.\""
+                    , "8:17-20 TRecordField \"a\\66560b\""
+                    , "8:21-23 TVariable \"go\""
                 ]
           liftIO $ result @?= expect,
       goldenWithSemanticTokensWithDefaultConfig "mixed constancy test result generated from one ghc version" "T1",

plugins/hls-semantic-tokens-plugin/test/testdata/TModula𐐀bA.hs renamed to plugins/hls-semantic-tokens-plugin/test/testdata/TModuleA.hs

@@ -1,4 +1,4 @@
-module TModula𐐀bA where
+module TModuleA where
 
 data Game = Game {a𐐀b :: Int}
 

plugins/hls-semantic-tokens-plugin/test/testdata/TModuleB.hs

@@ -1,8 +1,8 @@
 module TModuleB where
 
-import TModula𐐀bA
-import qualified TModula𐐀bA
+import TModuleA
+import qualified TModuleA
 
 go = Game 1
 
-a𐐀bb = TModula𐐀bA.a𐐀b go
+a𐐀bb = TModuleA.a𐐀b go