Fix save on close #13567
Merged
Fix save on close #13567
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
rchiodo
commented
Aug 21, 2020
| // Every time we load a new untitled file, up the counter past the max value for this counter | ||
| this.untitledCounter = getNextUntitledCounter(file, this.untitledCounter); | ||
| // Get the model that may match this file | ||
| let model = [...this.models.values()].find((m) => this.fs.arePathsSame(m.file, file)); |
There was a problem hiding this comment.
This was necessary for custom editor to find the correct model.
rchiodo
commented
Aug 21, 2020
| async (resource: Uri, targetResource: Uri) => { | ||
| const customDocument = this.customDocuments.get(resource.fsPath); | ||
| async (model: INotebookModel, targetResource: Uri) => { | ||
| await this.storage.saveAs(model, targetResource); |
There was a problem hiding this comment.
This makes sure the correct model is used for saving.
rchiodo
commented
Aug 21, 2020
| @@ -407,9 +417,10 @@ export class NativeEditorStorage implements INotebookStorage { | |||
| } | |||
|
|
|||
| private async getStoredContentsFromFile(file: Uri, key: string): Promise<string | undefined> { | |||
| const filePath = this.getHashedFileName(key); | |||
There was a problem hiding this comment.
This line was the removed one. I believe it's the root cause of the problem.
Codecov Report
@@ Coverage Diff @@
## master #13567 +/- ##
==========================================
- Coverage 59.74% 59.71% -0.03%
==========================================
Files 670 670
Lines 37427 37434 +7
Branches 5371 5373 +2
==========================================
- Hits 22359 22353 -6
- Misses 13905 13914 +9
- Partials 1163 1167 +4
Continue to review full report at Codecov.
|
DavidKutu
approved these changes
Aug 21, 2020
|
Kudos, SonarCloud Quality Gate passed!
|
| redoCount: afterState.main.redoStack.length, | ||
| selectedCell: currentSelection.selectedCellId | ||
| }); | ||
| if (!action.type || action.type !== CommonActionType.UNMOUNT) { |
There was a problem hiding this comment.
What was this change for?
There was a problem hiding this comment.
It was necessary to add the check for the mounted web view being used by dispose. We were sending messages after the webview had been destroyed.
IanMatthewHuff
approved these changes
Aug 21, 2020
karthiknadig
pushed a commit
to karthiknadig/vscode-python
that referenced
this pull request
Aug 25, 2020
* Pass model through command instead of URI in order to use directly * Add a test to verify we don't regress * Finish fixing tests * Add news entry * Fix unit tests
karthiknadig
added a commit
that referenced
this pull request
Aug 27, 2020
* Show the server display string that the user is going to connect to after selecting a compute instance and reloading the window. (#13600) * Update "Tip" notification for new users to either show the existing tip, a link to a feedback survey or nothing (#13554) * Update vscode-tas-client * Add experiment group enum * Add method to retrieve experiment values * Implementation + tests * News file * Update wording of the news entry * Add telemetry * More tests * No opting-in and out of this one * Don't fetch value if opted out, add tests * Address comments * Fix save on close (#13567) * Pass model through command instead of URI in order to use directly * Add a test to verify we don't regress * Finish fixing tests * Add news entry * Fix unit tests * Update changelog and version for point release. * Change date. * Format using latest black (#13625) Co-authored-by: Shantnu Suman <[email protected]> Co-authored-by: Kim-Adeline Miguel <[email protected]> Co-authored-by: Rich Chiodo <[email protected]>
karthiknadig
pushed a commit
to karthiknadig/vscode-python
that referenced
this pull request
Aug 27, 2020
* Pass model through command instead of URI in order to use directly * Add a test to verify we don't regress * Finish fixing tests * Add news entry * Fix unit tests
karthiknadig
added a commit
that referenced
this pull request
Aug 27, 2020
* Show the server display string that the user is going to connect to after selecting a compute instance and reloading the window. (#13600) * Update "Tip" notification for new users to either show the existing tip, a link to a feedback survey or nothing (#13554) * Update vscode-tas-client * Add experiment group enum * Add method to retrieve experiment values * Implementation + tests * News file * Update wording of the news entry * Add telemetry * More tests * No opting-in and out of this one * Don't fetch value if opted out, add tests * Address comments * Fix save on close (#13567) * Pass model through command instead of URI in order to use directly * Add a test to verify we don't regress * Finish fixing tests * Add news entry * Fix unit tests * Update changelog and version for point release. * Skip workspace virtual env service tests * Add link to issue for skipping Co-authored-by: Shantnu Suman <[email protected]> Co-authored-by: Kim-Adeline Miguel <[email protected]> Co-authored-by: Rich Chiodo <[email protected]>
karthiknadig
added a commit
that referenced
this pull request
Sep 8, 2020
* Port gather survey and icon getting disabled while gathering (#13296) * Add gather status bar and update survey link (#13225) * add status bar * add localization * Added news file * add a 2 second timeout * updated the gather survey link * Change the gather icon while gathering * moved the gathering redux function to interactive common added a constant * move css to common.css * removed the status bar message * changed noop import * update changelog * Disable test (#13346) (#13350) Co-authored-by: Rich Chiodo <[email protected]> * Add cell navigation commands as well as a default set of keyboard bindings for most new interactive window cell commands (#13334) (#13348) * Add Goto Prev/Next Cell * Add goto previous cell * Remove unneeded changes * Add default keybindings for cell commands * Goto should be Go to Co-authored-by: Jim Griesmer <[email protected]> Co-authored-by: Jim Griesmer <[email protected]> * Autoscroll when extending cell select (#13353) (#13354) Code change can only affect new keyboard shortcut operations * Update Release branch for August Release (#13401) * update version number and npm install to update package-lock.json * update changelog version and date * update news for changelog.md * update generated TPN Co-authored-by: Ian Huff <[email protected]> * Update version and change log for bug fix release (#13537) * Update LSP to latest to resolve problems with LS settings (#13511) * Fix path * Actually fix settings * Add news * Add test * Format * Suppress 'jediEnabled' removal * Drop survey first launch threshold * Update LSP to fix issue with settings in MPLS v1 * Add telemetry for `switch to Pylance` acceptance (#13526) * Fix path * Actually fix settings * Add news * Add test * Format * Suppress 'jediEnabled' removal * Drop survey first launch threshold * Initial * Add test * PR feedback * Rename property * Rename constant * Define property * Moar rename * casing * Update version and changelogs * Show status of Jupyter server (Connected/Disconnected) when the user hovers over the status icon (#13544) * Update change log with more cherry picks Co-authored-by: Mikhail Arkhipov <[email protected]> Co-authored-by: Shantnu Suman <[email protected]> * Update changelog and version for point release. (#13610) * Show the server display string that the user is going to connect to after selecting a compute instance and reloading the window. (#13600) * Update "Tip" notification for new users to either show the existing tip, a link to a feedback survey or nothing (#13554) * Update vscode-tas-client * Add experiment group enum * Add method to retrieve experiment values * Implementation + tests * News file * Update wording of the news entry * Add telemetry * More tests * No opting-in and out of this one * Don't fetch value if opted out, add tests * Address comments * Fix save on close (#13567) * Pass model through command instead of URI in order to use directly * Add a test to verify we don't regress * Finish fixing tests * Add news entry * Fix unit tests * Update changelog and version for point release. * Change date. * Format using latest black (#13625) Co-authored-by: Shantnu Suman <[email protected]> Co-authored-by: Kim-Adeline Miguel <[email protected]> Co-authored-by: Rich Chiodo <[email protected]> * Skip flaky virtual env tests (#13650) * Show the server display string that the user is going to connect to after selecting a compute instance and reloading the window. (#13600) * Update "Tip" notification for new users to either show the existing tip, a link to a feedback survey or nothing (#13554) * Update vscode-tas-client * Add experiment group enum * Add method to retrieve experiment values * Implementation + tests * News file * Update wording of the news entry * Add telemetry * More tests * No opting-in and out of this one * Don't fetch value if opted out, add tests * Address comments * Fix save on close (#13567) * Pass model through command instead of URI in order to use directly * Add a test to verify we don't regress * Finish fixing tests * Add news entry * Fix unit tests * Update changelog and version for point release. * Skip workspace virtual env service tests * Add link to issue for skipping Co-authored-by: Shantnu Suman <[email protected]> Co-authored-by: Kim-Adeline Miguel <[email protected]> Co-authored-by: Rich Chiodo <[email protected]> * Cherry picks, change log, and version update for point release. (#13666) * Add install telemetry (#13653) * Add extension install telemetry. * Add tests. * Fix typo * Fix tests. * Update comment to reflect what the installed actually does. * Update change log and version for point release. * Cherry pick history bug for Azure ML CI && Make Jupyter server clickable (#13712) * Fix: Getting an error on selecting an existing CI which has a display name from the historical CI's in the quick picks (#13642) * Make Jupyter Server name clickale to select Jupyter server (#13657) * Update Changelog and remove news files * Update package version. (#13748) * Update and pin LSP libraries for new APIs (#13725) (#13756) Co-authored-by: Jake Bailey <[email protected]> * PORT showStartPage setting fix (#13706) (#13758) * fix showStartPage setting on configSettings.ts (#13706) * fix showStartPage setting on configSettings.ts * add news file * Fix unit tests * oops * update changelog * Fix merge issues * Clean up news Co-authored-by: David Kutugata <[email protected]> Co-authored-by: Ian Huff <[email protected]> Co-authored-by: Rich Chiodo <[email protected]> Co-authored-by: Jim Griesmer <[email protected]> Co-authored-by: Jim Griesmer <[email protected]> Co-authored-by: Ian Huff <[email protected]> Co-authored-by: Mikhail Arkhipov <[email protected]> Co-authored-by: Shantnu Suman <[email protected]> Co-authored-by: Kim-Adeline Miguel <[email protected]> Co-authored-by: Jake Bailey <[email protected]>
karthiknadig
added a commit
that referenced
this pull request
Sep 14, 2020
* Port gather survey and icon getting disabled while gathering (#13296) * Add gather status bar and update survey link (#13225) * add status bar * add localization * Added news file * add a 2 second timeout * updated the gather survey link * Change the gather icon while gathering * moved the gathering redux function to interactive common added a constant * move css to common.css * removed the status bar message * changed noop import * update changelog * Disable test (#13346) (#13350) Co-authored-by: Rich Chiodo <[email protected]> * Add cell navigation commands as well as a default set of keyboard bindings for most new interactive window cell commands (#13334) (#13348) * Add Goto Prev/Next Cell * Add goto previous cell * Remove unneeded changes * Add default keybindings for cell commands * Goto should be Go to Co-authored-by: Jim Griesmer <[email protected]> Co-authored-by: Jim Griesmer <[email protected]> * Autoscroll when extending cell select (#13353) (#13354) Code change can only affect new keyboard shortcut operations * Update Release branch for August Release (#13401) * update version number and npm install to update package-lock.json * update changelog version and date * update news for changelog.md * update generated TPN Co-authored-by: Ian Huff <[email protected]> * Update version and change log for bug fix release (#13537) * Update LSP to latest to resolve problems with LS settings (#13511) * Fix path * Actually fix settings * Add news * Add test * Format * Suppress 'jediEnabled' removal * Drop survey first launch threshold * Update LSP to fix issue with settings in MPLS v1 * Add telemetry for `switch to Pylance` acceptance (#13526) * Fix path * Actually fix settings * Add news * Add test * Format * Suppress 'jediEnabled' removal * Drop survey first launch threshold * Initial * Add test * PR feedback * Rename property * Rename constant * Define property * Moar rename * casing * Update version and changelogs * Show status of Jupyter server (Connected/Disconnected) when the user hovers over the status icon (#13544) * Update change log with more cherry picks Co-authored-by: Mikhail Arkhipov <[email protected]> Co-authored-by: Shantnu Suman <[email protected]> * Update changelog and version for point release. (#13610) * Show the server display string that the user is going to connect to after selecting a compute instance and reloading the window. (#13600) * Update "Tip" notification for new users to either show the existing tip, a link to a feedback survey or nothing (#13554) * Update vscode-tas-client * Add experiment group enum * Add method to retrieve experiment values * Implementation + tests * News file * Update wording of the news entry * Add telemetry * More tests * No opting-in and out of this one * Don't fetch value if opted out, add tests * Address comments * Fix save on close (#13567) * Pass model through command instead of URI in order to use directly * Add a test to verify we don't regress * Finish fixing tests * Add news entry * Fix unit tests * Update changelog and version for point release. * Change date. * Format using latest black (#13625) Co-authored-by: Shantnu Suman <[email protected]> Co-authored-by: Kim-Adeline Miguel <[email protected]> Co-authored-by: Rich Chiodo <[email protected]> * Skip flaky virtual env tests (#13650) * Show the server display string that the user is going to connect to after selecting a compute instance and reloading the window. (#13600) * Update "Tip" notification for new users to either show the existing tip, a link to a feedback survey or nothing (#13554) * Update vscode-tas-client * Add experiment group enum * Add method to retrieve experiment values * Implementation + tests * News file * Update wording of the news entry * Add telemetry * More tests * No opting-in and out of this one * Don't fetch value if opted out, add tests * Address comments * Fix save on close (#13567) * Pass model through command instead of URI in order to use directly * Add a test to verify we don't regress * Finish fixing tests * Add news entry * Fix unit tests * Update changelog and version for point release. * Skip workspace virtual env service tests * Add link to issue for skipping Co-authored-by: Shantnu Suman <[email protected]> Co-authored-by: Kim-Adeline Miguel <[email protected]> Co-authored-by: Rich Chiodo <[email protected]> * Cherry picks, change log, and version update for point release. (#13666) * Add install telemetry (#13653) * Add extension install telemetry. * Add tests. * Fix typo * Fix tests. * Update comment to reflect what the installed actually does. * Update change log and version for point release. * Cherry pick history bug for Azure ML CI && Make Jupyter server clickable (#13712) * Fix: Getting an error on selecting an existing CI which has a display name from the historical CI's in the quick picks (#13642) * Make Jupyter Server name clickale to select Jupyter server (#13657) * Update Changelog and remove news files * Update package version. (#13748) * Update and pin LSP libraries for new APIs (#13725) (#13756) Co-authored-by: Jake Bailey <[email protected]> * PORT showStartPage setting fix (#13706) (#13758) * fix showStartPage setting on configSettings.ts (#13706) * fix showStartPage setting on configSettings.ts * add news file * Fix unit tests * oops * update changelog * Fixes for point release (#13841) * Use 'main' branch for experiments. * Update changelog and versions * Update CHANGELOG.md * Replace 'master' with 'main' in readme (#13845) Co-authored-by: David Kutugata <[email protected]> Co-authored-by: Ian Huff <[email protected]> Co-authored-by: Rich Chiodo <[email protected]> Co-authored-by: Jim Griesmer <[email protected]> Co-authored-by: Jim Griesmer <[email protected]> Co-authored-by: Ian Huff <[email protected]> Co-authored-by: Mikhail Arkhipov <[email protected]> Co-authored-by: Shantnu Suman <[email protected]> Co-authored-by: Kim-Adeline Miguel <[email protected]> Co-authored-by: Jake Bailey <[email protected]>
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.
For #11711
Root cause seems to be the change for the new FS that removed this line here:
However our logic around saving was working before that by sheer luck as far as I can tell. It would always read from the backup file (in order to load the model).
For the old web view, it's much simpler to use the model already in use.
Added a couple of tests to make sure this doesn't regress again.
Assuming I can get all of the tests to pass, somebody else may have to submit this as I'll be out next week.