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

Fix ctrl+enter and alt+enter by removing the redundant command. #4769

Merged
merged 2 commits into from
Feb 12, 2021

Conversation

rchiodo
Copy link
Contributor

@rchiodo rchiodo commented Feb 11, 2021

For #4713

@rchiodo rchiodo requested a review from a team as a code owner February 11, 2021 22:58
package.json Outdated
@@ -86,7 +86,7 @@
{
"command": "jupyter.runcurrentcell",
"key": "ctrl+enter",
"when": "editorTextFocus && !editorHasSelection && jupyter.hascodecells && !notebookEditorFocused"
"when": "editorTextFocus && !editorHasSelection && jupyter.hascodecells && !notebookEditorFocused && !jupyter.hasnativecells"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have has here, it's actually havenativecells. Annoying I know, wish we could actually have safe typing on these :/

@codecov-io
Copy link

Codecov Report

Merging #4769 (e1aa19b) into main (118bc83) will increase coverage by 0%.
The diff coverage is n/a.

@@          Coverage Diff           @@
##            main   #4769    +/-   ##
======================================
  Coverage     76%     76%            
======================================
  Files        411     411            
  Lines      26958   26963     +5     
  Branches    3907    3908     +1     
======================================
+ Hits       20639   20756   +117     
+ Misses      4729    4601   -128     
- Partials    1590    1606    +16     
Impacted Files Coverage Δ
...t/datascience/notebook/helpers/executionHelpers.ts 68% <0%> (-8%) ⬇️
...lient/datascience/jupyter/kernels/cellExecution.ts 77% <0%> (-6%) ⬇️
...nt/datascience/notebook/helpers/notebookUpdater.ts 94% <0%> (-6%) ⬇️
src/client/common/errors/errorUtils.ts 77% <0%> (-4%) ⬇️
src/client/common/process/baseDaemon.ts 54% <0%> (-3%) ⬇️
...lient/datascience/kernel-launcher/kernelProcess.ts 82% <0%> (-2%) ⬇️
src/client/datascience/telemetry/telemetry.ts 85% <0%> (-2%) ⬇️
src/client/datascience/notebook/kernelProvider.ts 78% <0%> (-2%) ⬇️
src/client/datascience/constants.ts 99% <0%> (+<1%) ⬆️
...active-common/intellisense/intellisenseProvider.ts 74% <0%> (+<1%) ⬆️
... and 17 more

@rchiodo rchiodo merged commit 4d51730 into main Feb 12, 2021
@rchiodo rchiodo deleted the rchiodo/keyboard_shortcuts branch February 12, 2021 00:28
rchiodo added a commit that referenced this pull request Feb 12, 2021
* Fix ctrl+enter and alt+enter by removing the redundant command.

* Code review feedback
rchiodo added a commit that referenced this pull request Feb 12, 2021
* Fix ctrl+enter and alt+enter by removing the redundant command. (#4769)

* Fix ctrl+enter and alt+enter by removing the redundant command.

* Code review feedback

* Update changelog
rchiodo added a commit that referenced this pull request Feb 18, 2021
* Fix ctrl+enter and alt+enter by removing the redundant command. (#4769)

* Fix ctrl+enter and alt+enter by removing the redundant command.

* Code review feedback

* Update changelog
rchiodo added a commit that referenced this pull request Feb 18, 2021
* PORT Variable view icon to release branch (#4748)

* update changelog (#4752)

* Cherry pick change for icon overflow (#4753)

* Change number of icons in notebook toolbar (#4747)

* Fix icons

* Have trust command show up and nothing else if untrusted

* Add trust check to all commands

* Update based on discussion

* Update change log

* PORT - variable context (#4770)

* Add new editor context for just if native notebook is active (#4762)

* update news

Co-authored-by: Ian Huff <ianhuff@LICHYOGAIOT.northamerica.corp.microsoft.com>

* Port control enter fix to release (#4774)

* Fix ctrl+enter and alt+enter by removing the redundant command. (#4769)

* Fix ctrl+enter and alt+enter by removing the redundant command.

* Code review feedback

* Update changelog

* port .NET fix to release (#4776)

* Fix .NET interactive to always use native (#4772)

* Fix .NET interactive

* Fix tests and linter

* Update changelog

* Port kernel finder change to release (#4799)

* Fix duplicate kernel generation (#4790)

* Fix duplicate kernel generation

* Fix functional tests

* Update changelog

* Actually use stable

* PORT - Port document dispose fix to release. (#4798)

* Only clean up editors on close not on Panel dispose (#4787)

* update changelog

Co-authored-by: Ian Huff <ianhuff@LICHYOGAIOT.northamerica.corp.microsoft.com>

* Port surveys (#4804)

* Refactor surveys and add a new one (#4794)

* Refactor surveys and add a new one

* add news and lint

* lint

* lint

* PR comments

* update changelog

* Fix IJupyterExtensionBanner service identifier (#4825)

Co-authored-by: Joyce Er <joyceerhuiling@gmail.com>

* PORT - Fix for top level save and undo commands (#4851)

* Update cache ignore

* Actually ignore .so files

* Update release plan

* Put back package.json changes

* Delete news entries

Co-authored-by: Ian Huff <ianhu@microsoft.com>
Co-authored-by: David Kutugata <dakutuga@microsoft.com>
Co-authored-by: Ian Huff <ianhuff@LICHYOGAIOT.northamerica.corp.microsoft.com>
Co-authored-by: Joyce Er <joyceerhuiling@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants