Skip to content

Fix more ds functional tests #10260

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
DonJayamanne merged 2 commits into from
Feb 22, 2020
Merged

Fix more ds functional tests #10260

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6b180e
Eureka
DonJayamanne Feb 21, 2020
49d986f
misc
DonJayamanne Feb 21, 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
24 changes: 11 additions & 13 deletions src/client/datascience/interactive-ipynb/nativeEditor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,17 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
// VS code is telling us to broadcast this to our UI. Tell the UI about the new change
await this.postMessage(InteractiveWindowMessages.UpdateModel, change);
}

// Use the current state of the model to indicate dirty (not the message itself)
if (this._model && change.newDirty !== change.oldDirty) {
this.modifiedEvent.fire();
if (this._model.isDirty) {
await this.postMessage(InteractiveWindowMessages.NotebookDirty);
} else {
// Then tell the UI
await this.postMessage(InteractiveWindowMessages.NotebookClean);
}
}
}
private interruptExecution() {
this.executeCancelTokens.forEach(t => t.cancel());
Expand Down Expand Up @@ -524,19 +535,6 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
false,
cancelToken
);

if (!cancelToken.isCancellationRequested) {
// Activate the other side, and send as if came from a file
await this.editorProvider.show(this.file);
this.shareMessage(InteractiveWindowMessages.RemoteReexecuteCode, {
code: entry.code,
file: Identifiers.EmptyFileName,
line: 0,
id: entry.cell.id,
originator: this.id,
debug: false
});
}
}
} catch (exc) {
// Make this error our cell output
Expand Down