Skip to content
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.

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

Enable highlight unittests #656

Merged

Conversation

peterwicksstringfield
Copy link
Contributor

@peterwicksstringfield peterwicksstringfield commented Dec 8, 2020

Well, the one highlight unit test.

This PR has a commit in common with #657 . This shared commit moves some utility functions. Leave comments wherever is convenient. Merging both PRs will not produce a merge conflict, nor will it duplicate the commit.

@jneira
Copy link
Member

jneira commented Dec 8, 2020

stack is being more strict than cabal:

Progress 8/10: haskell-language-server haskell-language-server    > /root/build/test/utils/Test/Hls/Util.hs:320:11: error: [-Wname-shadowing, -Werror=name-shadowing]
Progress 8/10: haskell-language-server haskell-language-server    >     This binding for ‘pred’ shadows the existing binding
Progress 8/10: haskell-language-server haskell-language-server    >       imported from ‘Prelude’ at test/utils/Test/Hls/Util.hs:2:8-20
Progress 8/10: haskell-language-server haskell-language-server    >       (and originally defined in ‘GHC.Enum’)
Progress 8/10: haskell-language-server haskell-language-server    >     |
Progress 8/10: haskell-language-server haskell-language-server    > 320 |     where pred (CACodeAction ca) = all (`T.isInfixOf` (ca ^. L.title)) s
Progress 8/10: haskell-language-server haskell-language-server    >     |           ^^^^
Progress 8/10: haskell-language-server haskell-language-server    > 

@jneira
Copy link
Member

jneira commented Dec 9, 2020

I am afraid that there is a small conflict

@peterwicksstringfield
Copy link
Contributor Author

Should be fixed whenever CI finishes.

Copy link
Member

@jneira jneira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks once again 😃

@peterwicksstringfield
Copy link
Contributor Author

:). Thank you for reviewing changes and helping me merge things. HLS is a cool project and I am glad to be able to contribute to it.

@jneira jneira merged commit cc4a51a into haskell:master Dec 9, 2020
@peterwicksstringfield peterwicksstringfield deleted the enable_highlight_unittests branch December 9, 2020 21:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants