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

prepare bulk editor for not having an active editor, fixes #1708

Browse source
This commit is contained in:
Johannes Rieken 2016-02-02 09:25:50 +01:00
parent d9e53235c9
commit eba220d39c
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
extensions/vscode-api-tests/src/workspace.test.ts
View file

@ -6,7 +6,7 @@
'use strict';
import * as assert from 'assert';
import {workspace, TextDocument, window, Position, Uri, EventEmitter, CancellationTokenSource, Disposable} from 'vscode';
import {workspace, TextDocument, window, Position, Uri, EventEmitter, CancellationTokenSource, Disposable, WorkspaceEdit} from 'vscode';
import {createRandomFile, deleteFile, cleanUp, pathEquals} from './utils';
import {join, basename} from 'path';
import * as fs from 'fs';
@ -304,7 +304,8 @@ suite('workspace-namespace', () => {
return new Promise((resolve, reject) => {
workspace.onDidChangeTextDocument(event => {
let subscription = workspace.onDidChangeTextDocument(event => {
subscription.dispose();
assert.ok(event.document === doc);
assert.equal(event.document.getText(), 'call1');
resolve();
@ -334,4 +335,13 @@ suite('workspace-namespace', () => {
assert.equal(res, void 0);
});
});
test('applyEdit', () => {
return workspace.openTextDocument(Uri.parse('untitled://' + join(workspace.rootPath, './new2.txt'))).then(doc => {
let edit = new WorkspaceEdit();
edit.insert(doc.uri, new Position(0, 0), new Array(1000).join('Hello World'));
return workspace.applyEdit(edit);
});
});
});

4
src/vs/editor/common/services/bulkEdit.ts
View file

@ -212,7 +212,7 @@ class BulkEditModel {
var textEditorModel = <IModel>model.textEditorModel,
task: EditTask;
if (textEditorModel.getAssociatedResource().toString() === this._sourceModel.toString()) {
if (this._sourceModel && textEditorModel.getAssociatedResource().toString() === this._sourceModel.toString()) {
this._sourceModelTask = new SourceModelEditTask(textEditorModel, this._sourceSelections);
task = this._sourceModelTask;
} else {
@ -287,7 +287,7 @@ export function createBulkEdit(eventService: IEventService, editorService: IEdit
let uri: URI;
let selections: IEditorSelection[];
if (editor) {
if (editor && editor.getModel()) {
uri = editor.getModel().getAssociatedResource();
selections = editor.getSelections();
}