Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 14 additions & 8 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.19.20251105
# version: 0.19.20260331
#
# REGENDATA ("0.19.20251105",["github","--config=cabal.haskell-ci","cabal.project"])
# REGENDATA ("0.19.20260331",["github","--config=cabal.haskell-ci","cabal.project"])
#
name: Haskell-CI
on:
Expand All @@ -23,6 +23,8 @@ on:
merge_group:
branches:
- master
workflow_dispatch:
{}
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand All @@ -35,19 +37,19 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.12.2
- compiler: ghc-9.14.1
compilerKind: ghc
compilerVersion: 9.12.2
compilerVersion: 9.14.1
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.10.3
- compiler: ghc-9.12.4
compilerKind: ghc
compilerVersion: 9.10.3
compilerVersion: 9.12.4
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.8.4
- compiler: ghc-9.10.3
compilerKind: ghc
compilerVersion: 9.8.4
compilerVersion: 9.10.3
setup-method: ghcup
allow-failure: false
fail-fast: false
Expand Down Expand Up @@ -171,6 +173,10 @@ jobs:
echo "package ghc-tags" >> cabal.project
echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project
cat >> cabal.project <<EOF
allow-newer: *:base
allow-newer: *:template-haskell
allow-newer: *:containers
allow-newer: *:time
EOF
cat cabal.project
cat cabal.project.local
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# ghc-tags-1.11 (2026-??-??)
* Add support for GHC 9.14 and drop support for GHC 9.8.

# ghc-tags-1.10 (2025-11-19)
* Add support for GHC 9.12 and drop support for GHC 9.6.

Expand Down
6 changes: 6 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
packages: .

-- GHC 9.14
allow-newer: *:base
, *:containers
, *:template-haskell
, *:time
10 changes: 5 additions & 5 deletions ghc-tags.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: ghc-tags
version: 1.10
version: 1.11
synopsis: Utility for generating ctags and etags with GHC API.
description: Utility for generating etags (Emacs) and ctags (Vim and other
editors) with GHC API for efficient project navigation.
Expand All @@ -14,7 +14,7 @@ extra-source-files: CHANGELOG.md
README.md
homepage: https://github.com/arybczak/ghc-tags
bug-reports: https://github.com/arybczak/ghc-tags/issues
tested-with: GHC == { 9.8.4, 9.10.3, 9.12.2 }
tested-with: GHC == { 9.10.3, 9.12.4, 9.14.1 }

source-repository head
type: git
Expand All @@ -28,12 +28,12 @@ flag ghc-lib
executable ghc-tags
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-A4m

if !flag(ghc-lib) && impl(ghc == 9.12.*)
if !flag(ghc-lib) && impl(ghc == 9.14.*)
build-depends: ghc, ghc-boot
else
build-depends: ghc-lib == 9.12.*
build-depends: ghc-lib == 9.14.*

build-depends: base >=4.19 && <4.22
build-depends: base >=4.20 && <4.23
, aeson >= 2.0.0.0
, async >= 2.2.5
, attoparsec
Expand Down
13 changes: 8 additions & 5 deletions src/GhcTags/Ghc.hs
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@ hsDeclsToGhcTags mies = foldr go []
mkHsConDeclGADTDetails decLoc tyName (RecConGADT _ (L _ fields)) =
foldr f [] fields
where
f :: LConDeclField GhcPs -> [GhcTag] -> [GhcTag]
f (L _ ConDeclField { cd_fld_names }) ts = ts ++ map g cd_fld_names
f :: LHsConDeclRecField GhcPs -> [GhcTag] -> [GhcTag]
f (L _ HsConDeclRecField { cdrf_names }) ts = ts ++ map g cdrf_names

g :: LFieldOcc GhcPs -> GhcTag
g (L _ FieldOcc { foLabel }) =
Expand All @@ -415,8 +415,8 @@ hsDeclsToGhcTags mies = foldr go []
mkHsConDeclH98Details decLoc tyName (RecCon (L _ fields)) =
foldr f [] fields
where
f :: LConDeclField GhcPs -> [GhcTag] -> [GhcTag]
f (L _ ConDeclField { cd_fld_names }) ts = ts ++ map g cd_fld_names
f :: LHsConDeclRecField GhcPs -> [GhcTag] -> [GhcTag]
f (L _ HsConDeclRecField { cdrf_names }) ts = ts ++ map g cdrf_names

g :: LFieldOcc GhcPs -> GhcTag
g (L _ FieldOcc { foLabel }) =
Expand Down Expand Up @@ -450,7 +450,9 @@ hsDeclsToGhcTags mies = foldr go []
PatSynBind _ PSB { psb_id, psb_args } ->
mkGhcTag' decLoc psb_id GtkPatternSynonym : case psb_args of
RecCon fields ->
let fldLabel = foLabel . recordPatSynField
let fldLabel fld = case recordPatSynField fld of
FieldOcc _ label -> label
XFieldOcc _ -> error "can't happen"
in map (\fld -> mkGhcTag' decLoc (fldLabel fld) GtkRecordField) fields
_ -> []

Expand Down Expand Up @@ -479,6 +481,7 @@ hsDeclsToGhcTags mies = foldr go []
mkSigTags _ InlineSig {} = []
-- SPECIALISE pragmas
mkSigTags _ SpecSig {} = []
mkSigTags _ SpecSigE {} = []
mkSigTags _ SpecInstSig {} = []
-- MINIMAL pragma
mkSigTags _ MinimalSig {} = []
Expand Down
6 changes: 6 additions & 0 deletions src/GhcTags/GhcCompat.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import GHC.Settings.Config
import GHC.Settings.Utils
import GHC.SysTools.BaseDir
import GHC.Types.SrcLoc
import GHC.Unit.Types
import GHC.Utils.Fingerprint
import GHC.Utils.TmpFs
import System.Directory
Expand Down Expand Up @@ -169,6 +170,11 @@ compatInitSettings top_dir = do
, fileSettings_globalPackageDatabase = globalpkgdb_path
}

, sUnitSettings = UnitSettings
{
unitSettings_baseUnitId = stringToUnitId ""
}

, sToolSettings = ToolSettings
{ toolSettings_ldSupportsCompactUnwind = ldSupportsCompactUnwind
, toolSettings_ldSupportsFilelist = ldSupportsFilelist
Expand Down
Loading