From 3e36fa67e6a2465c79df7699152477f9f34bb9b7 Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 29 Feb 2024 19:38:45 +0800 Subject: [PATCH] remove non-ascii name --- .../test/SemanticTokensTest.hs | 18 +++++++++--------- .../test/testdata/TModuleA.hs | 2 +- .../test/testdata/TModuleB.hs | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) rename "plugins/hls-semantic-tokens-plugin/test/testdata/TModula\360\220\220\200bA.hs" => plugins/hls-semantic-tokens-plugin/test/testdata/TModuleA.hs (57%) diff --git a/plugins/hls-semantic-tokens-plugin/test/SemanticTokensTest.hs b/plugins/hls-semantic-tokens-plugin/test/SemanticTokensTest.hs index 0917b19a2d..e8a21396ee 100644 --- a/plugins/hls-semantic-tokens-plugin/test/SemanticTokensTest.hs +++ b/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", diff --git "a/plugins/hls-semantic-tokens-plugin/test/testdata/TModula\360\220\220\200bA.hs" b/plugins/hls-semantic-tokens-plugin/test/testdata/TModuleA.hs similarity index 57% rename from "plugins/hls-semantic-tokens-plugin/test/testdata/TModula\360\220\220\200bA.hs" rename to plugins/hls-semantic-tokens-plugin/test/testdata/TModuleA.hs index f111eb396b..d76f64fc1f 100644 --- "a/plugins/hls-semantic-tokens-plugin/test/testdata/TModula\360\220\220\200bA.hs" +++ b/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} diff --git a/plugins/hls-semantic-tokens-plugin/test/testdata/TModuleB.hs b/plugins/hls-semantic-tokens-plugin/test/testdata/TModuleB.hs index f90f0484b0..d2bfe4b7fa 100644 --- a/plugins/hls-semantic-tokens-plugin/test/testdata/TModuleB.hs +++ b/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