Skip to content

Commit f51dc3c

Browse files
committed
Workaround for HLS not finding files while running template haskell
haskell/haskell-language-server#481
1 parent 7f1ffb7 commit f51dc3c

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

services/brig/brig.cabal

+1
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ library
203203
, errors >=1.4
204204
, exceptions >=0.5
205205
, extended
206+
, file-embed
206207
, file-embed-lzma
207208
, filepath >=1.3
208209
, fsnotify >=0.2

services/brig/package.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ library:
4848
- errors >=1.4
4949
- exceptions >=0.5
5050
- extended
51+
- file-embed
5152
- file-embed-lzma
5253
- filepath >=1.3
5354
- fsnotify >=0.2

services/brig/src/Brig/API/Public.hs

+4-3
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ import qualified Data.ByteString.Lazy.Char8 as LBS
7272
import Data.CommaSeparatedList (CommaSeparatedList (fromCommaSeparatedList))
7373
import Data.Containers.ListUtils (nubOrd)
7474
import Data.Domain
75+
import Data.FileEmbed
7576
import Data.Handle (Handle, parseHandle)
7677
import Data.Id as Id
7778
import qualified Data.Map.Strict as Map
@@ -146,7 +147,7 @@ swaggerDocsAPI (Just V2) =
146147
<> CannonAPI.swaggerDoc
147148
)
148149
& S.info . S.title .~ "Wire-Server API"
149-
& S.info . S.description ?~ $(embedText "docs/swagger.md") <> mempty
150+
& S.info . S.description ?~ $(embedText =<< makeRelativeToProject "docs/swagger.md")
150151
& S.security %~ nub
151152
-- sanitise definitions
152153
& S.definitions . traverse %~ sanitise
@@ -170,12 +171,12 @@ swaggerDocsAPI (Just V0) =
170171
swaggerSchemaUIServer
171172
. fromMaybe Aeson.Null
172173
. Aeson.decode
173-
$ $(embedLazyByteString "docs/swagger-v0.json")
174+
$ $(embedLazyByteString =<< makeRelativeToProject "docs/swagger-v0.json")
174175
swaggerDocsAPI (Just V1) =
175176
swaggerSchemaUIServer
176177
. fromMaybe Aeson.Null
177178
. Aeson.decode
178-
$ $(embedLazyByteString "docs/swagger-v1.json")
179+
$ $(embedLazyByteString =<< makeRelativeToProject "docs/swagger-v1.json")
179180
swaggerDocsAPI Nothing = swaggerDocsAPI (Just maxBound)
180181

181182
servantSitemap :: ServerT BrigAPI (Handler r)

0 commit comments

Comments
 (0)