Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-21 09:08:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #155148 from microsoft/joh/double-barnacle

Browse Source 
joh/double barnacle
This commit is contained in:
Johannes Rieken
2022-07-18 16:45:00 +02:00
committed by GitHub
parent f127c6cf28 0f0101be5f
commit 8bada27fdd
11 changed files with 105 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/vs/workbench/api/test/browser/extHostEditorTabs.test.ts
View File

@@ -10,7 +10,7 @@ import { mock } from 'vs/base/test/common/mock';
import { IEditorTabDto, IEditorTabGroupDto, MainThreadEditorTabsShape, TabInputKind, TabModelOperationKind, TextInputDto } from 'vs/workbench/api/common/extHost.protocol';
import { ExtHostEditorTabs } from 'vs/workbench/api/common/extHostEditorTabs';
import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';
import { TextTabInput } from 'vs/workbench/api/common/extHostTypes';
import { TextMergeTabInput, TextTabInput } from 'vs/workbench/api/common/extHostTypes';
suite('ExtHostEditorTabs', function () {
@@ -209,6 +209,37 @@ suite('ExtHostEditorTabs', function () {
assert.strictEqual(extHostEditorTabs.tabGroups.activeTabGroup, first);
});
test('TextMergeTabInput surfaces in the UI', function () {
const extHostEditorTabs = new ExtHostEditorTabs(
SingleProxyRPCProtocol(new class extends mock<MainThreadEditorTabsShape>() {
// override/implement $moveTab or $closeTab
})
);
const tab: IEditorTabDto = createTabDto({
input: {
kind: TabInputKind.TextMergeInput,
base: URI.from({ scheme: 'test', path: 'base' }),
input1: URI.from({ scheme: 'test', path: 'input1' }),
input2: URI.from({ scheme: 'test', path: 'input2' }),
result: URI.from({ scheme: 'test', path: 'result' }),
}
});
extHostEditorTabs.$acceptEditorTabModel([{
isActive: true,
viewColumn: 0,
groupId: 12,
tabs: [tab]
}]);
assert.strictEqual(extHostEditorTabs.tabGroups.all.length, 1);
const [first] = extHostEditorTabs.tabGroups.all;
assert.ok(first.activeTab);
assert.strictEqual(first.tabs.indexOf(first.activeTab), 0);
assert.ok(first.activeTab.input instanceof TextMergeTabInput);
});
test('Ensure reference stability', function () {
const extHostEditorTabs = new ExtHostEditorTabs(