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

debt - shuffle some windows service methods around

Browse Source
This commit is contained in:
Benjamin Pasero
2017-07-03 16:35:45 +02:00
parent f82aaac1ae
commit 5e8cd0e93f
11 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/browser/actions/fileActions.ts
View File

@@ -73,6 +73,10 @@ export class AddRootFolderAction extends Action {
}
return this.windowService.pickFolder({ buttonLabel: nls.localize('add', "Add"), title: nls.localize('addFolderToWorkspaceTitle', "Add Folder to Workspace") }).then(folders => {
if (!folders.length) {
return TPromise.as(null);
}
return this.workspaceEditingService.addRoots(folders.map(folder => URI.file(folder))).then(() => {
return this.viewletService.openViewlet(this.viewletService.getDefaultViewletId(), true);
});

5
src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
View File

@@ -31,7 +31,7 @@ import { TitleControl, ITitleAreaControl } from 'vs/workbench/browser/parts/edit
import { NoTabsTitleControl } from 'vs/workbench/browser/parts/editor/noTabsTitleControl';
import { IEditorStacksModel, IStacksModelChangeEvent, IEditorGroup, EditorOptions, TextEditorOptions, IEditorIdentifier } from 'vs/workbench/common/editor';
import { extractResources } from 'vs/base/browser/dnd';
import { IWindowService } from 'vs/platform/windows/common/windows';
import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
import { getCodeEditor } from 'vs/editor/common/services/codeEditorService';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { editorBackground, contrastBorder, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
@@ -147,6 +147,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
@IExtensionService private extensionService: IExtensionService,
@IInstantiationService private instantiationService: IInstantiationService,
@IWindowService private windowService: IWindowService,
@IWindowsService private windowsService: IWindowsService,
@IThemeService themeService: IThemeService
) {
super(themeService);
@@ -1117,7 +1118,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
// Add external ones to recently open list
const externalResources = droppedResources.filter(d => d.isExternal).map(d => d.resource);
if (externalResources.length) {
$this.windowService.addToRecentlyOpen(externalResources.map(resource => {
$this.windowsService.addToRecentlyOpen(externalResources.map(resource => {
return {
path: resource.fsPath,
isFile: true

5
src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
View File

@@ -29,7 +29,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IMenuService } from 'vs/platform/actions/common/actions';
import { IWindowService } from 'vs/platform/windows/common/windows';
import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
import { TitleControl } from 'vs/workbench/browser/parts/editor/titleControl';
import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
import { IDisposable, dispose, combinedDisposable } from 'vs/base/common/lifecycle';
@@ -72,6 +72,7 @@ export class TabsTitleControl extends TitleControl {
@IMenuService menuService: IMenuService,
@IQuickOpenService quickOpenService: IQuickOpenService,
@IWindowService private windowService: IWindowService,
@IWindowsService private windowsService: IWindowsService,
@IThemeService themeService: IThemeService
) {
super(contextMenuService, instantiationService, editorService, editorGroupService, contextKeyService, keybindingService, telemetryService, messageService, menuService, quickOpenService, themeService);
@@ -690,7 +691,7 @@ export class TabsTitleControl extends TitleControl {
// Add external ones to recently open list
const externalResources = resources.filter(d => d.isExternal).map(d => d.resource);
if (externalResources.length) {
this.windowService.addToRecentlyOpen(externalResources.map(resource => {
this.windowsService.addToRecentlyOpen(externalResources.map(resource => {
return {
path: resource.fsPath,
isFile: true

4
src/vs/workbench/services/history/browser/history.ts
View File

@@ -23,7 +23,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
import { once } from 'vs/base/common/event';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
import { IWindowService } from 'vs/platform/windows/common/windows';
import { IWindowsService } from 'vs/platform/windows/common/windows';
import { getCodeEditor } from 'vs/editor/common/services/codeEditorService';
import { getExcludes, ISearchConfiguration } from 'vs/platform/search/common/search';
import { parse, IExpression } from 'vs/base/common/glob';
@@ -166,7 +166,7 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
@IConfigurationService private configurationService: IConfigurationService,
@ILifecycleService private lifecycleService: ILifecycleService,
@IFileService private fileService: IFileService,
@IWindowService private windowService: IWindowService,
@IWindowsService private windowService: IWindowsService,
@IInstantiationService private instantiationService: IInstantiationService,
) {
super(editorGroupService, editorService);

10
src/vs/workbench/test/workbenchTestServices.ts
View File

@@ -881,14 +881,6 @@ export class TestWindowService implements IWindowService {
return TPromise.as(void 0);
}
addToRecentlyOpen(paths: { path: string, isFile?: boolean }[]): TPromise<void> {
return TPromise.as(void 0);
}
removeFromRecentlyOpen(paths: string[]): TPromise<void> {
return TPromise.as(void 0);
}
getRecentlyOpen(): TPromise<{ files: string[]; folders: string[]; }> {
return TPromise.as(void 0);
}
@@ -980,7 +972,7 @@ export class TestWindowsService implements IWindowsService {
return TPromise.as(void 0);
}
pickFolder(options?: { buttonLabel: string; title: string; }): TPromise<string[]> {
pickFolder(windowId: number, options?: { buttonLabel: string; title: string; }): TPromise<string[]> {
return TPromise.as([]);
}