start of fixing changing files and cleaning up after execute #897
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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
Irev-Dev
commented
Nov 3, 2023
| @@ -207,6 +207,7 @@ const router = createBrowserRouter( | |||
| projectPath + sep + PROJECT_ENTRYPOINT | |||
| ) | |||
| const children = await readDir(projectPath, { recursive: true }) | |||
| kclManager.setCodeAndExecute(code, false) | |||
There was a problem hiding this comment.
Irev-Dev
commented
Nov 3, 2023
Comment on lines
106
to
-127
| kclManager.setCodeAndExecute(newCode) | ||
| if (isTauri() && pathParams.id) { | ||
| // Save the file to disk | ||
| // Note that PROJECT_ENTRYPOINT is hardcoded until we support multiple files | ||
| writeTextFile(pathParams.id, newCode).catch((err) => { | ||
| // TODO: add Sentry per GH issue #254 (https://github.com/KittyCAD/modeling-app/issues/254) | ||
| console.error('error saving file', err) | ||
| toast.error('Error saving file, please check file permissions') | ||
| }) | ||
| } | ||
| if (editorView) { | ||
| editorView?.dispatch({ effects: addLineHighlight.of([0, 0]) }) | ||
| } |
There was a problem hiding this comment.
kclManager.setCodeAndExecute(newCode) handles saving the file too now, hence why all this could be deleted.
Irev-Dev
commented
Nov 3, 2023
| } | ||
| setCodeAndExecute(code: string) { | ||
| this.setCode(code) | ||
| setCodeAndExecute(code: string, shouldWriteFile = true) { |
There was a problem hiding this comment.
Generally, when the code is updated we want to save the file as well. Except when the file is first loaded because the user opened a project.
|
I think I'm going to go ahead and merge this one. |
This was referenced Nov 6, 2023
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.
This one was a bit of a pain, lots of running around but a pretty small diff at the end of it.
Ostensibly I set out to fix a weird error where typing code would persist it, but code-gen code wouldn't persist (unless of course, you typed something quickly at the end to get it to save). But there was a lot of confusing race conditions. What code was responsible for saving code to file was not clear, it was actually in the code-mirror editor, which makes sense as to why it only worked for typed and not generated code, so moving that responsibility to the kclManager since it's responsible for code fixed that. There was still an effect watching for code changes loaded from the router that would get the updated code one cycle too late, so it would save old files to the new file location, so moving that into the kclManager fixed that too.