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

Run by Line #6655

Merged
merged 14 commits into from
Jul 16, 2021
Merged

Run by Line #6655

merged 14 commits into from
Jul 16, 2021

Conversation

DavidKutu
Copy link

For #6208, #6209

  • Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR).
  • Title summarizes what is changing.
  • Has a news entry file (remember to thank yourself!).
  • Appropriate comments and documentation strings in the code.
  • Has sufficient logging.
  • Has telemetry for enhancements.
  • Unit tests & system/integration tests are added/updated.
  • Test plan is updated as appropriate.
  • package-lock.json has been regenerated by running npm install (if dependencies have changed).

@codecov-commenter
Copy link

codecov-commenter commented Jul 13, 2021

Codecov Report

Merging #6655 (3ba0fe5) into main (e3a963b) will decrease coverage by 0%.
The diff coverage is 11%.

❗ Current head 3ba0fe5 differs from pull request most recent head 4c50546. Consider uploading reports for the commit 4c50546 to get more accurate results

@@          Coverage Diff          @@
##            main   #6655   +/-   ##
=====================================
- Coverage     69%     68%   -1%     
=====================================
  Files        412     412           
  Lines      28523   28588   +65     
  Branches    4255    4265   +10     
=====================================
- Hits       19712   19711    -1     
- Misses      7144    7207   +63     
- Partials    1667    1670    +3     
Impacted Files Coverage Δ
src/client/debugger/jupyter/kernelDebugAdapter.ts 4% <1%> (-2%) ⬇️
src/client/debugger/jupyter/debuggingManager.ts 31% <17%> (-4%) ⬇️
src/client/datascience/constants.ts 99% <100%> (+<1%) ⬆️
src/client/common/process/pythonDaemonPool.ts 75% <0%> (-5%) ⬇️
...datascience/interactive-common/notebookProvider.ts 81% <0%> (-4%) ⬇️
src/client/datascience/raw-kernel/rawSocket.ts 84% <0%> (-2%) ⬇️
...client/datascience/kernel-launcher/kernelDaemon.ts 53% <0%> (-2%) ⬇️
src/client/datascience/baseJupyterSession.ts 68% <0%> (-1%) ⬇️
src/client/datascience/jupyter/jupyterNotebook.ts 76% <0%> (-1%) ⬇️
...ient/datascience/interactive-ipynb/nativeEditor.ts 69% <0%> (-1%) ⬇️
... and 2 more

@DavidKutu DavidKutu marked this pull request as ready for review July 16, 2021 21:57
@DavidKutu DavidKutu requested a review from a team as a code owner July 16, 2021 21:57
package.json Outdated
@@ -24,7 +24,7 @@
"theme": "light"
},
"engines": {
"vscode": "1.59.0-insider"
"vscode": "^1.58.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe this is a merge issue?

Copy link
Author

Choose a reason for hiding this comment

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

yes, sorry

@@ -281,7 +281,28 @@
"title": "Debug",
"icon": "$(bug)",
"category": "Jupyter",
"enablement": "notebookKernelCount > 0 && !jupyter.notebookeditor.debuggingInProgress && config.jupyter.experimental.debugging"
"enablement": "notebookKernelCount > 0 && !jupyter.notebookeditor.debuggingInProgress && !jupyter.notebookeditor.runByLineInProgress && config.jupyter.experimental.debugging"
Copy link
Contributor

Choose a reason for hiding this comment

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

Could the 'debuggingInProgress' context key be true when run by line is in progress? So that the enablement clause here can be shorter?

Copy link
Author

@DavidKutu DavidKutu Jul 16, 2021

Choose a reason for hiding this comment

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

It can't, but we don't want users to be able to press RBL while debugging and vice versa.
Also we don't want them to be able to press RBL if they're already RBLing.

this.session = new Promise<DebugSession>((resolve, reject) => {
this.resolveFunc = resolve;
this.rejectFunc = reject;

debug
.startDebugging(undefined, {
type: DataScience.pythonKernelDebugAdapter(),
name: `${path.basename(document.uri.toString())}`,
name: `${path.basename(name)}`,
Copy link
Contributor

Choose a reason for hiding this comment

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

path.basename works with ? in it? I mean I'd think that would work but seems like an invalid file name?

Copy link
Author

Choose a reason for hiding this comment

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

it does work, I use it to differentiate between run by line and normal debugging.

I'm open to change it if you have a suggestion

Copy link
Author

Choose a reason for hiding this comment

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

nvm, I'll use it the same, but will use path.basename only on the doc URI

@DavidKutu DavidKutu merged commit b2f352d into main Jul 16, 2021
@DavidKutu DavidKutu deleted the david/runByLineIcon branch July 16, 2021 23:19
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.

3 participants