haskell/haskell-language-server
1
1
Fork 0
mirror of https://github.com/haskell/haskell-language-server.git synced 2024-07-07 03:36:29 +03:00
Code Issues Projects Releases Wiki Activity

Fix loss of 9.2 GHC version

Browse Source
This commit is contained in:
Michael Peyton Jones 2024-06-19 17:29:08 +01:00
parent 512fa5c305
commit e217112604
12 changed files with 11 additions and 1200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ghcide/test/exe/CompletionTests.hs
View File

@ -276,7 +276,6 @@ nonLocalCompletionTests =
where
brokenForWinGhc = knownBrokenOnWindows "Windows has strange things in scope for some reason"
brokenForWinOldGhc =
knownBrokenInSpecificEnv [HostOS Windows, GhcVer GHC92] "Windows (GHC == 9.2) has strange things in scope for some reason"
. knownBrokenInSpecificEnv [HostOS Windows, GhcVer GHC94] "Windows (GHC == 9.4) has strange things in scope for some reason"
. knownBrokenInSpecificEnv [HostOS Windows, GhcVer GHC96] "Windows (GHC == 9.6) has strange things in scope for some reason"
. knownBrokenInSpecificEnv [HostOS Windows, GhcVer GHC98] "Windows (GHC == 9.8) has strange things in scope for some reason"

6
ghcide/test/exe/CradleTests.hs
View File

@ -41,11 +41,9 @@ tests = testGroup "cradle"
,testGroup "ignore-fatal" [ignoreFatalWarning]
,testGroup "loading" [loadCradleOnlyonce, retryFailedCradle]
,testGroup "multi" (multiTests "multi")
,ignoreForGhcVersions [GHC92] "multiple units not supported on 9.2"
$ testGroup "multi-unit" (multiTests "multi-unit")
,testGroup "multi-unit" (multiTests "multi-unit")
,testGroup "sub-directory" [simpleSubDirectoryTest]
,ignoreForGhcVersions [GHC92] "multiple units not supported on 9.2"
$ testGroup "multi-unit-rexport" [multiRexportTest]
,testGroup "multi-unit-rexport" [multiRexportTest]
]
loadCradleOnlyonce :: TestTree

2
hie-compat/hie-compat.cabal
View File

@ -35,7 +35,5 @@ library
Compat.HieDebug
Compat.HieUtils
if (impl(ghc >= 9.2) && impl(ghc < 9.3))
hs-source-dirs: src-ghc92 src-reexport-ghc9
if (impl(ghc >= 9.4))
hs-source-dirs: src-reexport-ghc92

2
plugins/hls-change-type-signature-plugin/test/Main.hs
View File

