Skip to content
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

Cherry-pick fixes from master to june release #12282

Merged
merged 3 commits into from
Jun 11, 2020

Commits on Jun 11, 2020

  1. Merge stuff from may release back into master (microsoft#12233)

    * Revert vscode-extension-telemetry changes for the release (microsoft#11602) (microsoft#11656)
    
    * Revert "Fix slashes in telemetry unit tests (microsoft#11572)"
    
    This reverts commit 7431c9c.
    
    * Revert "Use vscode-extension-telemetry for our exceptions & error telemetry (microsoft#11524)"
    
    This reverts commit d5065e6.
    
    * Remove from changelog
    
    * Port storage fix to release branch (microsoft#11673)
    
    * Fix storage not being used (microsoft#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 (microsoft#11688)
    
    * Fix scrolling (microsoft#11681)
    
    * Fix scrolling
    
    * Review feedback - fix scrolling on expand/collapse
    
    * Update changelog
    
    * Update package.json
    
    Co-authored-by: Jim Griesmer <jimgries@microsoft.com>
    
    * Cherry-pick pipenv changes and pythonpath prompt changes to release (microsoft#11700)
    
    * Show the prompt again if user clicks on more info (microsoft#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 (microsoft#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 <51720070+kimadeline@users.noreply.github.com>
    
    * Update extension version (microsoft#11730)
    
    * Update extension version
    
    * Update date in changelog.
    
    * Update change log with additional notes. (microsoft#11764)
    
    * Cherry picks and version updates for bug fix release (microsoft#11878)
    
    * Do not execute shebang as an interpreter until user has clicked on the codelens enclosing the shebang (microsoft#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 <kanadig@microsoft.com>
    
    Co-authored-by: Karthik Nadig <kanadig@microsoft.com>
    
    * Update version and change log for bugfix release
    
    Co-authored-by: Kartik Raj <karraj@microsoft.com>
    
    * Cherry-pick ExP platform work from master (microsoft#12160)
    
    * User cannot belong to all experiments in an experiment group (microsoft#11945)
    
    * 10790 prep - Create an experiments/ folder  (microsoft#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 (microsoft#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 <don.jayamanne@yahoo.com>
    * 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 <don.jayamanne@yahoo.com>
    
    * Fix merge issues
    
    * Fix index unit tests
    
    * Revert "Fix index unit tests"
    
    This reverts commit 2fb61fc.
    
    * Make MPLS and vscode-extension-telemetry work together 🤝 (microsoft#11823)
    
    * Revert "Revert vscode-extension-telemetry changes for the release (microsoft#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 <don.jayamanne@yahoo.com>
    Co-authored-by: Kim-Adeline Miguel <51720070+kimadeline@users.noreply.github.com>
    
    * Update version and changelog for point release (microsoft#12171)
    
    * Ensure extension features are started when in Deprecate PythonPath experiment and opening a file without any folder opened (microsoft#12182)
    
    * Ensure extension features are started when in Deprecate PythonPath experiment and opening a file without any folder opened.
    
    * Added comments
    
    * Update change log (microsoft#12190)
    
    * Cherry pick fix for hasInterpreters and update change log (microsoft#12198)
    
    * Double-check for interpreters when running diagnostics (microsoft#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 <51720070+kimadeline@users.noreply.github.com>
    
    * Update version for point release (microsoft#12259)
    
    Co-authored-by: Kim-Adeline Miguel <51720070+kimadeline@users.noreply.github.com>
    Co-authored-by: Rich Chiodo <rchiodo@users.noreply.github.com>
    Co-authored-by: Jim Griesmer <jimgries@microsoft.com>
    Co-authored-by: Kartik Raj <karraj@microsoft.com>
    Co-authored-by: Don Jayamanne <don.jayamanne@yahoo.com>
    6 people committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    92a1928 View commit details
    Browse the repository at this point in the history
  2. Make Jedi the default LS (microsoft#12226)

    * Make Jedi the default LS
    
    * Add news entry
    luabud authored and karthiknadig committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    e9c522a View commit details
    Browse the repository at this point in the history
  3. Update change log

    karthiknadig committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    bb52aa6 View commit details
    Browse the repository at this point in the history