Skip to content

refactor: migrate FilePath/NormalizedFilePath to OsPath/NormalizedOsPath #3046 #5118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blackheaven wants to merge 8 commits into
base: master
Choose a base branch
from
Open

refactor: migrate FilePath/NormalizedFilePath to OsPath/NormalizedOsPath #3046 #5118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
17e896a
WIP: migrate FilePath/NormalizedFilePath to OsPath/NormalizedOsPath #…
blackheaven Oct 9, 2026
bd5a542
Allow unsafePerformIO in Ide.Types.Location
blackheaven Oct 10, 2026
79b67fd
Improve failure message of import-path-order test; enable server logs…
blackheaven Oct 10, 2026
5063610
Re-trigger CI (transient haskell-lexer install failure on windows-9.12)
blackheaven Oct 10, 2026
4a60d2b
Remove temporary HLS_TEST_LOG_STDERR from Test ghcide step
blackheaven Oct 10, 2026
305f620
refactor: keep NormalizedFilePath name with OsPath internals
blackheaven Oct 10, 2026
7f305c5
fix: format
blackheaven Oct 10, 2026
b8d5df7
ci: trigger rerun (Hackage TUF verification flake)
blackheaven Oct 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .hlint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
- Development.IDE.Graph.Internal.Profile
- Development.IDE.Graph.Internal.Key
- Ide.Types
- Ide.Types.Location
- Test.Hls
- Test.Hls.Command
- AutoTupleSpec
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ repos:
- hooks:
- entry: stylish-haskell --inplace
exclude: >-
(^Setup.hs$|test/testdata/.*$|test/data/.*$|test/manual/lhs/.*$|^hie-compat/.*$|^plugins/hls-tactics-plugin/.*$|^ghcide/src/Development/IDE/GHC/Compat.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/GHC/Compat/ExactPrint.hs$|^ghcide/src/Development/IDE/GHC/Compat/Core.hs$|^ghcide/src/Development/IDE/Spans/Pragmas.hs$|^ghcide/src/Development/IDE/LSP/Outline.hs$|^plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs$|^ghcide/src/Development/IDE/Core/Rules.hs$|^ghcide/src/Development/IDE/Core/Compile.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/GHC/ExactPrint.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs$|^plugins/hls-eval-plugin/src/Ide/Plugin/Eval/Handlers.hs$)
(^Setup.hs$|test/testdata/.*$|test/data/.*$|test/manual/lhs/.*$|^hie-compat/.*$|^plugins/hls-tactics-plugin/.*$|^ghcide/src/Development/IDE/GHC/Compat.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/GHC/Compat/ExactPrint.hs$|^ghcide/src/Development/IDE/GHC/Compat/Core.hs$|^ghcide/src/Development/IDE/Spans/Pragmas.hs$|^ghcide/src/Development/IDE/LSP/Outline.hs$|^plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs$|^ghcide/src/Development/IDE/Core/Rules.hs$|^ghcide/src/Development/IDE/Core/Compile.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/GHC/ExactPrint.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs$|^plugins/hls-eval-plugin/src/Ide/Plugin/Eval/Handlers.hs$|^plugins/hls-case-split-plugin/src/Ide/Plugin/CaseSplit.hs$|^plugins/hls-explicit-fixity-plugin/src/Ide/Plugin/ExplicitFixity.hs$|^plugins/hls-overloaded-record-dot-plugin/src/Ide/Plugin/OverloadedRecordDot.hs$)
files: \.l?hs$
id: stylish-haskell
language: system
Expand Down
3 changes: 2 additions & 1 deletion ghcide-bench/src/Experiments.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ import Experiments.Types
import Language.LSP.Protocol.Capabilities
import qualified Language.LSP.Protocol.Lens as L
import Language.LSP.Protocol.Message
import Language.LSP.Protocol.Types hiding (Null,
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
Null,
SemanticTokenAbsolute (..))
import qualified Language.LSP.Protocol.Types as LSP
import Language.LSP.Test
Expand Down
4 changes: 2 additions & 2 deletions ghcide-test/exe/AsyncTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import Data.Aeson (toJSON)
import Data.Proxy
import qualified Data.Text as T
import Language.LSP.Protocol.Message
import Language.LSP.Protocol.Types hiding
(SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..),
mkRange)
Expand Down
4 changes: 2 additions & 2 deletions ghcide-test/exe/BootTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import Development.IDE.Test (expectNoMoreDiagnostics,
isReferenceReady)
import Development.IDE.Types.Location
import Language.LSP.Protocol.Message
import Language.LSP.Protocol.Types hiding
(SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..),
mkRange)
Expand Down
3 changes: 2 additions & 1 deletion ghcide-test/exe/CPPTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import Control.Exception (catch)
import qualified Data.Text as T
import Development.IDE.Test (Cursor, expectDiagnostics,
expectNoMoreDiagnostics)
import Language.LSP.Protocol.Types hiding (SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..), mkRange)
import Language.LSP.Test
Expand Down
4 changes: 2 additions & 2 deletions ghcide-test/exe/ClientSettingsTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import Data.Default
import qualified Data.Text as T
import Ide.Types
import Language.LSP.Protocol.Message
import Language.LSP.Protocol.Types hiding
(SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..),
mkRange)
Expand Down
10 changes: 5 additions & 5 deletions ghcide-test/exe/CodeLensTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import Data.Maybe
import qualified Data.Text as T
import Development.IDE.GHC.Compat (GhcVersion (..), ghcVersion)
import qualified Language.LSP.Protocol.Lens as L
import Language.LSP.Protocol.Types hiding
(SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..),
mkRange)
Expand All @@ -29,8 +29,8 @@ tests = testGroup "code lenses"

