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

strict null trouble

Browse Source
This commit is contained in:
Johannes Rieken
2019-03-19 15:45:18 +01:00
parent 6c17a35f11
commit cfd4cb8c81
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/common/extHost.protocol.ts
View File

@@ -216,7 +216,7 @@ export interface IUndoStopOptions {
}
export interface IApplyEditsOptions extends IUndoStopOptions {
setEndOfLine: EndOfLineSequence;
setEndOfLine?: EndOfLineSequence;
}
export interface ITextDocumentShowOptions {

4
src/vs/workbench/api/electron-browser/mainThreadEditor.ts
View File

@@ -447,7 +447,9 @@ export class MainThreadTextEditor {
return false;
}
this._model.pushEOL(opts.setEndOfLine);
if (typeof opts.setEndOfLine !== 'undefined') {
this._model.pushEOL(opts.setEndOfLine);
}
const transformedEdits = edits.map((edit): IIdentifiedSingleEditOperation => {
return {

2
src/vs/workbench/api/node/extHostTextEditor.ts
View File

@@ -607,7 +607,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
});
return this._proxy.$tryApplyEdits(this._id, editData.documentVersionId, edits, {
setEndOfLine: TypeConverters.EndOfLine.from(editData.setEndOfLine),
setEndOfLine: editData.setEndOfLine && TypeConverters.EndOfLine.from(editData.setEndOfLine),
undoStopBefore: editData.undoStopBefore,
undoStopAfter: editData.undoStopAfter
});