@ -39,7 +39,7 @@ test :: TestTree
test = testGroup "changeTypeSignature" [
testRegexes
, codeActionTest "TExpectedActual" 4 11
, knownBrokenForGhcVersions [GHC92 .. GHC910] "Error Message in 9.2+ does not provide enough info" $
, knownBrokenForGhcVersions [GHC94 .. GHC910] "Error Message in 9.2+ does not provide enough info" $
codeActionTest "TRigidType" 4 14
, codeActionTest "TRigidType2" 4 6
, codeActionTest "TLocalBinding" 7 22

1
plugins/hls-eval-plugin/test/Main.hs
View File

@ -133,7 +133,6 @@ tests =
GHC98 -> "ghc98.expected"
GHC96 -> "ghc96.expected"
GHC94 -> "ghc94.expected"
GHC92 -> "ghc92.expected"
, goldenWithEval "Prelude has no special treatment, it is imported as stated in the module" "TPrelude" "hs"
, goldenWithEval "Don't panic on {-# UNPACK #-} pragma" "TUNPACK" "hs"
, goldenWithEval "Can handle eval inside nested comment properly" "TNested" "hs"

6
plugins/hls-eval-plugin/test/testdata/TPropertyError.ghc92.expected.hs vendored
View File

@ -1,6 +0,0 @@
-- Support for property checking
module TProperty where
-- prop> \(l::[Bool]) -> head l
-- *** Failed! Exception: 'Prelude.head: empty list' (after 1 test):
-- []

10
plugins/hls-refactor-plugin/test/Main.hs
View File

@ -1347,8 +1347,7 @@ extendImportTests = testGroup "extend import actions"
, "b :: A"
, "b = ConstructorFoo"
])
, brokenForGHC92 "On GHC 9.2, the error doesn't contain \"perhaps you want ...\" part from which import suggestion can be extracted." $
testSession "extend single line import in presence of extra parens" $ template
, testSession "extend single line import in presence of extra parens" $ template
[]
("Main.hs", T.unlines
[ "import Data.Monoid (First)"
@ -1534,7 +1533,7 @@ extendImportTests = testGroup "extend import actions"
, "import A (pattern Some)"
, "k (Some x) = x"
])
, ignoreForGhcVersions [GHC92, GHC94] "Diagnostic message has no suggestions" $
, ignoreForGhcVersions [GHC94] "Diagnostic message has no suggestions" $
testSession "type constructor name same as data constructor name" $ template
[("ModuleA.hs", T.unlines
[ "module ModuleA where"
@ -3222,7 +3221,7 @@ exportUnusedTests = testGroup "export unused actions"
]
(R 2 0 2 11)
"Export ‘bar’"
, ignoreForGhcVersions [GHC92, GHC94] "Diagnostic message has no suggestions" $
, ignoreForGhcVersions [GHC94] "Diagnostic message has no suggestions" $
testSession "type is exported but not the constructor of same name" $ templateNoAction
[ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
, "module A (Foo) where"
@ -3850,6 +3849,3 @@ withTempDir f = System.IO.Extra.withTempDir $ \dir ->
brokenForGHC94 :: String -> TestTree -> TestTree
brokenForGHC94 = knownBrokenForGhcVersions [GHC94]
brokenForGHC92 :: String -> TestTree -> TestTree
brokenForGHC92 = knownBrokenForGhcVersions [GHC92]

9
plugins/hls-rename-plugin/test/Main.hs
View File

@ -30,8 +30,7 @@ tests = testGroup "Rename"
rename doc (Position 0 15) "Op"
, goldenWithRename "Exported function" "ExportedFunction" $ \doc ->
rename doc (Position 2 1) "quux"
, ignoreForGhcVersions [GHC92] recordConstructorIssue $
goldenWithRename "Field Puns" "FieldPuns" $ \doc ->
, goldenWithRename "Field Puns" "FieldPuns" $ \doc ->
rename doc (Position 7 13) "bleh"
, goldenWithRename "Function argument" "FunctionArgument" $ \doc ->
rename doc (Position 3 4) "y"
@ -45,8 +44,7 @@ tests = testGroup "Rename"
rename doc (Position 3 8) "baz"
, goldenWithRename "Import hiding" "ImportHiding" $ \doc ->
rename doc (Position 0 22) "hiddenFoo"
, ignoreForGhcVersions [GHC92] recordConstructorIssue $
goldenWithRename "Indirect Puns" "IndirectPuns" $ \doc ->
, goldenWithRename "Indirect Puns" "IndirectPuns" $ \doc ->
rename doc (Position 4 23) "blah"
, goldenWithRename "Let expression" "LetExpression" $ \doc ->
rename doc (Position 5 11) "foobar"
@ -58,8 +56,7 @@ tests = testGroup "Rename"
rename doc (Position 3 12) "baz"
, goldenWithRename "Realigns do block indentation" "RealignDo" $ \doc ->
rename doc (Position 0 2) "fooBarQuux"
, ignoreForGhcVersions [GHC92] recordConstructorIssue $
goldenWithRename "Record field" "RecordField" $ \doc ->
, goldenWithRename "Record field" "RecordField" $ \doc ->
rename doc (Position 6 9) "number"
, goldenWithRename "Shadowed name" "ShadowedName" $ \doc ->
rename doc (Position 1 1) "baz"

3
plugins/hls-semantic-tokens-plugin/test/SemanticTokensTest.hs
View File

@ -264,9 +264,8 @@ semanticTokensTests =
goldenWithSemanticTokensWithDefaultConfig "type family" "TTypefamily",
goldenWithSemanticTokensWithDefaultConfig "TUnicodeSyntax" "TUnicodeSyntax",
goldenWithSemanticTokensWithDefaultConfig "TQualifiedName" "TQualifiedName"
goldenWithSemanticTokensWithDefaultConfig "TDoc" "TDoc"
]
-- not supported in ghc92
++ [goldenWithSemanticTokensWithDefaultConfig "TDoc" "TDoc" | ghcVersion > GHC92]
semanticTokensDataTypeTests :: TestTree
semanticTokensDataTypeTests =

2
test/functional/Main.hs
View File

@ -12,7 +12,7 @@ main :: IO ()
main = defaultTestRunner $ testGroup "haskell-language-server"
[ Config.tests
, ConfigSchema.tests
, ignoreInEnv [HostOS Windows, GhcVer GHC92] "Tests gets stuck in ci" $ Format.tests
, ignoreInEnv [HostOS Windows] "Tests gets stuck in ci" $ Format.tests
, FunctionalBadProject.tests
, HieBios.tests
, ignoreInEnv [HostOS Windows] "Tests gets stuck in ci" $ Progress.tests

153
test/testdata/schema/ghc92/default-config.golden.json vendored
View File

@ -1,153 +0,0 @@
{
"cabalFormattingProvider": "cabal-gild",
"checkParents": "CheckOnSave",
"checkProject": true,
"formattingProvider": "ormolu",
"maxCompletions": 40,
"plugin": {
"alternateNumberFormat": {
"globalOn": true
},
"cabal": {
"codeActionsOn": true,
"completionOn": true,
"diagnosticsOn": true
},
"cabal-fmt": {
"config": {
"path": "cabal-fmt"
}
},
"cabal-gild": {
"config": {
"path": "cabal-gild"
}
},
"callHierarchy": {
"globalOn": true
},
"changeTypeSignature": {
"globalOn": true
},
"class": {
"codeActionsOn": true,
"codeLensOn": true
},
"eval": {
"config": {
"diff": true,
"exception": false
},
"globalOn": true
},
"explicit-fields": {
"globalOn": true
},
"explicit-fixity": {
"globalOn": true
},
"fourmolu": {
"config": {
"external": false,
"path": "fourmolu"
}
},
"gadt": {
"globalOn": true
},
"ghcide-code-actions-bindings": {
"globalOn": true
},
"ghcide-code-actions-fill-holes": {
"globalOn": true
},
"ghcide-code-actions-imports-exports": {
"globalOn": true
},
"ghcide-code-actions-type-signatures": {
"globalOn": true
},
"ghcide-completions": {
"config": {
"autoExtendOn": true,
"snippetsOn": true
},
"globalOn": true
},
"ghcide-hover-and-symbols": {
"hoverOn": true,
"symbolsOn": true
},
"ghcide-type-lenses": {
"config": {
"mode": "always"
},
"globalOn": true
},
"hlint": {
"codeActionsOn": true,
"config": {
"flags": []
},
"diagnosticsOn": true
},
"importLens": {
"codeActionsOn": true,
"codeLensOn": true
},
"moduleName": {
"globalOn": true
},
"ormolu": {
"config": {
"external": false
}
},
"overloaded-record-dot": {
"globalOn": true
},
"pragmas-completion": {
"globalOn": true
},
"pragmas-disable": {
"globalOn": true
},
"pragmas-suggest": {
"globalOn": true
},
"qualifyImportedNames": {
"globalOn": true
},
"rename": {
"config": {
"crossModule": false
},
"globalOn": true
},
"retrie": {
"globalOn": true
},
"semanticTokens": {
"config": {
"classMethodToken": "method",
"classToken": "class",
"dataConstructorToken": "enumMember",
"functionToken": "function",
"moduleToken": "namespace",
"operatorToken": "operator",
"patternSynonymToken": "macro",
"recordFieldToken": "property",
"typeConstructorToken": "enum",
"typeFamilyToken": "interface",
"typeSynonymToken": "type",
"typeVariableToken": "typeParameter",
"variableToken": "variable"
},
"globalOn": false
},
"splice": {
"globalOn": true
}
},
"sessionLoading": "singleComponent"
}

1016
test/testdata/schema/ghc92/vscode-extension-schema.golden.json vendored
View File

File diff suppressed because it is too large Load Diff