Skip to content

Commit eadd01c

Browse files
authored
Merge branch 'master' into enable-win-tests
2 parents 11c62bb + 2474e7c commit eadd01c

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

.github/workflows/test.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,15 @@ jobs:
138138
sed -i.bak -e 's/Paths_haskell_language_server/Paths_hls/g' \
139139
src/**/*.hs exe/*.hs
140140
141+
# this is only safe if the test environment is isolated
142+
- name: setup ide cache
143+
run: |
144+
export XDG_CACHE_HOME=$RUNNER_TEMP/cache
145+
rm -rf ~/.cache/ghcide
146+
rm -rf ~/.cache/hie-bios
147+
rm -rf $XDG_CACHE_HOME/ghcide
148+
rm -rf $XDG_CACHE_HOME/hie-bios
149+
141150
- if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
142151
name: Build
143152
# Retry it three times to workaround compiler segfaults in windows

ghcide/src/Development/IDE/Main.hs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ import GHC.IO.Handle (hDuplicate)
8686
import HIE.Bios.Cradle (findCradle)
8787
import qualified HieDb.Run as HieDb
8888
import Ide.Plugin.Config (CheckParents (NeverCheck),
89-
Config,
89+
Config, checkParents,
90+
checkProject,
9091
getConfigFromNotification)
9192
import Ide.Plugin.ConfigUtils (pluginsToDefaultConfig,
9293
pluginsToVSCodeExtensionSchema)
@@ -193,7 +194,10 @@ defaultArguments priority = Arguments
193194
, argsGhcidePlugin = mempty
194195
, argsHlsPlugins = pluginDescToIdePlugins Ghcide.descriptors
195196
, argsSessionLoadingOptions = def
196-
, argsIdeOptions = const defaultIdeOptions
197+
, argsIdeOptions = \config ghcSession -> (defaultIdeOptions ghcSession)
198+
{ optCheckProject = pure $ checkProject config
199+
, optCheckParents = pure $ checkParents config
200+
}
197201
, argsLspOptions = def {LSP.completionTriggerCharacters = Just "."}
198202
, argsDefaultHlsConfig = def
199203
, argsGetHieDbLoc = getHieDbLoc

0 commit comments

Comments
 (0)