@@ -53,7 +53,11 @@ common common-deps
53
53
54
54
-- Default warnings in HLS
55
55
common warnings
56
- ghc-options : -Wall -Wredundant-constraints -Wno-name-shadowing -Wno-unticked-promoted-constructors
56
+ ghc-options : -Wall
57
+ -Wredundant-constraints
58
+ -Wunused-packages
59
+ -Wno-name-shadowing
60
+ -Wno-unticked-promoted-constructors
57
61
58
62
flag pedantic
59
63
description : Enable -Werror
@@ -430,7 +434,7 @@ flag importLens
430
434
manual : True
431
435
432
436
library hls-explicit-imports-plugin
433
- import : defaults, warnings, pedantic
437
+ import : defaults, warnings
434
438
exposed-modules : Ide.Plugin.ExplicitImports
435
439
hs-source-dirs : plugins/hls-explicit-imports-plugin/src
436
440
build-depends :
@@ -447,13 +451,12 @@ library hls-explicit-imports-plugin
447
451
, mtl
448
452
, text
449
453
, transformers
450
- , unordered-containers
451
454
452
455
default-extensions :
453
456
DataKinds
454
457
455
458
test-suite hls-explicit-imports-plugin-tests
456
- import : defaults, test-defaults, warnings
459
+ import : defaults, pedantic, test-defaults, warnings
457
460
type : exitcode-stdio-1.0
458
461
hs-source-dirs : plugins/hls-explicit-imports-plugin/test
459
462
main-is : Main.hs
@@ -490,8 +493,6 @@ library hls-rename-plugin
490
493
, base >= 4.12 && < 5
491
494
, containers
492
495
, extra
493
- , ghc
494
- , ghc-exactprint
495
496
, ghcide == 2.6.0.0
496
497
, hashable
497
498
, hiedb
@@ -538,15 +539,14 @@ common retrie
538
539
cpp-options : -Dhls_retrie
539
540
540
541
library hls-retrie-plugin
541
- import : defaults, warnings
542
+ import : defaults, warnings
542
543
exposed-modules : Ide.Plugin.Retrie
543
544
hs-source-dirs : plugins/hls-retrie-plugin/src
544
545
build-depends :
545
546
, aeson
546
547
, base >= 4.12 && < 5
547
548
, bytestring
548
549
, containers
549
- , deepseq
550
550
, directory
551
551
, extra
552
552
, ghc
@@ -574,7 +574,6 @@ test-suite hls-retrie-plugin-tests
574
574
hs-source-dirs : plugins/hls-retrie-plugin/test
575
575
main-is : Main.hs
576
576
build-depends :
577
- , aeson
578
577
, base
579
578
, containers
580
579
, filepath
@@ -814,7 +813,7 @@ common splice
814
813
cpp-options : -Dhls_splice
815
814
816
815
library hls-splice-plugin
817
- import : defaults, warnings
816
+ import : defaults, pedantic, warnings
818
817
exposed-modules :
819
818
Ide.Plugin.Splice
820
819
Ide.Plugin.Splice.Types
@@ -823,8 +822,6 @@ library hls-splice-plugin
823
822
build-depends :
824
823
, aeson
825
824
, base >= 4.12 && < 5
826
- , containers
827
- , dlist
828
825
, extra
829
826
, foldl
830
827
, ghc
@@ -835,18 +832,16 @@ library hls-splice-plugin
835
832
, lens
836
833
, lsp
837
834
, mtl
838
- , retrie
839
835
, syb
840
836
, text
841
837
, transformers
842
838
, unliftio-core
843
- , unordered-containers
844
839
845
840
default-extensions :
846
841
DataKinds
847
842
848
843
test-suite hls-splice-plugin-tests
849
- import : defaults, test-defaults, warnings
844
+ import : defaults, pedantic, test-defaults, warnings
850
845
type : exitcode-stdio-1.0
851
846
hs-source-dirs : plugins/hls-splice-plugin/test
852
847
main-is : Main.hs
@@ -933,22 +928,17 @@ common qualifyImportedNames
933
928
cpp-options : -Dhls_qualifyImportedNames
934
929
935
930
library hls-qualify-imported-names-plugin
936
- import : defaults, warnings
931
+ import : defaults, pedantic , warnings
937
932
exposed-modules : Ide.Plugin.QualifyImportedNames
938
933
hs-source-dirs : plugins/hls-qualify-imported-names-plugin/src
939
934
build-depends :
940
- , aeson
941
935
, base >= 4.12 && < 5
942
936
, containers
943
- , deepseq
944
- , ghc
945
937
, ghcide == 2.6.0.0
946
- , hls-graph
947
938
, hls-plugin-api == 2.6.0.0
948
939
, lens
949
940
, lsp
950
941
, text
951
- , unordered-containers
952
942
, dlist
953
943
, transformers
954
944
@@ -1558,7 +1548,7 @@ common semanticTokens
1558
1548
cpp-options : -Dhls_semanticTokens
1559
1549
1560
1550
library hls-semantic-tokens-plugin
1561
- import : defaults, warnings
1551
+ import : defaults, pedantic , warnings
1562
1552
buildable : True
1563
1553
exposed-modules :
1564
1554
Ide.Plugin.SemanticTokens
@@ -1573,20 +1563,16 @@ library hls-semantic-tokens-plugin
1573
1563
1574
1564
hs-source-dirs : plugins/hls-semantic-tokens-plugin/src
1575
1565
build-depends :
1576
- , aeson
1577
1566
, base >= 4.12 && < 5
1578
1567
, containers
1579
1568
, extra
1580
- , hiedb
1581
1569
, text-rope
1582
1570
, mtl >= 2.2
1583
1571
, ghcide == 2.6.0.0
1584
1572
, hls-plugin-api == 2.6.0.0
1585
1573
, lens
1586
1574
, lsp >= 2.3
1587
- , sqlite-simple
1588
1575
, text
1589
- , unordered-containers
1590
1576
, transformers
1591
1577
, bytestring
1592
1578
, syb
@@ -1599,7 +1585,7 @@ library hls-semantic-tokens-plugin
1599
1585
default-extensions : DataKinds
1600
1586
1601
1587
test-suite hls-semantic-tokens-plugin-tests
1602
- import : defaults, test-defaults, warnings
1588
+ import : defaults, pedantic, test-defaults, warnings
1603
1589
type : exitcode-stdio-1.0
1604
1590
hs-source-dirs : plugins/hls-semantic-tokens-plugin/test
1605
1591
main-is : Main.hs
@@ -1608,7 +1594,6 @@ test-suite hls-semantic-tokens-plugin-tests
1608
1594
, aeson
1609
1595
, base
1610
1596
, containers
1611
- , extra
1612
1597
, filepath
1613
1598
, haskell-language-server :hls-semantic-tokens-plugin
1614
1599
, hls-test-utils == 2.6.0.0
@@ -1621,10 +1606,8 @@ test-suite hls-semantic-tokens-plugin-tests
1621
1606
, lsp-test
1622
1607
, text
1623
1608
, data-default
1624
- , bytestring
1625
1609
, ghcide == 2.6.0.0
1626
1610
, hls-plugin-api == 2.6.0.0
1627
- , template-haskell
1628
1611
, data-default
1629
1612
1630
1613
-----------------------------
@@ -1675,26 +1658,15 @@ library
1675
1658
autogen-modules : Paths_haskell_language_server
1676
1659
hs-source-dirs : src
1677
1660
build-depends :
1678
- , async
1679
- , base16-bytestring
1680
- , bytestring
1681
- , containers
1682
- , cryptohash-sha1
1683
1661
, data-default
1684
1662
, ghc
1685
1663
, ghcide == 2.6.0.0
1686
1664
, githash >= 0.1.6.1
1687
- , lsp >= 2.3.0.0
1688
1665
, hie-bios
1689
- , hiedb
1690
1666
, hls-plugin-api == 2.6.0.0
1691
1667
, optparse-applicative
1692
1668
, optparse-simple
1693
1669
, process
1694
- , hls-graph
1695
- , safe-exceptions
1696
- , sqlite-simple
1697
- , unordered-containers
1698
1670
, aeson-pretty
1699
1671
1700
1672
default-extensions : DataKinds
@@ -1728,36 +1700,9 @@ executable haskell-language-server
1728
1700
ghc-options : -dynamic
1729
1701
1730
1702
build-depends :
1731
- , aeson
1732
- , async
1733
- , base16-bytestring
1734
- , binary
1735
- , bytestring
1736
- , containers
1737
- , cryptohash-sha1
1738
- , deepseq
1739
- , ghc
1740
- , ghc-boot-th
1741
- , ghcide
1742
- , hashable
1743
1703
, haskell-language-server
1744
1704
, lsp
1745
- , hie-bios
1746
- , hiedb
1747
- , lens
1748
- , regex-tdfa
1749
- , optparse-applicative
1750
1705
, hls-plugin-api
1751
- , lens
1752
- , mtl
1753
- , regex-tdfa
1754
- , safe-exceptions
1755
- , hls-graph
1756
- , sqlite-simple
1757
- , stm
1758
- , temporary
1759
- , transformers
1760
- , unordered-containers
1761
1706
1762
1707
default-extensions : DataKinds
1763
1708
@@ -1781,18 +1726,12 @@ executable haskell-language-server-wrapper
1781
1726
build-depends :
1782
1727
, data-default
1783
1728
, ghc
1784
- , ghc-paths
1785
1729
, ghcide
1786
- , gitrev
1787
1730
, haskell-language-server
1788
1731
, hie-bios
1789
1732
, hls-plugin-api
1790
1733
, lsp
1791
1734
, lsp-types
1792
- , mtl
1793
- , optparse-applicative
1794
- , optparse-simple
1795
- , process
1796
1735
, transformers
1797
1736
, unliftio-core
1798
1737
if !os(windows)
@@ -1816,11 +1755,9 @@ test-suite func-test
1816
1755
1817
1756
build-depends :
1818
1757
, bytestring
1819
- , data-default
1820
1758
, deepseq
1821
1759
, hashable
1822
1760
, lens
1823
- , lens-aeson
1824
1761
, ghcide
1825
1762
, ghcide-test-utils
1826
1763
, hls-test-utils == 2.6.0.0
@@ -1830,7 +1767,6 @@ test-suite func-test
1830
1767
, lsp-test
1831
1768
, containers
1832
1769
, unordered-containers
1833
- , row-types
1834
1770
1835
1771
hs-source-dirs : test/functional test/utils
1836
1772
@@ -1859,7 +1795,8 @@ test-suite func-test
1859
1795
cpp-options : -Dhls_ormolu
1860
1796
1861
1797
test-suite wrapper-test
1862
- import : defaults, common-deps
1798
+ import : defaults
1799
+ , common-deps
1863
1800
, warnings
1864
1801
, pedantic
1865
1802
type : exitcode-stdio-1.0
@@ -1901,7 +1838,6 @@ benchmark benchmark
1901
1838
hls-plugin-api,
1902
1839
lens,
1903
1840
lens-aeson,
1904
- optparse-applicative,
1905
1841
shake,
1906
1842
shake-bench == 0.2. *,
1907
1843
yaml
0 commit comments