Skip to content

Commit 691ce83

Browse files
karthiknadigcwebster-99JCMaisdependabot[bot]paulacamargo25
committed
Merged PR posit-dev/positron-python#58: Merge latest upstream
Merge pull request #58 from posit-dev/merge-latest Merge latest upstream -------------------- Commit message for posit-dev/positron-python@b5cbe4f: Merge latest upstream -------------------- Commit message for microsoft/vscode-python@96aa8f8: Do not deprecate `python.terminal.activateEnvironmentInTerminal` setting along with terminal env var experiment (microsoft/vscode-python#20952) I initially deprecated this setting as I thought folks only disabled it because we were sending commands which was annoying. -------------------- Commit message for microsoft/vscode-python@37a70fd: Update note on the Jupyter extension in README (microsoft/vscode-python#20946) Karthik brought this up offline and I agree, instead of saying we don't offer support out of box, we say it needs to be via the Jupyter extension. -------------------- Commit message for microsoft/vscode-python@bc59a7d: Fix linting in APIs (microsoft/vscode-python#20623) Fix lint in api.ts -------------------- Commit message for microsoft/vscode-python@34c54f4: No longer install the Jupyter extension by default (microsoft/vscode-python#20218) For microsoft/vscode-python#18073 --------- Co-authored-by: Brett Cannon <[email protected]> -------------------- Commit message for microsoft/vscode-python@8d8784f: Fix diagnostic to use "System32" instead of "SystemRoot" (microsoft/vscode-python#20937) For microsoft/vscode-python#16692 Follow up to microsoft/vscode-python#20927 -------------------- Commit message for microsoft/vscode-python@ef6511e: Fix telemetry when updating pip (microsoft/vscode-python#20903) @luabud This PR adds a minor telemetry change to create environment. There is a new telemetry point indicating pip upgrade. -------------------- Commit message for microsoft/vscode-python@b208384: Add diagnostic to validate ComSpec (microsoft/vscode-python#20927) Closes microsoft/vscode-python#16692 -------------------- Commit message for microsoft/vscode-python@5fd9f97: Update main to next pre-release (microsoft/vscode-python#20928) -------------------- Commit message for microsoft/vscode-python@6e31c6a: Update version of main to release candidate (microsoft/vscode-python#20923) -------------------- Commit message for microsoft/vscode-python@d809af4: Use new formatter install prompt on missing formatter (microsoft/vscode-python#20904) -------------------- Commit message for microsoft/vscode-python@43a21a2: Remove HTTP Client usage (microsoft/vscode-python#20922) This is addressing an internal CG issue. -------------------- Commit message for microsoft/vscode-python@5f9be4e: Make sure we delay start pylance server (microsoft/vscode-python#20910) fixes microsoft/vscode-python#20909 Activating `pylance` extension inside of `python` extension cause a dead lock since they have circular dependency. now we make sure we activate `pylance` once `python` extension is activated. `node` already works this way. it is just browser extension that started `pylance` inside `activate` directly. -------------------- Commit message for microsoft/vscode-python@be55c97: Adjust a few strings that mention Python (microsoft/vscode-python#20900) For microsoft/vscode-python#20899 (+ a few other strings I thought could use some tweaking too) -------------------- Commit message for microsoft/vscode-python@61f93c3: Fix title and placeholder for python selection when using create env command (microsoft/vscode-python#20896) Closes microsoft/vscode-python#19891 ![image](https://user-images.githubusercontent.com/3840081/227031948-de595993-80e1-43a0-8dd8-658848c6b3d5.png) -------------------- Commit message for microsoft/vscode-python@01e798a: Share telemetry from core extension. (microsoft/vscode-python#20893) it turns out the new telemetry API removed a way to set extension id and version when telemetry reporter is created and it implicitly sets from extension reporter is created. the same way how LSP client is working. since we want to keep using the same extension id and etc for our telemetry, we need the reporter created from core ext. -------------------- Commit message for microsoft/vscode-python@807b9fe: Add create environment button to `requirements.txt` and `pyproject.toml` files (microsoft/vscode-python#20879) Closes microsoft/vscode-python#20812 Related microsoft/vscode-python#20133 -------------------- Commit message for microsoft/vscode-python@730df28: Add GDPR tag to new telemetry property (microsoft/vscode-python#20871) -------------------- Commit message for microsoft/vscode-python@a6ac385: Bump webpack from 5.70.0 to 5.76.0 (microsoft/vscode-python#20856) Bumps [webpack](https://github.com/webpack/webpack) from 5.70.0 to 5.76.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/webpack/webpack/releases">webpack's releases</a>.</em></p> <blockquote> <h2>v5.76.0</h2> <h2>Bugfixes</h2> <ul> <li>Avoid cross-realm object access by <a href="https://github.com/Jack-Works"><code>@​Jack-Works</code></a> in <a href="https://redirect.github.com/webpack/webpack/pull/16500">webpack/webpack#16500</a></li> <li>Improve hash performance via conditional initialization by <a href="https://github.com/lvivski"><code>@​lvivski</code></a> in <a href="https://redirect.github.com/webpack/webpack/pull/16491">webpack/webpack#16491</a></li> <li>Serialize <code>generatedCode</code> info to fix bug in asset module cache restoration by <a href="https://github.com/ryanwilsonperkin"><code>@​ryanwilsonperkin</code></a> in <a href="https://redirect.github.com/webpack/webpack/pull/16703">webpack/webpack#16703</a></li> <li>Improve performance of <code>hashRegExp</code> lookup by <a href="https://github.com/ryanwilsonperkin"><code>@​ryanwilsonperkin</code></a> in <a href="https://redirect.github.com/webpack/webpack/pull/16759">webpack/webpack#16759</a></li> </ul> <h2>Features</h2> <ul> <li>add <code>target</code> to <code>LoaderContext</code> type by <a href="https://github.com/askoufis"><code>@​askoufis</code></a> in <a href="https://redirect.github.com/webpack/webpack/pull/16781">webpack/webpack#16781</a></li> </ul> <h2>Security</h2> <ul> <li><a href="https://github.com/advisories/GHSA-3rfm-jhwj-7488">CVE-2022-37603</a> fixed by <a href="https://github.com/akhilgkrishnan"><code>@​akhilgkrishnan</code></a> in <a href="https://redirect.github.com/webpack/webpack/pull/16446">webpack/webpack#16446</a></li> </ul> <h2>Repo Changes</h2> <ul> <li>Fix HTML5 logo in README by <a href="https://github.com/jakebailey"><code>@​jakebailey</code></a> in <a href="https://redirect.github.com/webpack/webpack/pull/16614">webpack/webpack#16614</a></li> <li>Replace TypeScript logo in README by <a href="https://github.com/jakebailey"><code>@​jakebailey</code></a> in <a href="https://redirect.github.com/webpack/webpack/pull/16613">webpack/webpack#16613</a></li> <li>Update actions/cache dependencies by <a href="https://github.com/piwysocki"><code>@​piwysocki</code></a> in <a href="https://redirect.github.com/webpack/webpack/pull/16493">webpack/webpack#16493</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/Jack-Works"><code>@​Jack-Works</code></a> made their first contribution in <a href="https://redirect.github.com/webpack/webpack/pull/16500">webpack/webpack#16500</a></li> <li><a href="https://github.com/lvivski"><code>@​lvivski</code></a> made their first contribution in <a href="https://redirect.github.com/webpack/webpack/pull/16491">webpack/webpack#16491</a></li> <li><a href="https://github.com/jakebailey"><code>@​jakebailey</code></a> made their first contribution in <a href="https://redirect.github.com/webpack/webpack/pull/16614">webpack/webpack#16614</a></li> <li><a href="https://github.com/akhilgkrishnan"><code>@​akhilgkrishnan</code></a> made their first contribution in <a href="https://redirect.github.com/webpack/webpack/pull/16446">webpack/webpack#16446</a></li> <li><a href="https://github.com/ryanwilsonperkin"><code>@​ryanwilsonperkin</code></a> made their first contribution in <a href="https://redirect.github.com/webpack/webpack/pull/16703">webpack/webpack#16703</a></li> <li><a href="https://github.com/piwysocki"><code>@​piwysocki</code></a> made their first contribution in <a href="https://redirect.github.com/webpack/webpack/pull/16493">webpack/webpack#16493</a></li> <li><a href="https://github.com/askoufis"><code>@​askoufis</code></a> made their first contribution in <a href="https://redirect.github.com/webpack/webpack/pull/16781">webpack/webpack#16781</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/webpack/webpack/compare/v5.75.0...v5.76.0">https://github.com/webpack/webpack/compare/v5.75.0...v5.76.0</a></p> <h2>v5.75.0</h2> <h1>Bugfixes</h1> <ul> <li><code>experiments.*</code> normalize to <code>false</code> when opt-out</li> <li>avoid <code>NaN%</code></li> <li>show the correct error when using a conflicting chunk name in code</li> <li>HMR code tests existance of <code>window</code> before trying to access it</li> <li>fix <code>eval-nosources-*</code> actually exclude sources</li> <li>fix race condition where no module is returned from processing module</li> <li>fix position of standalong semicolon in runtime code</li> </ul> <h1>Features</h1> <ul> <li>add support for <code>@import</code> to extenal CSS when using experimental CSS in node</li> <li>add <code>i64</code> support to the deprecated WASM implementation</li> </ul> <h1>Developer Experience</h1> <ul> <li>expose <code>EnableWasmLoadingPlugin</code></li> <li>add more typings</li> <li>generate getters instead of readonly properties in typings to allow overriding them</li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/webpack/webpack/commit/97b1718720c33f1b17302a74c5284b01e02ec001"><code>97b1718</code></a> Merge pull request <a href="https://redirect.github.com/webpack/webpack/issues/16781">#16781</a> from askoufis/loader-context-target-type</li> <li><a href="https://github.com/webpack/webpack/commit/b84efe6224b276bf72e4c5e2f4e76acddfaeef07"><code>b84efe6</code></a> Merge pull request <a href="https://redirect.github.com/webpack/webpack/issues/16759">#16759</a> from ryanwilsonperkin/real-content-hash-regex-perf</li> <li><a href="https://github.com/webpack/webpack/commit/c98e9e001441b165c7ed4845700839730b505833"><code>c98e9e0</code></a> Merge pull request <a href="https://redirect.github.com/webpack/webpack/issues/16493">#16493</a> from piwysocki/patch-1</li> <li><a href="https://github.com/webpack/webpack/commit/5f34acfbc074da6cc09f48944d7f2b4273ffb3f8"><code>5f34acf</code></a> feat: Add <code>target</code> to <code>LoaderContext</code> type</li> <li><a href="https://github.com/webpack/webpack/commit/b7fc4d876deb958d7ee81ecc00a312e39a354a44"><code>b7fc4d8</code></a> Merge pull request <a href="https://redirect.github.com/webpack/webpack/issues/16703">#16703</a> from ryanwilsonperkin/ryanwilsonperkin/fix-16160</li> <li><a href="https://github.com/webpack/webpack/commit/63ea82da4d4e4242b6a6285fc937f0684f264fe8"><code>63ea82d</code></a> Merge branch 'webpack:main' into patch-1</li> <li><a href="https://github.com/webpack/webpack/commit/4ba225225b1348c8776ca5b5fe53468519413bc0"><code>4ba2252</code></a> Merge pull request <a href="https://redirect.github.com/webpack/webpack/issues/16446">#16446</a> from akhilgkrishnan/patch-1</li> <li><a href="https://github.com/webpack/webpack/commit/1acd6350be3d74d4ac70b64cbbc60f27724b618b"><code>1acd635</code></a> Merge pull request <a href="https://redirect.github.com/webpack/webpack/issues/16613">#16613</a> from jakebailey/ts-logo</li> <li><a href="https://github.com/webpack/webpack/commit/302eb37fe19ed7ca60eaf895aca4f9da9dfd7931"><code>302eb37</code></a> Merge pull request <a href="https://redirect.github.com/webpack/webpack/issues/16614">#16614</a> from jakebailey/html5-logo</li> <li><a href="https://github.com/webpack/webpack/commit/cfdb1dfe59b33bf7441b8a8e4fc58d75e4f54cee"><code>cfdb1df</code></a> Improve performance of hashRegExp lookup</li> <li>Additional commits viewable in <a href="https://github.com/webpack/webpack/compare/v5.70.0...v5.76.0">compare view</a></li> </ul> </details> <details> <summary>Maintainer changes</summary> <p>This version was pushed to npm by <a href="https://www.npmjs.com/~evilebottnawi">evilebottnawi</a>, a new releaser for webpack since your current version.</p> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=webpack&package-manager=npm_and_yarn&previous-version=5.70.0&new-version=5.76.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/microsoft/vscode-python/network/alerts). </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> -------------------- Commit message for microsoft/vscode-python@3269137: Finalize Python Environment API (microsoft/vscode-python#20868) -------------------- Commit message for microsoft/vscode-python@00ce6d0: Update text shown in formatter install prompt (microsoft/vscode-python#20869) -------------------- Commit message for microsoft/vscode-python@d16568e: Ensure `resolveEnvironment` API resolves the latest details for conda envs without python (microsoft/vscode-python#20862) Closes microsoft/vscode-python#20765 Change `resolveEnvironment` API to validate cache for conda envs without python before using it, it also making sure we fire a update event after resolving it and adding it to cache. -------------------- Commit message for microsoft/vscode-python@7ee3f7d: Show prompt asking user to install formatter extension (microsoft/vscode-python#20861) For microsoft/vscode-python#19653 -------------------- Commit message for microsoft/vscode-python@b9c4ff7: Update walkthrough title (microsoft/vscode-python#20857) For consistency with other language extensions -------------------- Commit message for microsoft/vscode-python@1668d06: Made browser to expose pylance api. (microsoft/vscode-python#20847) This will let pylance to create LS Client on browser -------------------- Commit message for microsoft/vscode-python@0735876: Share output channel with pylance (microsoft/vscode-python#20833) Make sure `pylance` and `jedi` share the same output channel. -------------------- Commit message for microsoft/vscode-python@2cd2092: Fixed a bug where pylance not working on interactive window. (microsoft/vscode-python#20831) https://github.com/microsoft/vscode-python/pull/20816/files#diff-ba59d9ca0a087381d63119a88751fdc7c0aa07e6a10e772d3aefd4c10aa36fcfL47 this should have changed to return `false` rather than deleting since it would have been always return `false`. deleting effectively made it to have the same effect as always returning `true` follow up PR of microsoft/vscode-python#20816 -------------------- Commit message for microsoft/vscode-python@d3dd832: Expose client creation API for pylance (microsoft/vscode-python#20816) If new client change is available in pylance, made core extension to use pylance to do language server lifetime management. and also this PR removes all old notebook experiences so that it is inline with pylance (pylance already removed all those when moving client/middleware) -------------------- Commit message for microsoft/vscode-python@b897300: Restart reason telemetry event for `pylance` (microsoft/vscode-python#20821) Closes microsoft/vscode-python#19626 -------------------- Commit message for microsoft/vscode-python@8a80ebe: Add experiment to implicitly use environment variables for environment activation (microsoft/vscode-python#20651) -------------------- Commit message for microsoft/vscode-python@7aac96a: Fix typo with `clientOS` (microsoft/vscode-python#20819) -------------------- Commit message for microsoft/vscode-python@e9ff78d: Set clientOS debug option (microsoft/vscode-python#20805) Closed: microsoft/vscode-python#20407 -------------------- Commit message for microsoft/vscode-python@467823d: Add option to control if environment is selected after creation (microsoft/vscode-python#20738) For: microsoft/vscode-python#20270 @DonJayamanne This PR adds a field to the options that should allow you to skip environment selection. -------------------- Commit message for microsoft/vscode-python@672d07e: Do not use `-I` flag in case we're unable to find `encodings` module when validating python (microsoft/vscode-python#20803) Closes microsoft/vscode-python#20793 -------------------- Commit message for microsoft/vscode-python@2442dfb: Add logging which could help indicate why `Discovering Python Interpreters...` never finishes (microsoft/vscode-python#20792) For microsoft/vscode-python#20250 -------------------- Commit message for microsoft/vscode-python@e8303bb: Fix ability to recognize extensions which access environment API (microsoft/vscode-python#20791) Follow up from microsoft/vscode-python#20222. Apparently `setTimeout` changed the stack in such a way that we were unable to recognize which extension called the API: ``` [DEBUG 2023-2-2 16:21:9.641]: Extension unknown accessed getActiveEnvironmentPath with args: undefined ``` Reverting the change. -------------------- Commit message for microsoft/vscode-python@ee8e80e: Improve getting started experience when starting on a fresh macOS (microsoft/vscode-python#20789) Closes microsoft/vscode-python#20635 - Suggest to install from `python.org` if brew is not available - Do not suggest irrelevant prompts -------------------- Commit message for microsoft/vscode-python@16c0437: Update description of `python.terminal.activateEnvironment` setting (microsoft/vscode-python#20788) -------------------- Commit message for microsoft/vscode-python@54e37fe: Update README.md for isort changes (microsoft/vscode-python#20787) Updating the README to reflect isort not being installed by default -------------------- Commit message for microsoft/vscode-python@32c10e4: Add verbose logging for change events fired related to envs (microsoft/vscode-python#20780) For microsoft/vscode-python#20292 -------------------- Commit message for microsoft/vscode-python@be75eb2: Ensure both `python` and `pythonPath` are not set when resolving config. (microsoft/vscode-python#20781) Fixes microsoft/vscode-python#20655 -------------------- Commit message for microsoft/vscode-python@a5005f6: Ensure picker returns array only if multi-select is enabled (microsoft/vscode-python#20772) Fixes microsoft/vscode-python#20768 -------------------- Commit message for microsoft/vscode-python@c5e6378: Update main to next pre-release (microsoft/vscode-python#20764) -------------------- Commit message for microsoft/vscode-python@7c31a5e: Updating version for release candidate. (microsoft/vscode-python#20762) -------------------- Commit message for microsoft/vscode-python@e624eff: Make sure conda activate is used for micromamba (microsoft/vscode-python#20760) Closes microsoft/vscode-python#20756 -------------------- Commit message for microsoft/vscode-python@29bee00: Fix debugger attach to process when running on WSL (microsoft/vscode-python#20741) Possible fix for microsoft/vscode-python#16921 Closes microsoft/vscode-python#16921 BTW you folks should probably ask GitHub support to eject this repo from their original repository (so it stops being a fork and has its own network on GH) -------------------- Commit message for microsoft/vscode-python@e9dba6c: Bump typing-extensions from 4.4.0 to 4.5.0 (microsoft/vscode-python#20704) Bumps [typing-extensions](https://github.com/python/typing_extensions) from 4.4.0 to 4.5.0. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/python/typing_extensions/blob/main/CHANGELOG.md">typing-extensions's changelog</a>.</em></p> <blockquote> <h1>Release 4.5.0 (February 14, 2023)</h1> <ul> <li>Runtime support for PEP 702, adding <code>typing_extensions.deprecated</code>. Patch by Jelle Zijlstra.</li> <li>Add better default value for TypeVar <code>default</code> parameter, PEP 696. Enables runtime check if <code>None</code> was passed as default. Patch by Marc Mueller (<a href="https://github.com/cdce8p"><code>@​cdce8p</code></a>).</li> <li>The <code>@typing_extensions.override</code> decorator now sets the <code>.__override__</code> attribute. Patch by Steven Troxler.</li> <li>Fix <code>get_type_hints()</code> on cross-module inherited <code>TypedDict</code> in 3.9 and 3.10. Patch by Carl Meyer.</li> <li>Add <code>frozen_default</code> parameter on <code>dataclass_transform</code>. Patch by Erik De Bonte.</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/python/typing_extensions/commit/8dcd89993c3926d6c704232b9c56160447fa81fe"><code>8dcd899</code></a> Prepare release 4.5.0 (<a href="https://github-redirect.dependabot.com/python/typing_extensions/issues/116">#116</a>)</li> <li><a href="https://github.com/python/typing_extensions/commit/e81cb8289874d6a6715675d77df88db033824e0d"><code>e81cb82</code></a> PEP 702: Runtime warnings (<a href="https://github-redirect.dependabot.com/python/typing_extensions/issues/112">#112</a>)</li> <li><a href="https://github.com/python/typing_extensions/commit/1039bb2730e62e9763b8fd1d6a19ddd6bb0b6fe4"><code>1039bb2</code></a> fix PEP 702 link in the <code>README.md</code> (<a href="https://github-redirect.dependabot.com/python/typing_extensions/issues/108">#108</a>)</li> <li><a href="https://github.com/python/typing_extensions/commit/673e5ceea32f77d90531d4d5e77a7694edba7fba"><code>673e5ce</code></a> Add <a href="https://github.com/typing"><code>@​typing</code></a>_extensions.deprecated (<a href="https://github-redirect.dependabot.com/python/typing_extensions/issues/105">#105</a>)</li> <li><a href="https://github.com/python/typing_extensions/commit/27646ecba87fe518566db3d6b970574ad8df2490"><code>27646ec</code></a> Fix tests on Python 3.11 (<a href="https://github-redirect.dependabot.com/python/typing_extensions/issues/106">#106</a>)</li> <li><a href="https://github.com/python/typing_extensions/commit/57226b4fb64a5d9f4788e74fe3799d98fe02026b"><code>57226b4</code></a> Add <code>frozen_default</code> parameter on <code>dataclass_transform</code> (<a href="https://github-redirect.dependabot.com/python/typing_extensions/issues/101">#101</a>)</li> <li><a href="https://github.com/python/typing_extensions/commit/0ea104bc37bd8f85246d48c7f6c7642f25771498"><code>0ea104b</code></a> Expand the pyproject.toml sdist include expression to include src/_typed_dict...</li> <li><a href="https://github.com/python/typing_extensions/commit/93ac93b58f23a2b7e4450cbe8819f5a36d319af7"><code>93ac93b</code></a> CI: test on Ubuntu-20.04, not Ubuntu-2004 (<a href="https://github-redirect.dependabot.com/python/typing_extensions/issues/100">#100</a>)</li> <li><a href="https://github.com/python/typing_extensions/commit/5f9258d1efd5d8e4900ffc23ba2486240f2a2f35"><code>5f9258d</code></a> Test on Ubuntu 20.04</li> <li><a href="https://github.com/python/typing_extensions/commit/ad3966ddabe9adcbf2e76d88a7cf984fa9cb4237"><code>ad3966d</code></a> Replace type comments with annotations (<a href="https://github-redirect.dependabot.com/python/typing_extensions/issues/98">#98</a>)</li> <li>Additional commits viewable in <a href="https://github.com/python/typing_extensions/compare/4.4.0...4.5.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=typing-extensions&package-manager=pip&previous-version=4.4.0&new-version=4.5.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> -------------------- Commit message for microsoft/vscode-python@35be3c2: Ensure escape on TOML and requirements is treated as cancel. (microsoft/vscode-python#20739) -------------------- Commit message for microsoft/vscode-python@5d9bc1e: Tag Pylance settings properties for GDPR (microsoft/vscode-python#20745) -------------------- Commit message for microsoft/vscode-python@70716f0: Add description for `python.experiment` settings values (microsoft/vscode-python#20751) -------------------- Commit message for microsoft/vscode-python@7b488a9: Point to Python v3.11 instead of Python v3.10 when opening windows store (microsoft/vscode-python#20742) Closes microsoft/vscode-python#20736 Lead-authored-by: Karthik Nadig <[email protected]> Co-authored-by: Courtney Webster <[email protected]> Co-authored-by: Jonathan Cardoso <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: paulacamargo25 <[email protected]> Co-authored-by: Pete Farland <[email protected]> Co-authored-by: Heejae Chang <[email protected]> Co-authored-by: Luciana Abud <[email protected]> Co-authored-by: Kartik Raj <[email protected]> Signed-off-by: GitHub <[email protected]>
1 parent c97eff0 commit 691ce83

