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

make sure that the falsy value for the activeTextEditor is undefined, #5022

Browse source
This commit is contained in:
Johannes Rieken 2016-04-06 17:42:59 +02:00
parent 8bced8eac0
commit 78dcfe10d8
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
extensions/vscode-api-tests/src/window.test.ts
View file

@ -6,11 +6,11 @@
'use strict'; 'use strict';
import * as assert from 'assert'; import * as assert from 'assert';
import {workspace, window, commands, ViewColumn, TextEditor, TextEditorViewColumnChangeEvent, Uri} from 'vscode'; import {workspace, window, ViewColumn, TextEditorViewColumnChangeEvent, Uri} from 'vscode';
import {join} from 'path'; import {join} from 'path';
import {cleanUp, pathEquals} from './utils'; import {cleanUp, pathEquals} from './utils';
suite("window namespace tests", () => { suite('window namespace tests', () => {
teardown(cleanUp); teardown(cleanUp);
@ -24,6 +24,11 @@ suite("window namespace tests", () => {
}); });
}); });
test('editor, UN-active text editor', () => {
assert.equal(window.visibleTextEditors.length, 0);
assert.ok(window.activeTextEditor === undefined);
});
test('editor, assign and check view columns', () => { test('editor, assign and check view columns', () => {
return workspace.openTextDocument(join(workspace.rootPath, './far.js')).then(doc => { return workspace.openTextDocument(join(workspace.rootPath, './far.js')).then(doc => {
@ -48,7 +53,7 @@ suite("window namespace tests", () => {
provideTextDocumentContent() { provideTextDocumentContent() {
return 'mountainbiking,roadcycling'; return 'mountainbiking,roadcycling';
} }
}) });
return Promise.all([ return Promise.all([
workspace.openTextDocument(Uri.parse('bikes://testing/one')).then(doc => window.showTextDocument(doc, ViewColumn.One)), workspace.openTextDocument(Uri.parse('bikes://testing/one')).then(doc => window.showTextDocument(doc, ViewColumn.One)),
@ -74,7 +79,7 @@ suite("window namespace tests", () => {
assert.ok(actualEvent.viewColumn === two.viewColumn); assert.ok(actualEvent.viewColumn === two.viewColumn);
registration1.dispose(); registration1.dispose();
}) });
}); });
}); });
}); });

2
src/vs/workbench/api/node/extHostEditors.ts
View file

@ -77,7 +77,7 @@ export class ExtHostEditors {
} }
getActiveTextEditor(): vscode.TextEditor { getActiveTextEditor(): vscode.TextEditor {
return this._activeEditorId && this._editors[this._activeEditorId]; return this._editors[this._activeEditorId];
} }
getVisibleTextEditors(): vscode.TextEditor[] { getVisibleTextEditors(): vscode.TextEditor[] {