maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #99640 from DonJayamanne/fixCellJoin

Browse source 
Use eol when joining cells
This commit is contained in:
Peng Lyu 2020-06-08 16:09:20 -07:00 committed by GitHub
commit aced01dded
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
View file

@ -992,8 +992,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
if (!above.hasModel()) {
return null;
}
const insertContent = cell.getText();
const insertContent = (cell.textModel?.getEOL() ?? '') + cell.getText();
const aboveCellLineCount = above.textModel.getLineCount();
const aboveCellLastLineEndColumn = above.textModel.getLineLength(aboveCellLineCount);
above.textModel.applyEdits([
@ -1017,7 +1016,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
return null;
}
const insertContent = below.getText();
const insertContent = (cell.textModel?.getEOL() ?? '') + below.getText();
const cellLineCount = cell.textModel.getLineCount();
const cellLastLineEndColumn = cell.textModel.getLineLength(cellLineCount);