Skip to content

Treat Dict from nvim --api-info as Dictionary #122

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
saep merged 1 commit into from
Mar 21, 2025
Merged

Treat Dict from nvim --api-info as Dictionary #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file added apiblobs/0.11.0-nightly.msgpack
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions nvim-hs.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ extra-source-files: test-files/hello
, apiblobs/0.5.0.msgpack
, apiblobs/0.6.1.msgpack
, apiblobs/0.8.0.msgpack
, apiblobs/0.10.4.msgpack
, apiblobs/0.11.0-nightly.msgpack
, api

extra-doc-files: CHANGELOG.md
Expand Down
3 changes: 3 additions & 0 deletions src/Neovim/API/TH.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
, ("Float", [t|Double|])
, ("String", [t|String|])
, ("Array", [t|[Object]|])
, ("Dict", [t|Map String Object|])
, ("Dictionary", [t|Map String Object|])
, ("void", [t|()|])
]
Expand All @@ -123,6 +124,7 @@
adjustTypeMapForText =
Map.insert "String" [t|Text|]
. Map.insert "Array" [t|Vector Object|]
. Map.insert "Dict" [t|Map Text Object|]
. Map.insert "Dictionary" [t|Map Text Object|]

bytestringVectorTypeMap :: TypeMap
Expand All @@ -134,6 +136,7 @@
adjustTypeMapForByteString =
Map.insert "String" [t|ByteString|]
. Map.insert "Array" [t|Vector Object|]
. Map.insert "Dict" [t|Map ByteString Object|]
. Map.insert "Dictionary" [t|Map ByteString Object|]

apiTypeToHaskellType :: TypeMap -> NeovimType -> Q Type
Expand Down Expand Up @@ -412,7 +415,7 @@
case argTypes of
(CommandArgumentsType : _) -> return ()
_ -> error "First argument for a function exported as a command must be CommandArguments!"
let nargs = case tail argTypes of

Check warning on line 418 in src/Neovim/API/TH.hs

View workflow job for this annotation

GitHub Actions / cabal_test: ghc-9.8 

In the use of ‘tail’

Check warning on line 418 in src/Neovim/API/TH.hs

View workflow job for this annotation

GitHub Actions / cabal_test: ghc-9.10 

In the use of ‘tail’
[] -> [|CmdNargs "0"|]
[StringyType] -> [|CmdNargs "1"|]
[Optional StringyType] -> [|CmdNargs "?"|]
Expand Down
Loading