Fix "module defined in multiple files" AGAIN!!!! #237
Merged
Conversation
This file contains 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
In #214, we had a situation where modules were loaded: ghci> :show targets Foo Bar Baz And then an eval comment in (e.g.) `Foo` causes the module to be added and explicitly interpreted by path: ghci> :add *src/Foo.hs Then, we have `Foo` loaded by name (`Foo`) and by path (`src/Foo.hs`), which triggers the dreaded bug. At the time I proposed this fix, correctly: > I think we can fix this by keeping track of how each module is added > to the session -- as a path or as a module name -- and then only using > that form going forward. I threaded some extra information to the `:show targets` parser to track if modules were listed as names or paths, **but then at the end of `Ghci::interpret_module` I would always insert the module into the target set as a `TargetKind::Path`,** meaning that the *next* time the comment was evaluated, the module would be loaded as a path, causing the error. https://github.com/MercuryTechnologies/ghciwatch/blob/dbba61bbdec9a86f97051b12647e51b7be4fd484/src/ghci/mod.rs#L698-L699 This fixes the bug and adds an `assert!` to fail faster and more obviously if it happens again.
9999years
added
the
module defined in multiple files
Gabriella439
approved these changes
May 16, 2024
| /// | ||
| /// This may either be a dotted module name like `My.Cool.Module` or a path like | ||
| /// `src/My/Cool/Module.hs`. | ||
| pub name: String, |
There was a problem hiding this comment.
Minor thing, but I think making the String a field for each of the Path and Module constructors for TargetKind would make it less likely to accidentally confuse the two types of Strings (i.e. using a module where a path was expected or vice versa). However, I realize that's a more extensive refactor
9999years
deleted the
rebeccat/dux-2298-fix-module-defined-in-multiple-files
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.
In #214, we had a situation where modules were loaded:
And then an eval comment in (e.g.)
Foocauses the module to be added and explicitly interpreted by path:Then, we have
Fooloaded by name (Foo) and by path (src/Foo.hs), which triggers the dreaded bug.At the time I proposed this fix, correctly:
I threaded some extra information to the
:show targetsparser to track if modules were listed as names or paths, but then at the end ofGhci::interpret_moduleI would always insert the module into the target set as aTargetKind::Path, meaning that the next time the comment was evaluated, the module would be loaded as a path, causing theerror.
ghciwatch/src/ghci/mod.rs
Lines 698 to 699 in dbba61b
This fixes the bug and adds an
assert!to fail faster and more obviously if it happens again.Prior art