forked from DonJayamanne/pythonVSCode
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Merging back from release to master. #11488
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
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
* Fix monaco editor scrolling and line height * Add news entry
* Load widget scripts from CDN and/or local python interpreter (microsoft#10987) * Address sonar issues * Fix linter * Fixes * Better way to pas array buffer * Added comments * Oops * Copy widget scripts to extension folder (microsoft#11082) * Copy widget scripts to extension folder * Fix test * Remove aml scripts from extension (microsoft#11085) * Validate python when nb opened not on extension activates (microsoft#11087) For #10893 * Support workspace images in markdown cells (microsoft#11086) For #10893 * Fix functional tests for ipywidgets and download just chrome b… (microsoft#11093) For #11092 playwright downloads other browsers, we need just one chrome (as this is closest to what VSCode is built upon) * Added tests for k3d widget (microsoft#11133) For #10799, #11096 * Fix failing ipywidget tests (microsoft#11132) For #11099 * Update change log
* Fix code lens perf for interactive window (microsoft#11142) * Eliminate first level of redundancy * Working with a cache * Add test to verify no more generating cell ranges * Add news entry * Clean up on closing * Make sure close and reopen works * Fix sonar errors * Fix restart * Fix wrong IDisposable type * Rename restartedKernel to onKernelRestarted * Recompute when changing settings * Clear out document close event when document closes * Update changelog * Fix build error from missing file
* Remove unwanted elements from cells when saving. (microsoft#11164) * Remove unwanted elements from cells when saving. * Fix a sonar warning * FIx another sonar warning * Update changelog
* Fix undo in notebooks (microsoft#11167) * Put back ctrl+z and 'z' for undo. Refactor to use one value to compute custom editor support * Add news entry * Update change log
* Ensure save works after saving untitled notebooks * Remove old document
* Fix pdf viewer so that we just ship the standalone version. (microsoft#11192) * Update changelog
For #11247 * Add message * Add tests * Fix typo
Co-authored-by: Rich Chiodo <rchiodo@users.noreply.github.com>
…#11276) For #11242 * Add error for timeout * Add imports
* Update version * Update change logs
* Change CDN files to download locally (microsoft#11286) * Working downloader * Tests passing * Add more tests * Add retry test * Fix build errors. Not sure why not happening locally. * Fix unit tests * Fix azure ml on windows Rework error checking to use status * Fix sonar error * Add some more descriptive comments * More comments * Refactor some code * Make sure to not use exists as we're downloading anyway * Fix container timeout from firing unnecessarily (microsoft#11336) * Fix container timeout from firing unnecessarily * Check for undefined for timer * Update changelog
* Temporarily switch to node FS apis in KnownPathsService (microsoft#11340) * Make sure user modules can be imported (microsoft#11353)
Cherry pick the following PRs: microsoft#11248 microsoft#11276 microsoft#11249 microsoft#11280 microsoft#11364
…oft#11407) * Ensure env gets used when running unittest * Fix tests
* Move startup to global (microsoft#11402) * Update change log
Tests are broken in Release branch
* Disable CDN unit tests. Don't seem to pass on azure * Need to skip in other suite setup too.
…#11405) (microsoft#11437) * only close interactive session on interactive window close (microsoft#11405)
rchiodo
reviewed
Apr 29, 2020
rchiodo
reviewed
Apr 29, 2020
rchiodo
reviewed
Apr 29, 2020
src/client/datascience/jupyter/liveshare/guestJupyterNotebook.ts
Outdated
Show resolved
Hide resolved
rchiodo
reviewed
Apr 29, 2020
rchiodo
reviewed
Apr 29, 2020
rchiodo
requested changes
Apr 29, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah it seems like all of the code changes for the DS code should be eliminated. They're all just merge problems.
Kudos, SonarCloud Quality Gate passed!
|
rchiodo
approved these changes
Apr 29, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
@DonJayamanne @rchiodo Can you check if the DS part is merged correctly? There were too many merge conflicts.