Fix problems reporting errors between multiple files #1224
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
konnov
approved these changes
Oct 20, 2023
quint/src/repl.ts
Outdated
| @@ -625,10 +629,21 @@ function printErrorMessages( | |||
| const modulesText = state.moduleHist + inputText | |||
| const messages = errors.map(mkErrorMessage(state.compilationState.sourceMap)) | |||
| // display the error messages and highlight the error places | |||
| // FIXME: moudulesText can come from multiple files, but `compileFromCode` ignores that. | |||
There was a problem hiding this comment.
maybe open an issue on that?
quint/src/runtime/compile.ts
Outdated
| @@ -276,7 +279,9 @@ export function compileFromCode( | |||
| rand: (bound: bigint) => bigint | |||
| ): CompilationContext { | |||
| // parse the module text | |||
| const { modules, table, sourceMap, errors } = parse(idGen, '<module_input>', mainPath, code) | |||
| // FIXME: We should build a proper sourceCode map from the files we previously loaded | |||
There was a problem hiding this comment.
Both should be fixed with #1052, but I'll make sure to add this additional requirement there!
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.
Hello
This fixes #1199 and fixes #1174 both on CLI and language server.
Instead of keeping the source code as a string, we have to keep it as a map from filenames to file content. We then use this map to properly report errors.
CHANGELOG.mdfor any new functionalityREADME.mdupdated for any listed functionality