Fix output format detection #1079
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
added 4 commits
November 5, 2021 12:15
Followup to #1073 That fix introduced *another* regression test, which caused the of the parser to always go to TLA. :(
This way if I break the output detection again, I'll know it before merging :)
shonfeder
commented
Nov 5, 2021
Comment on lines
+86
to
-88
| val outfile = new File(output) | ||
| val outfileName = outfile.toString() | ||
|
|
||
| if (filename.toLowerCase.endsWith(".tla")) { |
There was a problem hiding this comment.
This had been picking up the filename instead of the outfile, and the filename was the input file (artifact of shadowing and not having sufficiently careful test coverage.
added 2 commits
November 5, 2021 12:33
shonfeder
commented
Nov 5, 2021
Comment on lines
-89
to
95
| val moduleName = filename.substring(0, filename.length - ".tla".length) | ||
| if (outfileName.toLowerCase.endsWith(".tla")) { | ||
| val moduleName = outfileName.substring(0, outfileName.length - ".tla".length) | ||
| writerFactory.writeModuleToTla(rootModule.get.copy(name = moduleName), TlaWriter.STANDARD_MODULES, | ||
| Some(file)) | ||
| } else if (filename.toLowerCase.endsWith(".json")) { | ||
| val moduleName = filename.substring(0, filename.length - ".json".length) | ||
| Some(outfile)) | ||
| } else if (outfileName.toLowerCase.endsWith(".json")) { | ||
| val moduleName = outfileName.substring(0, outfileName.length - ".json".length) | ||
| writerFactory.writeModuleToJson(rootModule.get.copy(name = moduleName), TlaWriter.STANDARD_MODULES, |
There was a problem hiding this comment.
The duplicate logic in these bits makes this kind of problem a bit more likely, but I'll be refactoring this as part of #1077
|
Dan gave a LGTM on this in slack. |
Merged
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.
Followup to #1073
That fix introduced another regression test, which caused the of the
parser to always go to TLA. :(
make fmt-fix(or had formatting run automatically on all files edited)