Skip to content

Fix code lens perf for interactive window #11142

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.

Sign up for GitHub

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

Merged
Rich Chiodo (rchiodo) merged 12 commits into from
Apr 14, 2020
Merged

Fix code lens perf for interactive window #11142

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
18d8968
Eliminate first level of redundancy
rchiodo Apr 13, 2020
f02d847
Working with a cache
rchiodo Apr 13, 2020
6be574a
Add test to verify no more generating cell ranges
rchiodo Apr 13, 2020
82605b0
Add news entry
rchiodo Apr 13, 2020
09c2b49
Clean up on closing
rchiodo Apr 13, 2020
d17058b
Make sure close and reopen works
rchiodo Apr 13, 2020
1806922
Fix sonar errors
rchiodo Apr 13, 2020
7d5a6dc
Fix restart
rchiodo Apr 13, 2020
916d77b
Fix wrong IDisposable type
rchiodo Apr 13, 2020
f1e7138
Rename restartedKernel to onKernelRestarted
rchiodo Apr 13, 2020
6c87fb1
Recompute when changing settings
rchiodo Apr 13, 2020
18f7582
Clear out document close event when document closes
rchiodo Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Recompute when changing settings
  • Loading branch information
@rchiodo
rchiodo committed Apr 13, 2020
commit 6c87fb178c6042bb06c890f9a398cf2aa270b0c1
3 changes: 3 additions & 0 deletions src/client/datascience/editor-integration/codeLensFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,9 @@ export class CodeLensFactory implements ICodeLensFactory, IInteractiveWindowList
private onChangedSettings() {
// When config settings change, refresh our code lenses.
this.codeLensCache.clear();

@IanMatthewHuff Ian Huff (IanMatthewHuff) Apr 13, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks like it's on any settings change.

@IanMatthewHuff Ian Huff (IanMatthewHuff) Apr 13, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think there is that .affectConfiguration function we should be using here. Or else we are clearing these out too much.

@rchiodo Rich Chiodo (rchiodo) Apr 13, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

No there isn't. Not on the config settings. That's on the workspaceConfiguration.

@rchiodo Rich Chiodo (rchiodo) Apr 13, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

And the worst case is that the code lens are regenerated whenever you change your python settings. Meh.

@rchiodo Rich Chiodo (rchiodo) Apr 13, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

You can see where the configSettings uses that 'affectsConfiguration' in the configSettings.ts file (line 571 or so). It will only fire an onDidChangeSettings when the python settings change.

In reply to: 407782405 [](ancestors = 407782405)

@rchiodo Rich Chiodo (rchiodo) Apr 13, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

We should probably recompute the code lenses though. Otherwise the next execution will recompute them all.

In reply to: 407782955 [](ancestors = 407782955,407782405)


// Force an update so that code lenses are recomputed now and not during execution.
this.updateEvent.fire();
}

private enumerateCommands(resource: Resource): string[] {
Expand Down