Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-22 09:38:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix file saving

Browse Source
This commit is contained in:
rebornix
2020-02-20 11:37:52 -08:00
parent cc14e23f80
commit 88fe19294f
5 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/vs/workbench/api/common/extHostNotebook.ts
View File

@@ -13,7 +13,7 @@ import { DisposableStore } from 'vs/base/common/lifecycle';
import { readonly } from 'vs/base/common/errors';
import { Emitter, Event } from 'vs/base/common/event';
import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
import { INotebookDisplayOrder, IGenericOutput } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { INotebookDisplayOrder, IGenericOutput, parseCellUri } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { ISplice } from 'vs/base/common/sequence';
interface ExtHostOutputDisplayOrder {
@@ -421,21 +421,25 @@ export class ExtHostNotebookEditor implements vscode.NotebookEditor {
public document: ExtHostNotebookDocument,
private _documentsAndEditors: ExtHostDocumentsAndEditors
) {
let regex = new RegExp(`notebook\\+${viewType}-(\\d+)-(\\d+)`);
const regex = new RegExp(/cell_(\d)*\./g);
this._documentsAndEditors.onDidAddDocuments(documents => {
for (const data of documents) {
let textDocument = data.document;
let authority = textDocument.uri.authority;
let parsedCellUri = parseCellUri(textDocument.uri);
if (authority !== '') {
let matches = regex.exec(authority);
if (matches) {
const notebookHandle = matches[1];
const cellHandle = matches[2];
if (!parsedCellUri) {
continue;
}
if (Number(notebookHandle) === this.document.handle) {
document.attachCellTextDocument(Number(cellHandle), textDocument);
}
let notebookUri = parsedCellUri.notebook;
let cellFsPath = textDocument.uri.fsPath;
let matches = regex.exec(cellFsPath);
if (matches) {
const cellHandle = matches[1];
if (this.document.uri.fsPath === notebookUri.fsPath) {
document.attachCellTextDocument(Number(cellHandle), textDocument);
}
}
}
@@ -444,17 +448,21 @@ export class ExtHostNotebookEditor implements vscode.NotebookEditor {
this._documentsAndEditors.onDidRemoveDocuments(documents => {
for (const data of documents) {
let textDocument = data.document;
let authority = textDocument.uri.authority;
let parsedCellUri = parseCellUri(textDocument.uri);
if (authority !== '') {
let matches = regex.exec(authority);
if (matches) {
const notebookHandle = matches[1];
const cellHandle = matches[2];
if (!parsedCellUri) {
continue;
}
if (Number(notebookHandle) === this.document.handle) {
document.detachCellTextDocument(Number(cellHandle), textDocument);
}
let notebookUri = parsedCellUri.notebook;
let cellFsPath = textDocument.uri.fsPath;
let matches = regex.exec(cellFsPath);
if (matches) {
const cellHandle = matches[1];
if (this.document.uri.fsPath === notebookUri.fsPath) {
document.detachCellTextDocument(Number(cellHandle), textDocument);
}
}
}