data TestSpec =
TestSpec
{ mName :: Maybe TestName -- ^ Optional Test Name
, input :: T.Text -- ^ Input
{ mName :: Maybe TestName -- ^ Optional Test Name
, input :: T.Text -- ^ Input
, expected :: Maybe T.Text -- ^ Expected Type Sig
}

Expand All @@ -44,7 +44,7 @@ noExpected t = t { expected = Nothing }

mkTestName :: TestSpec -> String
mkTestName t = case mName t of
Nothing -> T.unpack $ T.replace "\n" "\\n" (input t)
Nothing -> T.unpack $ T.replace "\n" "\\n" (input t)
Just name -> name

addSigLensesTests :: TestTree
Expand Down
4 changes: 2 additions & 2 deletions ghcide-test/exe/CompletionTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import Development.IDE.Types.Location
import Ide.Plugin.Config
import qualified Language.LSP.Protocol.Lens as L
import Language.LSP.Protocol.Message
import Language.LSP.Protocol.Types hiding
(SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..),
mkRange)
Expand Down
4 changes: 2 additions & 2 deletions ghcide-test/exe/CradleTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import Ide.Types (Config (..),
SessionLoadingPreferenceConfig (..))
import qualified Language.LSP.Protocol.Lens as L
import Language.LSP.Protocol.Message
import Language.LSP.Protocol.Types hiding
(SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..),
mkRange)
Expand Down
4 changes: 2 additions & 2 deletions ghcide-test/exe/DependentFileTest.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import qualified Data.Text as T
import Development.IDE.Test (expectDiagnostics)
import Development.IDE.Types.Location
import Language.LSP.Protocol.Message
import Language.LSP.Protocol.Types hiding
(SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..),
mkRange)
Expand Down
8 changes: 5 additions & 3 deletions ghcide-test/exe/DiagnosticTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import Development.IDE.Test (diagnostic,
import Development.IDE.Types.Location
import qualified Language.LSP.Protocol.Lens as L
import Language.LSP.Protocol.Message
import Language.LSP.Protocol.Types hiding
(SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..),
mkRange)
Expand Down Expand Up @@ -260,7 +260,9 @@ tests = testGroup "diagnostics"
) $ \sessionDir -> do
tdoc <- openDoc ("srcA" </> "T.hs") "haskell"
WaitForIdeRuleResult{ideResultSuccess} <- waitForAction "TypeCheck" tdoc
liftIO $ assertBool "T should typecheck using srcA's C" ideResultSuccess
unless ideResultSuccess $ do
diags <- getCurrentDiagnostics tdoc
liftIO $ assertBool ("T should typecheck using srcA's C, diagnostics: " <> show diags) False
expectCurrentDiagnostics tdoc []
locs <- getDefinitions tdoc (Position 1 7)
assertDefsFile (sessionDir </> "srcA" </> "C.hs") locs
Expand Down
3 changes: 2 additions & 1 deletion ghcide-test/exe/EpsPollutionTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ import qualified Data.Text as T
import Development.IDE.GHC.Util (readFileUtf8)
import Hover
import qualified Language.LSP.Protocol.Lens as L
import Language.LSP.Protocol.Types
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
uriToNormalizedFilePath)
import Language.LSP.Test
import System.FilePath
import Test.Hls
Expand Down
4 changes: 2 additions & 2 deletions ghcide-test/exe/ExceptionTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import Ide.PluginUtils (pluginDescToIdePlugins)
import Ide.Types
import qualified Language.LSP.Protocol.Lens as L
import Language.LSP.Protocol.Message
import Language.LSP.Protocol.Types hiding
(SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..),
mkRange)
Expand Down
3 changes: 2 additions & 1 deletion ghcide-test/exe/GarbageCollectionTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import qualified Data.Text as T
import Development.IDE.Test (expectCurrentDiagnostics,
getStoredKeys, waitForGC,
waitForTypecheck)
import Language.LSP.Protocol.Types hiding (SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..), mkRange)
import Language.LSP.Test
Expand Down
4 changes: 2 additions & 2 deletions ghcide-test/exe/HighlightTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import Config
import Control.Monad.IO.Class (liftIO)
import qualified Data.Text as T
import Development.IDE.Types.Location
import Language.LSP.Protocol.Types hiding
(SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..),
mkRange)
Expand Down
4 changes: 2 additions & 2 deletions ghcide-test/exe/IfaceTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import Development.IDE.Test (configureCheckProject,
expectNoMoreDiagnostics,
getInterfaceFilesDir)
import Language.LSP.Protocol.Message
import Language.LSP.Protocol.Types hiding
(SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..),
mkRange)
Expand Down
3 changes: 2 additions & 1 deletion ghcide-test/exe/OutlineTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import Control.Monad.IO.Class (liftIO)
import Data.Text (Text)
import qualified Data.Text as T
import Development.IDE.GHC.Compat (GhcVersion (..), ghcVersion)
import Language.LSP.Protocol.Types hiding (SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..), mkRange)
import Language.LSP.Test
Expand Down
5 changes: 3 additions & 2 deletions ghcide-test/exe/PluginSimpleTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ module PluginSimpleTests (tests) where

