haddock/hscolour: fix highlighted source location #3452
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Oops, seems like this still has a small bug. Please don't merge yet. |
|
Fixed, should be ready to merge now. |
|
@bennofs Apparently, this breaks the test suite. Can you look into that? |
| @@ -48,12 +49,18 @@ import System.FilePath ((</>), (<.>)) | |||
| srcPref :: FilePath -> FilePath | |||
| srcPref distPref = distPref </> "src" | |||
|
|
|||
| hscolourPref :: FilePath -> PackageDescription -> FilePath | |||
| data PathMode = ForDistribution | ForDevelopment | |||
|
If |
|
Alright, that is a good idea. I'll do that. |
When generating haddocks with the `--for-hackage` switch, the generated haddocks are placed in a different directory than the normal ones, which includes the package id instead of just the package name. When we ran hscolour, we didn't respect this, so the highlighted source would not be placed in the correct directory and thus was missing from the tarball. This patch fixes that. Fixes haskell#3451
|
Finally got around to finish this up. Should be ready now. |
|
Merged, thanks! |
23Skidoo
added a commit
that referenced
this pull request
Oct 8, 2016
Backport #3452 to the 1.24 branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When generating haddocks with the
--for-hackageswitch, the generatedhaddocks are placed in a different directory than the normal ones, which
includes the package id instead of just the package name. When we ran
hscolour, we didn't respect this, so the highlighted source would not
be placed in the correct directory and thus was missing from the tarball.
This patch fixes that.
Fixes #3451