Skip to content

Issue 12414 python interactive cell editing shortcuts #12529

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 27 commits into from
Aug 3, 2020
Merged

Issue 12414 python interactive cell editing shortcuts #12529

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8f1fd7b
refactored ICellRange definition to type.ts since it's now used acros…
Jun 19, 2020
fd5e865
add command insertCellBelowPosition
Jun 20, 2020
127e2df
add command insertCellBelow
Jun 20, 2020
38fad86
add command insertCellAbove
Jun 20, 2020
5afe4cc
add deleteCells command
Jun 21, 2020
dd846c1
add selectCell command
Jun 21, 2020
cfeccbb
add selectCellContents command
Jun 21, 2020
500fe5a
modify selectCell to maintain previous orientation of selection ancho…
Jun 21, 2020
cf5e404
fix detection of anchor and active position direction
Jun 21, 2020
aa39444
add extendSelectionByCellAbove
Jun 21, 2020
9a073aa
add extendSelectionByCellBelow
Jun 22, 2020
4a95409
add moveCellsUp
Jun 23, 2020
95fc70d
add moveCellsDown
Jun 23, 2020
cc37494
added news file for enhancement changes being added
Jun 24, 2020
1f73555
add changeCellToMarkdown
Jun 28, 2020
e62137a
add changeCellToCode
Jul 10, 2020
f624692
Remove cell edit commands from context menu
Jul 10, 2020
9a17d5f
Use the insertCell method to insert a cell when RunCellAndAdvance rea…
Jul 10, 2020
0ae48a6
Use the insertCell method to insert cell within addEmptyCellToBottom
Jul 10, 2020
8842cde
Add telemetry for cell edit commands in interactive python
Jul 10, 2020
8d1ae3f
Add codeLensFactory.getCodeLensCacheData and abstracted the cell rang…
Jul 10, 2020
db47d3a
clean up async and promises within codewatcher.ts
Jul 13, 2020
4fdd64c
clean up unnecessary Promise.resolve()
Jul 14, 2020
9876718
refactor unnecessary async functions to sync functions
Jul 31, 2020
0b83e38
added unit tests for move cells down
Jul 31, 2020
6ac5741
Merge branch 'master' into issue-12414-python-interactive-cell-shortcuts
Jul 31, 2020
716200b
change the when for commands to display when the python file has cells
Aug 1, 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
Merge branch 'master' into issue-12414-python-interactive-cell-shortcuts 
Resolved conflicts by merging master changes into branch changes manually to keep all new master changes.

Conflicts:
	package.nls.json
	src/client/common/application/commands.ts
	src/client/datascience/editor-integration/codewatcher.ts
  • Loading branch information
earthastronaut
earthastronaut committed Jul 31, 2020
commit 6ac574137cd5ee56580cf8df031b2f377c195c50
1 change: 1 addition & 0 deletions package.nls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
"python.command.python.datascience.changeCellToMarkdown.title": "Change Cell to Markdown",
"python.command.python.datascience.changeCellToCode.title": "Change Cell to Code",
"python.command.python.datascience.showhistorypane.title": "Show Python Interactive Window",
"python.command.python.datascience.createnewinteractive.title": "Create Python Interactive Window",
"python.command.python.datascience.selectjupyteruri.title": "Specify local or remote Jupyter server for connections",
"python.command.python.datascience.selectjupytercommandline.title": "Specify Jupyter command line arguments",
"python.command.python.datascience.importnotebook.title": "Import Jupyter Notebook",
Expand Down
4 changes: 2 additions & 2 deletions src/client/common/application/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export interface ICommandNameArgumentTypeMapping extends ICommandNameWithoutArgu
[DSCommands.DebugStepOver]: [];
[DSCommands.DebugStop]: [];
[DSCommands.DebugContinue]: [];
[DSCommands.RunCurrentCellAndAddBelow]: [string];
[DSCommands.RunCurrentCellAndAddBelow]: [Uri];
[DSCommands.InsertCellBelowPosition]: [];
[DSCommands.InsertCellBelow]: [];
[DSCommands.InsertCellAbove]: [];
Expand All @@ -183,7 +183,7 @@ export interface ICommandNameArgumentTypeMapping extends ICommandNameWithoutArgu
[DSCommands.MoveCellsDown]: [];
[DSCommands.ChangeCellToMarkdown]: [];
[DSCommands.ChangeCellToCode]: [];
[DSCommands.ScrollToCell]: [string, string];
[DSCommands.ScrollToCell]: [Uri, string];
[DSCommands.ViewJupyterOutput]: [];
[DSCommands.ExportAsPythonScript]: [INotebookModel];
[DSCommands.ExportToHTML]: [INotebookModel, string | undefined];
Expand Down
12 changes: 7 additions & 5 deletions src/client/datascience/editor-integration/codewatcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
ICodeLensFactory,
ICodeWatcher,
IDataScienceErrorHandler,
IDataScienceFileSystem,
IInteractiveWindowProvider
} from '../types';

Expand All @@ -55,9 +56,6 @@ function getIndex(index: number, length: number): number {

@injectable()
export class CodeWatcher implements ICodeWatcher {
public get codeLensUpdated(): Event<void> {
return this.codeLensUpdatedEvent.event;
}
private static sentExecuteCellTelemetry: boolean = false;
private document?: TextDocument;
private version: number = -1;
Expand Down Expand Up @@ -98,8 +96,12 @@ export class CodeWatcher implements ICodeWatcher {
this.closeDocumentDisposable = this.documentManager.onDidCloseTextDocument(this.onDocumentClosed.bind(this));
}

public getFileName() {
return this.fileName;
public get codeLensUpdated(): Event<void> {
return this.codeLensUpdatedEvent.event;
}

public get uri() {
return this.document?.uri;
}

public getVersion() {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.