import Config
import Development.IDE.Test (expectDiagnostics)
import Language.LSP.Protocol.Types hiding (SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..), mkRange)
import Language.LSP.Test
import System.FilePath
import qualified Test.Hls.FileSystem as FS
import Test.Hls.FileSystem
import Test.Tasty
import qualified Test.Hls.FileSystem as FS

tests :: TestTree
tests = testGroup "ghc-plugins"
Expand Down
3 changes: 2 additions & 1 deletion ghcide-test/exe/PositionMappingTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import Development.IDE.Core.PositionMapping (PositionResult (..),
toCurrentPosition)
import Development.IDE.Types.Location
import Language.LSP.Protocol.Types hiding
(SemanticTokenAbsolute (..),
(NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..),
mkRange)
Expand Down
3 changes: 2 additions & 1 deletion ghcide-test/exe/PreprocessorTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ module PreprocessorTests (tests) where

import qualified Data.Text as T
import Development.IDE.Test (expectDiagnostics)
import Language.LSP.Protocol.Types hiding (SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..), mkRange)
import Language.LSP.Test
Expand Down
4 changes: 2 additions & 2 deletions ghcide-test/exe/ReferenceTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import Data.List.Extra
import qualified Data.Set as Set
import Development.IDE.Types.Location
import qualified Language.LSP.Protocol.Lens as L
import Language.LSP.Protocol.Types hiding
(SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..),
mkRange)
Expand Down
3 changes: 2 additions & 1 deletion ghcide-test/exe/ResolveTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ import qualified Language.LSP.Protocol.Lens as J
import qualified Language.LSP.Protocol.Lens as JL
import Language.LSP.Protocol.Message (SomeMethod (..))
import qualified Language.LSP.Protocol.Message as LSP
import Language.LSP.Protocol.Types
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
uriToNormalizedFilePath)
import Language.LSP.Test hiding (resolveCompletion)
import Test.Hls (IdeState, SMethod (..), liftIO,
mkPluginTestDescriptor,
Expand Down
3 changes: 2 additions & 1 deletion ghcide-test/exe/SymlinkTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ module SymlinkTests (tests) where

import Control.Monad.IO.Class (liftIO)
import Development.IDE.Test (expectDiagnosticsWithTags)
import Language.LSP.Protocol.Types hiding (SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..), mkRange)
import Language.LSP.Test
Expand Down
3 changes: 2 additions & 1 deletion ghcide-test/exe/THTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import Development.IDE.GHC.Util
import Development.IDE.Test (expectCurrentDiagnostics,
expectDiagnostics,
expectNoMoreDiagnostics)
import Language.LSP.Protocol.Types hiding (SemanticTokenAbsolute (..),
import Language.LSP.Protocol.Types hiding (NormalizedFilePath,
SemanticTokenAbsolute (..),
SemanticTokenRelative (..),
SemanticTokensEdit (..), mkRange)
import Language.LSP.Test
Expand Down
Loading
Loading