Skip to content

Commit b20f8f9

Browse files
karthiknadigkimadelinerchiodogreazerKartik Raj
committed
Cherry-pick fixes from master to june release (#12282)
* Merge stuff from may release back into master (#12233) * Revert vscode-extension-telemetry changes for the release (#11602) (#11656) * Revert "Fix slashes in telemetry unit tests (#11572)" This reverts commit 7431c9c. * Revert "Use vscode-extension-telemetry for our exceptions & error telemetry (#11524)" This reverts commit d5065e6. * Remove from changelog * Port storage fix to release branch (#11673) * Fix storage not being used (#11649) * Fix storage not being used * Add disposable to storage so it won't write after shutdown * Fix dirty title * Hack to get tests to pass * Another way to get run all to not interfere * Update changelog * Port scrolling fix to release (#11688) * Fix scrolling (#11681) * Fix scrolling * Review feedback - fix scrolling on expand/collapse * Update changelog * Update package.json Co-authored-by: Jim Griesmer <[email protected]> * Cherry-pick pipenv changes and pythonpath prompt changes to release (#11700) * Show the prompt again if user clicks on more info (#11664) * Show the prompt again if user clicks on more info * Review feedback * Use Learn more as text for the link. * Leave pipenv in a corner until the user decides to select an interpreter (#11654) * add onSuggestion option * Swap onActivation with onSuggestion * Update unit tests * Remove registration of IPipenvService * Move didTriggerInterpreterSuggestions logic inside pipenv locator * Fix existing unit tests * Add new unit tests * Replace typemoq any param with object * Shorten the tests * Fix warning * Duplicate teardown Co-authored-by: Kim-Adeline Miguel <[email protected]> * Update extension version (#11730) * Update extension version * Update date in changelog. * Update change log with additional notes. (#11764) * Cherry picks and version updates for bug fix release (#11878) * Do not execute shebang as an interpreter until user has clicked on the codelens enclosing the shebang (#11816) * Do not execute shebang as an interpreter until user has clicked on the codelens enclosing the shebang * Rename * Oops * Update src/test/providers/shebangCodeLenseProvider.unit.test.ts Co-authored-by: Karthik Nadig <[email protected]> Co-authored-by: Karthik Nadig <[email protected]> * Update version and change log for bugfix release Co-authored-by: Kartik Raj <[email protected]> * Cherry-pick ExP platform work from master (#12160) * User cannot belong to all experiments in an experiment group (#11945) * 10790 prep - Create an experiments/ folder (#11980) * experiments.ts -> experiments/manager.ts * eexperimentGroups -> experiments/experimentGroups * test/experiments.u.t -> test/experiments/manager.u.t * experimentGroups -> groups * Whoops committed one file too many * Add support for VS Code's experiment service (#11979) * Add npm package * News entry * experiments.ts -> experiments/manager.ts * Wrong issue number * eexperimentGroups -> experiments/experimentGroups * Move experiments.unit.tests.ts -> experiments/ * Commit new files * Merge gone sideways * Add types * Add opt in/out handling * Activation (service registry) * Don't pin tas-client to one version * Unit tests + fixes * Lol forgot to remove a comment + add headers * Forgot 'use strict' in service.ts * Use IApplicationEnvironment instead of IExtensions * Apply suggestions from code review Co-authored-by: Don Jayamanne <[email protected]> * Remove unnecessary formatted props * n e v e r m i n d * Aight fixed it * flight -> experiment * Check stub calls instead of ctor impl * removed getExperimentService stub check * Set shared properties for all telemetry events * Add test for shared properties Co-authored-by: Don Jayamanne <[email protected]> * Fix merge issues * Fix index unit tests * Revert "Fix index unit tests" This reverts commit 2fb61fc. * Make MPLS and vscode-extension-telemetry work together 🤝 (#11823) * Revert "Revert vscode-extension-telemetry changes for the release (#11602)" This reverts commit 71d1793. * Remove entry from changelog + add new news entry * Update LS code to use periods instead of slashes * Revert "Update LS code to use periods instead of slashes" This reverts commit 1356651. * Replace slashes before sending telemetry instead * Too fast too furious * Fix more merge issues Co-authored-by: Don Jayamanne <[email protected]> Co-authored-by: Kim-Adeline Miguel <[email protected]> * Update version and changelog for point release (#12171) * Ensure extension features are started when in Deprecate PythonPath experiment and opening a file without any folder opened (#12182) * Ensure extension features are started when in Deprecate PythonPath experiment and opening a file without any folder opened. * Added comments * Update change log (#12190) * Cherry pick fix for hasInterpreters and update change log (#12198) * Double-check for interpreters when running diagnostics (#12158) * Get interpreters if hasInterpreters returns false * Undo ignoreErrors() * Add unit tests * Fixed tests * Newline * Fix merge issues. * Update change log Co-authored-by: Kim-Adeline Miguel <[email protected]> * Update version for point release (#12259) Co-authored-by: Kim-Adeline Miguel <[email protected]> Co-authored-by: Rich Chiodo <[email protected]> Co-authored-by: Jim Griesmer <[email protected]> Co-authored-by: Kartik Raj <[email protected]> Co-authored-by: Don Jayamanne <[email protected]> * Make Jedi the default LS (#12226) * Make Jedi the default LS * Add news entry * Update change log Co-authored-by: Kim-Adeline Miguel <[email protected]> Co-authored-by: Rich Chiodo <[email protected]> Co-authored-by: Jim Griesmer <[email protected]> Co-authored-by: Kartik Raj <[email protected]> Co-authored-by: Don Jayamanne <[email protected]> Co-authored-by: Luciana Abud <[email protected]>
1 parent 3c47028 commit b20f8f9

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
1. Preliminary support using other languages for the kernel.
1212
([#11919](https://github.com/Microsoft/vscode-python/issues/11919))
1313
1. Enable the use of the custom editor for native notebooks.
14-
([#10744](https://github.com/Microsoft/vscode-python/issues/10744))
14+
([#10744](https://github.com/Microsoft/vscode-python/issues/10744))
1515

1616
### Fixes
1717

@@ -88,6 +88,8 @@
8888
([#12193](https://github.com/Microsoft/vscode-python/issues/12193))
8989
1. Fix debugger continue event to actually change a cell.
9090
([#12155](https://github.com/Microsoft/vscode-python/issues/12155))
91+
1. Make Jedi the Default value for the python.languageServer setting.
92+
([#12225](https://github.com/Microsoft/vscode-python/issues/12225))
9193
1. Make stop during run by line interrupt the kernel.
9294
([#12249](https://github.com/Microsoft/vscode-python/issues/12249))
9395

0 commit comments

Comments
 (0)