File tree

142 files changed

+3746
-2364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+3746
-2364
lines changed

extensions/positron-python/.eslintignore

-2
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,8 @@ src/client/interpreter/configuration/services/workspaceUpdaterService.ts
146146
src/client/interpreter/configuration/services/workspaceFolderUpdaterService.ts
147147
src/client/interpreter/helpers.ts
148148
src/client/interpreter/virtualEnvs/condaInheritEnvPrompt.ts
149-
src/client/interpreter/activation/service.ts
150149
src/client/interpreter/display/index.ts
151150

152-
src/client/api.ts
153151
src/client/extension.ts
154152
src/client/sourceMapSupport.ts
155153
src/client/startupTelemetry.ts

extensions/positron-python/README.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The Python extension does offer [some support](https://github.com/microsoft/vsco
99

1010
## Installed extensions
1111

12-
The Python extension will automatically install the [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance), [Jupyter](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.jupyter) and [isort](https://marketplace.visualstudio.com/items?itemName=ms-python.isort) extensions to give you the best experience when working with Python files and Jupyter notebooks. However, Pylance is an optional dependency, meaning the Python extension will remain fully functional if it fails to be installed. You can also [uninstall](https://code.visualstudio.com/docs/editor/extension-marketplace#_uninstall-an-extension) it at the expense of some features if you’re using a different language server.
12+
The Python extension will automatically install the [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance) and [Jupyter](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.jupyter) extensions to give you the best experience when working with Python files and Jupyter notebooks. However, Pylance is an optional dependency, meaning the Python extension will remain fully functional if it fails to be installed. You can also [uninstall](https://code.visualstudio.com/docs/editor/extension-marketplace#_uninstall-an-extension) it at the expense of some features if you’re using a different language server.
1313

1414
Extensions installed through the marketplace are subject to the [Marketplace Terms of Use](https://cdn.vsassets.io/v/M146_20190123.39/_content/Microsoft-Visual-Studio-Marketplace-Terms-of-Use.pdf).
1515

@@ -37,7 +37,9 @@ Extensions installed through the marketplace are subject to the [Marketplace Ter
3737

3838
## Jupyter Notebook quick start
3939

40-
The Python extension and the [Jupyter extension](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.jupyter) work together to give you a great Notebook experience in VS Code.
40+
The Python extension offers support for Jupyter notebooks via the [Jupyter extension](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.jupyter) to provide you a great Python notebook experience in VS Code.
41+
42+
- Install the [Jupyter extension](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.jupyter).
4143

4244
- Open or create a Jupyter Notebook file (.ipynb) and start coding in our Notebook Editor!
4345

@@ -80,7 +82,9 @@ Learn more about the rich features of the Python extension:
8082

8183
- [Environments](https://code.visualstudio.com/docs/python/environments): Automatically activate and switch between virtualenv, venv, pipenv, conda and pyenv environments
8284

83-
- [Refactoring](https://code.visualstudio.com/docs/python/editing#_refactoring): Restructure your Python code with variable extraction, method extraction and import sorting
85+
- [Refactoring](https://code.visualstudio.com/docs/python/editing#_refactoring): Restructure your Python code with variable extraction and method extraction. Additionally, there is componentized support to enable additional refactoring, such as import sorting, through extensions including [isort](https://marketplace.visualstudio.com/items?itemName=ms-python.isort) and [Ruff](https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff).
86+
87+
8488

8589
## Supported locales
8690

extensions/positron-python/build/license-header.txt

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ PLEASE NOTE: This is the license for the Python extension for Visual Studio Code
33
- The Jupyter extension is released under an MIT License:
44
https://marketplace.visualstudio.com/items/ms-toolsai.jupyter/license
55

6-
- The isort extension is released under an MIT License:
7-
https://marketplace.visualstudio.com/items/ms-python.isort/license
8-
96
- The Pylance extension is only available in binary form and is released under a Microsoft proprietary license, the terms of which are available here:
107
https://marketplace.visualstudio.com/items/ms-python.vscode-pylance/license
118

extensions/positron-python/build/webpack/common.js

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ exports.nodeModulesToExternalize = [
2020
'unicode/category/Mc',
2121
'unicode/category/Nd',
2222
'unicode/category/Pc',
23-
'request',
24-
'request-progress',
2523
'source-map-support',
2624
'diff-match-patch',
2725
'sudo-prompt',

extensions/positron-python/gulpfile.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,13 @@ async function addExtensionPackDependencies() {
8282
// extension dependencies need not be installed during development
8383
const packageJsonContents = await fsExtra.readFile('package.json', 'utf-8');
8484
const packageJson = JSON.parse(packageJsonContents);
85-
packageJson.extensionPack = ['ms-toolsai.jupyter', 'ms-python.vscode-pylance'].concat(
85+
packageJson.extensionPack = ['ms-python.vscode-pylance'].concat(
8686
packageJson.extensionPack ? packageJson.extensionPack : [],
8787
);
88+
// Remove potential duplicates.
89+
packageJson.extensionPack = packageJson.extensionPack.filter(
90+
(item, index) => packageJson.extensionPack.indexOf(item) === index,
91+
);
8892
await fsExtra.writeFile('package.json', JSON.stringify(packageJson, null, 4), 'utf-8');
8993
}
9094

extensions/positron-python/package.json

+37-10
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
},
1919
"publisher": "ms-python",
2020
"enabledApiProposals": [
21+
"contribEditorContentMenu",
2122
"quickPickSortByLabel",
23+
"envShellEvent",
2224
"testObserver"
2325
],
2426
"author": {
@@ -40,7 +42,7 @@
4042
"theme": "dark"
4143
},
4244
"engines": {
43-
"vscode": "^1.75.0-20230123"
45+
"vscode": "^1.77.0-20230309"
4446
},
4547
"keywords": [
4648
"python",
@@ -82,7 +84,7 @@
8284
"walkthroughs": [
8385
{
8486
"id": "pythonWelcome",
85-
"title": "Get started with Python development",
87+
"title": "Get Started with Python Development",
8688
"description": "Your first steps to set up a Python project with all the powerful tools and features that the Python extension has to offer!",
8789
"when": "workspacePlatform != webworker",
8890
"steps": [
@@ -169,7 +171,7 @@
169171
},
170172
{
171173
"id": "pythonDataScienceWelcome",
172-
"title": "Get started with Python for Data Science",
174+
"title": "Get Started with Python for Data Science",
173175
"description": "Your first steps to getting started with a Data Science project with Python!",
174176
"when": "false",
175177
"steps": [
@@ -433,7 +435,14 @@
433435
"enum": [
434436
"All",
435437
"pythonSurveyNotification",
436-
"pythonPromptNewToolsExt"
438+
"pythonPromptNewToolsExt",
439+
"pythonTerminalEnvVarActivation"
440+
],
441+
"enumDescriptions": [
442+
"%python.experiments.All.description%",
443+
"%python.experiments.pythonSurveyNotification.description%",
444+
"%python.experiments.pythonPromptNewToolsExt.description%",
445+
"%python.experiments.pythonTerminalEnvVarActivation.description%"
437446
]
438447
},
439448
"scope": "machine",
@@ -447,7 +456,14 @@
447456
"enum": [
448457
"All",
449458
"pythonSurveyNotification",
450-
"pythonPromptNewToolsExt"
459+
"pythonPromptNewToolsExt",
460+
"pythonTerminalEnvVarActivation"
461+
],
462+
"enumDescriptions": [
463+
"%python.experiments.All.description%",
464+
"%python.experiments.pythonSurveyNotification.description%",
465+
"%python.experiments.pythonPromptNewToolsExt.description%",
466+
"%python.experiments.pythonTerminalEnvVarActivation.description%"
451467
]
452468
},
453469
"scope": "machine",
@@ -1680,6 +1696,18 @@
16801696
"when": "!virtualWorkspace && shellExecutionSupported"
16811697
}
16821698
],
1699+
"editor/content": [
1700+
{
1701+
"group": "Python",
1702+
"command": "python.createEnvironment",
1703+
"when": "resourceLangId == pip-requirements && !virtualWorkspace && shellExecutionSupported"
1704+
},
1705+
{
1706+
"group": "Python",
1707+
"command": "python.createEnvironment",
1708+
"when": "resourceFilename == pyproject.toml && pipInstallableToml && !virtualWorkspace && shellExecutionSupported"
1709+
}
1710+
],
16831711
"editor/context": [
16841712
{
16851713
"command": "python.execInTerminal",
@@ -1823,8 +1851,6 @@
18231851
"node-stream-zip": "^1.6.0",
18241852
"portfinder": "^1.0.28",
18251853
"reflect-metadata": "^0.1.12",
1826-
"request": "^2.87.0",
1827-
"request-progress": "^3.0.0",
18281854
"rxjs": "^6.5.4",
18291855
"rxjs-compat": "^6.5.4",
18301856
"semver": "^5.5.0",
@@ -1847,6 +1873,7 @@
18471873
},
18481874
"devDependencies": {
18491875
"@istanbuljs/nyc-config-typescript": "^1.0.2",
1876+
"@types/bent": "^7.3.0",
18501877
"@types/chai": "^4.1.2",
18511878
"@types/chai-arrays": "^2.0.0",
18521879
"@types/chai-as-promised": "^7.1.0",
@@ -1859,20 +1886,20 @@
18591886
"@types/mocha": "^9.1.0",
18601887
"@types/nock": "^10.0.3",
18611888
"@types/node": "^14.18.0",
1862-
"@types/request": "^2.47.0",
18631889
"@types/semver": "^5.5.0",
18641890
"@types/shortid": "^0.0.29",
18651891
"@types/sinon": "^10.0.11",
18661892
"@types/stack-trace": "0.0.29",
18671893
"@types/tmp": "^0.0.33",
18681894
"@types/uuid": "^8.3.4",
1869-
"@types/vscode": "1.74.0",
1895+
"@types/vscode": "^1.75.0",
18701896
"@types/which": "^2.0.1",
18711897
"@types/winreg": "^1.2.30",
18721898
"@types/xml2js": "0.4.9",
18731899
"@typescript-eslint/eslint-plugin": "^3.7.0",
18741900
"@typescript-eslint/parser": "^3.7.0",
18751901
"@vscode/test-electron": "^2.1.3",
1902+
"bent": "^7.3.12",
18761903
"chai": "^4.1.2",
18771904
"chai-arrays": "^2.0.0",
18781905
"chai-as-promised": "^7.1.1",
@@ -1916,7 +1943,7 @@
19161943
"uuid": "^8.3.2",
19171944
"vsce": "^2.6.6",
19181945
"vscode-debugadapter-testsupport": "^1.27.0",
1919-
"webpack": "^5.70.0",
1946+
"webpack": "^5.76.0",
19201947
"webpack-bundle-analyzer": "^4.5.0",
19211948
"webpack-cli": "^4.9.2",
19221949
"webpack-fix-default-import-plugin": "^1.0.3",

extensions/positron-python/package.nls.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "IntelliSense (Pylance), Linting, Debugging (multi-threaded, remote), Jupyter Notebooks, code formatting, refactoring, unit tests, and more.",
44
"python.command.python.sortImports.title": "Sort Imports",
55
"python.command.python.startREPL.title": "Start REPL",
6-
"python.command.python.createEnvironment.title": "Create Environment",
6+
"python.command.python.createEnvironment.title": "Create Environment...",
77
"python.command.python.createNewFile.title": "New Python File",
88
"python.command.python.createTerminal.title": "Create Terminal",
99
"python.command.python.execInTerminal.title": "Run Python File in Terminal",
@@ -36,6 +36,10 @@
3636
"python.experiments.enabled.description": "Enables A/B tests experiments in the Python extension. If enabled, you may get included in proposed enhancements and/or features.",
3737
"python.experiments.optInto.description": "List of experiment to opt into. If empty, user is assigned the default experiment groups. See [here](https://github.com/microsoft/vscode-python/wiki/AB-Experiments) for more details.",
3838
"python.experiments.optOutFrom.description": "List of experiment to opt out of. If empty, user is assigned the default experiment groups. See [here](https://github.com/microsoft/vscode-python/wiki/AB-Experiments) for more details.",
39+
"python.experiments.All.description": "Combined list of all experiments.",
40+
"python.experiments.pythonSurveyNotification.description": "Denotes the Python Survey Notification experiment.",
41+
"python.experiments.pythonPromptNewToolsExt.description": "Denotes the Python Prompt New Tools Extension experiment.",
42+
"python.experiments.pythonTerminalEnvVarActivation.description": "Enables use of environment variables to activate terminals instead of sending activation commands.",
3943
"python.formatting.autopep8Args.description": "Arguments passed in. Each argument is a separate item in the array.",
4044
"python.formatting.autopep8Path.description": "Path to autopep8, you can use a custom version of autopep8 by modifying this setting to include the full path.",
4145
"python.formatting.blackArgs.description": "Arguments passed in. Each argument is a separate item in the array.",
@@ -101,7 +105,7 @@
101105
"python.sortImports.path.description": "Path to isort script, default using inner version",
102106
"python.tensorBoard.logDirectory.description": "Set this setting to your preferred TensorBoard log directory to skip log directory prompt when starting TensorBoard.",
103107
"python.terminal.activateEnvInCurrentTerminal.description": "Activate Python Environment in the current Terminal on load of the Extension.",
104-
"python.terminal.activateEnvironment.description": "Activate Python Environment in Terminal created using the Extension.",
108+
"python.terminal.activateEnvironment.description": "Activate Python Environment in all Terminals created.",
105109
"python.terminal.executeInFileDir.description": "When executing a file in the terminal, whether to use execute in the file's directory, instead of the current open folder.",
106110
"python.terminal.focusAfterLaunch.description": "When launching a python terminal, whether to focus the cursor on the terminal.",
107111
"python.terminal.launchArgs.description": "Python launch arguments to use when executing a file in the terminal.",

extensions/positron-python/pythonFiles/create_venv.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,12 @@ def install_requirements(venv_path: str, requirements: List[str]) -> None:
9090
if not requirements:
9191
return
9292

93-
print(f"VENV_INSTALLING_REQUIREMENTS: {requirements}")
94-
args = []
9593
for requirement in requirements:
96-
args += ["-r", requirement]
97-
run_process(
98-
[venv_path, "-m", "pip", "install"] + args,
99-
"CREATE_VENV.PIP_FAILED_INSTALL_REQUIREMENTS",
100-
)
94+
print(f"VENV_INSTALLING_REQUIREMENTS: {requirement}")
95+
run_process(
96+
[venv_path, "-m", "pip", "install", "-r", requirement],
97+
"CREATE_VENV.PIP_FAILED_INSTALL_REQUIREMENTS",
98+
)
10199
print("CREATE_VENV.PIP_INSTALLED_REQUIREMENTS")
102100

103101

@@ -111,10 +109,12 @@ def install_toml(venv_path: str, extras: List[str]) -> None:
111109

112110

113111
def upgrade_pip(venv_path: str) -> None:
112+
print("CREATE_VENV.UPGRADING_PIP")
114113
run_process(
115114
[venv_path, "-m", "pip", "install", "--upgrade", "pip"],
116-
"CREATE_VENV.PIP_UPGRADE_FAILED",
115+
"CREATE_VENV.UPGRADE_PIP_FAILED",
117116
)
117+
print("CREATE_VENV.UPGRADED_PIP")
118118

119119

120120
def add_gitignore(name: str) -> None:

extensions/positron-python/pythonFiles/tests/test_create_venv.py

+7-13
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def run_process(args, error_message):
100100
nonlocal pip_upgraded, installing
101101
if args[1:] == ["-m", "pip", "install", "--upgrade", "pip"]:
102102
pip_upgraded = True
103-
assert error_message == "CREATE_VENV.PIP_UPGRADE_FAILED"
103+
assert error_message == "CREATE_VENV.UPGRADE_PIP_FAILED"
104104
elif args[1:-1] == ["-m", "pip", "install", "-r"]:
105105
installing = "requirements"
106106
assert error_message == "CREATE_VENV.PIP_FAILED_INSTALL_REQUIREMENTS"
@@ -146,34 +146,28 @@ def run_process(args, error_message):
146146
@pytest.mark.parametrize(
147147
("extras", "expected"),
148148
[
149-
([], None),
149+
([], []),
150150
(
151151
["requirements/test.txt"],
152-
[sys.executable, "-m", "pip", "install", "-r", "requirements/test.txt"],
152+
[[sys.executable, "-m", "pip", "install", "-r", "requirements/test.txt"]],
153153
),
154154
(
155155
["requirements/test.txt", "requirements/doc.txt"],
156156
[
157-
sys.executable,
158-
"-m",
159-
"pip",
160-
"install",
161-
"-r",
162-
"requirements/test.txt",
163-
"-r",
164-
"requirements/doc.txt",
157+
[sys.executable, "-m", "pip", "install", "-r", "requirements/test.txt"],
158+
[sys.executable, "-m", "pip", "install", "-r", "requirements/doc.txt"],
165159
],
166160
),
167161
],
168162
)
169163
def test_requirements_args(extras, expected):
170164
importlib.reload(create_venv)
171165

172-
actual = None
166+
actual = []
173167

174168
def run_process(args, error_message):
175169
nonlocal actual
176-
actual = args
170+
actual.append(args)
177171

178172
create_venv.run_process = run_process
179173

extensions/positron-python/requirements.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# 2) pip-compile --generate-hashes requirements.in
55

66
# Unittest test adapter
7-
typing-extensions==4.4.0
7+
typing-extensions==4.5.0

extensions/positron-python/requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --generate-hashes requirements.in
66
#
7-
typing-extensions==4.4.0 \
8-
--hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \
9-
--hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e
7+
typing-extensions==4.5.0 \
8+
--hash=sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb \
9+
--hash=sha256:fb33085c39dd998ac16d1431ebc293a8b3eedd00fd4a32de0ff79002c19511b4
1010
# via -r requirements.in

extensions/positron-python/src/client/activation/node/analysisOptions.ts

-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { IExperimentService } from '../../common/types';
1010

1111
import { LanguageServerAnalysisOptionsBase } from '../common/analysisOptions';
1212
import { ILanguageServerOutputChannel } from '../types';
13-
import { LspNotebooksExperiment } from './lspNotebooksExperiment';
1413
import { traceWarn } from '../../logging';
1514

1615
const EDITOR_CONFIG_SECTION = 'editor';
@@ -22,7 +21,6 @@ export class NodeLanguageServerAnalysisOptions extends LanguageServerAnalysisOpt
2221
lsOutputChannel: ILanguageServerOutputChannel,
2322
workspace: IWorkspaceService,
2423
private readonly experimentService: IExperimentService,
25-
private readonly lspNotebooksExperiment: LspNotebooksExperiment,
2624
) {
2725
super(lsOutputChannel, workspace);
2826
}
@@ -36,8 +34,6 @@ export class NodeLanguageServerAnalysisOptions extends LanguageServerAnalysisOpt
3634
return ({
3735
experimentationSupport: true,
3836
trustedWorkspaceSupport: true,
39-
lspNotebooksSupport: this.lspNotebooksExperiment.isInNotebooksExperiment(),
40-
lspInteractiveWindowSupport: this.lspNotebooksExperiment.isInNotebooksExperimentWithInteractiveWindowSupport(),
4137
autoIndentSupport: await this.isAutoIndentEnabled(),
4238
} as unknown) as LanguageClientOptions;
4339
}

extensions/positron-python/src/client/activation/node/languageClientFactory.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { PythonEnvironment } from '../../pythonEnvironments/info';
1111
import { FileBasedCancellationStrategy } from '../common/cancellationUtils';
1212
import { ILanguageClientFactory } from '../types';
1313

14-
const languageClientName = 'Pylance';
14+
export const PYLANCE_NAME = 'Pylance';
1515

1616
export class NodeLanguageClientFactory implements ILanguageClientFactory {
1717
constructor(private readonly fs: IFileSystem, private readonly extensions: IExtensions) {}
@@ -50,6 +50,6 @@ export class NodeLanguageClientFactory implements ILanguageClientFactory {
5050
},
5151
};
5252

53-
return new LanguageClient(PYTHON_LANGUAGE, languageClientName, serverOptions, clientOptions);
53+
return new LanguageClient(PYTHON_LANGUAGE, PYLANCE_NAME, serverOptions, clientOptions);
5454
}
5555
}

0 commit comments

Comments
 (0)