Skip to content

Add bounds for Diff #1665

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

Merged
merged 2 commits into from
Apr 4, 2021
Merged

Add bounds for Diff #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36bf0ec
Add bounds for Diff
berberman Apr 4, 2021
b318eaa
Merge branch 'master' into diff-bounds
berberman Apr 4, 2021
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
2 changes: 1 addition & 1 deletion ghcide/ghcide.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ library
utf8-string,
vector,
hslogger,
Diff,
Diff ^>=0.4.0,
vector,
bytestring-encoding,
opentelemetry >=0.6.1,
Expand Down
37 changes: 22 additions & 15 deletions hls-plugin-api/hls-plugin-api.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ version: 1.1.0.0
synopsis: Haskell Language Server API for plugin communication
description:
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
homepage: https://github.com/haskell/haskell-language-server/hls-plugin-api

homepage:
https://github.com/haskell/haskell-language-server/hls-plugin-api

bug-reports: https://github.com/haskell/haskell-language-server/issues
license: Apache-2.0
license-file: LICENSE
Expand Down Expand Up @@ -32,38 +35,42 @@ library
Ide.PluginUtils
Ide.Types

hs-source-dirs: src
hs-source-dirs: src
build-depends:
, aeson
, base >=4.12 && <5
, containers
, data-default
, Diff
, lsp ^>=1.2.0
, dependent-map
, dependent-sum
, Diff ^>=0.4.0
, dlist
, hashable
, hslogger
, lens
, lsp ^>=1.2.0
, opentelemetry
, process
, regex-tdfa >=1.3.1.0
, shake >=0.17.5
, text
, unordered-containers
, dependent-map
, dependent-sum
, dlist
, opentelemetry

if os(windows)
build-depends:
Win32
build-depends: Win32

else
build-depends:
unix
build-depends: unix

ghc-options: -Wall -Wredundant-constraints -Wno-name-shadowing -Wno-unticked-promoted-constructors
ghc-options:
-Wall -Wredundant-constraints -Wno-name-shadowing
-Wno-unticked-promoted-constructors

if flag(pedantic)
ghc-options: -Werror

default-language: Haskell2010
default-extensions: DataKinds, KindSignatures, TypeOperators
default-language: Haskell2010
default-extensions:
DataKinds
KindSignatures
TypeOperators
9 changes: 4 additions & 5 deletions plugins/hls-eval-plugin/hls-eval-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ build-type: Simple
extra-source-files:
LICENSE
README.md
test/testdata/*.yaml
test/testdata/*.hs
test/testdata/*.cabal
test/testdata/*.expected
test/testdata/*.hs
test/testdata/*.lhs
test/testdata/*.cabal
test/testdata/*.yaml

flag pedantic
description: Enable -Werror
Expand Down Expand Up @@ -53,7 +53,7 @@ library
, base >=4.12 && <5
, containers
, deepseq
, Diff
, Diff ^>=0.4.0
, directory
, dlist
, extra
Expand Down Expand Up @@ -111,7 +111,6 @@ test-suite tests
build-tool-depends: hls-eval-plugin:test-server -any
hs-source-dirs: test
main-is: Main.hs

build-depends:
, aeson
, base
Expand Down
42 changes: 24 additions & 18 deletions plugins/hls-hlint-plugin/hls-hlint-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ cabal-version: 2.2
name: hls-hlint-plugin
version: 1.0.0.1
synopsis: Hlint integration plugin with Haskell Language Server
description: Please see Haskell Language Server Readme (https://github.com/haskell/haskell-language-server#readme)
description:
Please see Haskell Language Server Readme (https://github.com/haskell/haskell-language-server#readme)

license: Apache-2.0
license-file: LICENSE
author: The Haskell IDE Team
Expand All @@ -23,51 +25,55 @@ flag ghc-lib
Force dependency on ghc-lib-parser even if GHC API in the ghc package is supported

library
exposed-modules: Ide.Plugin.Hlint
hs-source-dirs: src
exposed-modules: Ide.Plugin.Hlint
hs-source-dirs: src
build-depends:
, aeson
, apply-refact >=0.9
, base >=4.12 && <5
, apply-refact >=0.9
, base >=4.12 && <5
, binary
, bytestring
, containers
, data-default
, deepseq
, Diff
, Diff ^>=0.4.0
, directory
, extra
, filepath
, ghc-exactprint >=0.6.3.4
, ghcide ^>= 1.1.0.0
, ghc-exactprint >=0.6.3.4
, ghcide ^>=1.1.0.0
, hashable
, lsp
, hlint >=3.2
, hls-plugin-api >= 1.0 && < 1.2
, hlint >=3.2
, hls-plugin-api >=1.0 && <1.2
, hslogger
, lens
, lsp
, regex-tdfa
, shake
, temporary
, text
, transformers
, unordered-containers

if (!flag(ghc-lib) && impl(ghc >=8.10.1) && impl(ghc <9.0.0))
build-depends: ghc ^>= 8.10
if ((!flag(ghc-lib) && impl(ghc >=8.10.1)) && impl(ghc <9.0.0))
build-depends: ghc ^>=8.10

else
build-depends:
, ghc
, ghc-lib ^>= 8.10.4.20210206
, ghc-lib-parser-ex ^>= 8.10
, ghc-lib ^>=8.10.4.20210206
, ghc-lib-parser-ex ^>=8.10

cpp-options: -DHLINT_ON_GHC_LIB

ghc-options: -Wall -Wredundant-constraints -Wno-name-shadowing -Wno-unticked-promoted-constructors
ghc-options:
-Wall -Wredundant-constraints -Wno-name-shadowing
-Wno-unticked-promoted-constructors

if flag(pedantic)
ghc-options: -Werror

default-language: Haskell2010
default-extensions: DataKinds, TypeOperators
default-language: Haskell2010
default-extensions:
DataKinds
TypeOperators