add TextEdit#newEol, adopt for workspace edit and onWillSave-event

This commit is contained in:
Johannes Rieken
2017-03-24 16:13:58 +01:00
parent 0219720936
commit 1849ad23a7
12 changed files with 153 additions and 69 deletions

View File

@@ -8,9 +8,9 @@ import URI from 'vs/base/common/uri';
import { normalize } from 'vs/base/common/paths';
import { relative } from 'path';
import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
import { IResourceTextEdit } from 'vs/editor/common/services/bulkEdit';
import { IResourceEdit } from 'vs/editor/common/services/bulkEdit';
import { TPromise } from 'vs/base/common/winjs.base';
import { fromRange } from 'vs/workbench/api/node/extHostTypeConverters';
import { fromRange, EndOfLine } from 'vs/workbench/api/node/extHostTypeConverters';
import { MainContext, MainThreadWorkspaceShape } from './extHost.protocol';
import * as vscode from 'vscode';
@@ -70,7 +70,7 @@ export class ExtHostWorkspace {
appyEdit(edit: vscode.WorkspaceEdit): TPromise<boolean> {
let resourceEdits: IResourceTextEdit[] = [];
let resourceEdits: IResourceEdit[] = [];
let entries = edit.entries();
for (let entry of entries) {
@@ -80,7 +80,8 @@ export class ExtHostWorkspace {
resourceEdits.push({
resource: <URI>uri,
newText: edit.newText,
range: fromRange(edit.range)
newEol: EndOfLine.from(edit.newEol),
range: edit.range && fromRange(edit.range)
});
}
}