diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts index 54d5089bb3c..5b133795f3f 100644 --- a/src/vs/platform/files/common/files.ts +++ b/src/vs/platform/files/common/files.ts @@ -137,7 +137,7 @@ export interface IFileService { /** * Configures the file service with the provided options. */ - updateOptions(options: any): void; + updateOptions(options: object): void; /** * Returns the preferred encoding to use for a given resource. diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts index d90c6409a68..f0c236994d2 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts @@ -40,7 +40,7 @@ class TrimWhitespaceParticipant implements INamedSaveParticpant { // Nothing } - public participate(model: ITextFileEditorModel, env: { reason: SaveReason }): any { + public participate(model: ITextFileEditorModel, env: { reason: SaveReason }): void { if (this.configurationService.lookup('files.trimTrailingWhitespace', model.textEditorModel.getLanguageIdentifier().language).value) { this.doTrimTrailingWhitespace(model.textEditorModel, env.reason === SaveReason.AUTO); } @@ -98,7 +98,7 @@ export class FinalNewLineParticipant implements INamedSaveParticpant { // Nothing } - public participate(model: ITextFileEditorModel, env: { reason: SaveReason }): any { + public participate(model: ITextFileEditorModel, env: { reason: SaveReason }): void { if (this.configurationService.lookup('files.insertFinalNewline', model.textEditorModel.getLanguageIdentifier().language).value) { this.doInsertFinalNewLine(model.textEditorModel); } @@ -138,7 +138,7 @@ class FormatOnSaveParticipant implements INamedSaveParticpant { // Nothing } - participate(editorModel: ITextFileEditorModel, env: { reason: SaveReason }): TPromise { + participate(editorModel: ITextFileEditorModel, env: { reason: SaveReason }): TPromise { const model = editorModel.textEditorModel; if (env.reason === SaveReason.AUTO @@ -204,7 +204,7 @@ class ExtHostSaveParticipant implements INamedSaveParticpant { this._proxy = threadService.get(ExtHostContext.ExtHostDocumentSaveParticipant); } - participate(editorModel: ITextFileEditorModel, env: { reason: SaveReason }): TPromise { + participate(editorModel: ITextFileEditorModel, env: { reason: SaveReason }): TPromise { return new TPromise((resolve, reject) => { setTimeout(reject, 1750); this._proxy.$participateInSave(editorModel.getResource(), env.reason).then(values => { @@ -240,7 +240,7 @@ export class SaveParticipant implements ISaveParticipant { // Hook into model TextFileEditorModel.setSaveParticipant(this); } - participate(model: ITextFileEditorModel, env: { reason: SaveReason }): TPromise { + participate(model: ITextFileEditorModel, env: { reason: SaveReason }): TPromise { const stats: { [name: string]: number } = Object.create(null); diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts index e24e7c1dc4a..20696df0b3b 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts @@ -55,7 +55,7 @@ export class ActivitybarPart extends Part implements IActivityBarService { private viewletIdToActionItems: { [viewletId: string]: IActionItem; }; private viewletIdToActivityStack: { [viewletId: string]: IViewletActivity[]; }; - private memento: any; + private memento: object; private pinnedViewlets: string[]; private activeUnpinnedViewlet: ViewletDescriptor; diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts index f9d29431038..8b0bc5edc3b 100644 --- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts +++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts @@ -94,7 +94,7 @@ Registry.as(EditorExtensions.Editors).registerEditor( interface ISerializedUntitledEditorInput { resource: string; - resourceJSON: any; + resourceJSON: object; modeId: string; encoding: string; } diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 2f7ff00c9be..3d4c93ec476 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -86,7 +86,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService private dimension: Dimension; private editorGroupsControl: IEditorGroupsControl; - private memento: any; + private memento: object; private stacks: EditorStacksModel; private tabOptions: ITabOptions; private forceHideTabs: boolean; diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index b735e56fe40..f1c850050b4 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -724,7 +724,7 @@ class TabActionRunner extends ActionRunner { super(); } - public run(action: IAction, context?: any): TPromise { + public run(action: IAction, context?: any): TPromise { const group = this.group(); if (!group) { return TPromise.as(void 0); diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts index c9eb1f6aa13..0b95a6373db 100644 --- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts @@ -365,7 +365,7 @@ class ToggleEditorModeAction extends Action { return ToggleEditorModeAction.isInlineMode(this.editor) ? ToggleEditorModeAction.SIDEBYSIDE_LABEL : ToggleEditorModeAction.INLINE_LABEL; } - public run(): TPromise { + public run(): TPromise { const inlineModeActive = ToggleEditorModeAction.isInlineMode(this.editor); const control = this.editor.getControl(); diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts index 4cbf6a0caf0..7edc1c97c4a 100644 --- a/src/vs/workbench/browser/parts/editor/textEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textEditor.ts @@ -39,8 +39,8 @@ interface ITextEditorViewState { } export interface IEditorConfiguration { - editor: any; - diffEditor: any; + editor: object; + diffEditor: object; } /** diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts index 2e68646b26e..134441ae8a5 100644 --- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts +++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts @@ -101,7 +101,7 @@ export class SidebarPart extends CompositePart { } // First check if sidebar is hidden and show if so - let promise = TPromise.as(null); + let promise = TPromise.as(null); if (!this.partService.isVisible(Parts.SIDEBAR_PART)) { try { this.blockOpeningViewlet = true; diff --git a/src/vs/workbench/browser/quickopen.ts b/src/vs/workbench/browser/quickopen.ts index 62941ff5712..ab2306f88b1 100644 --- a/src/vs/workbench/browser/quickopen.ts +++ b/src/vs/workbench/browser/quickopen.ts @@ -370,7 +370,7 @@ export class QuickOpenAction extends Action { this.enabled = !!this.quickOpenService; } - public run(context?: any): TPromise { + public run(context?: any): TPromise { // Show with prefix this.quickOpenService.show(this.prefix); diff --git a/src/vs/workbench/common/component.ts b/src/vs/workbench/common/component.ts index 8a238f9868c..99cafcca30c 100644 --- a/src/vs/workbench/common/component.ts +++ b/src/vs/workbench/common/component.ts @@ -58,7 +58,7 @@ export class Component extends Themable implements IWorkbenchComponent { * Mementos are shared across components with the same id. This means that multiple components * with the same id will store data into the same data structure. */ - protected getMemento(storageService: IStorageService, scope: Scope = Scope.GLOBAL): any { + protected getMemento(storageService: IStorageService, scope: Scope = Scope.GLOBAL): object { return this.componentMemento.getMemento(storageService, scope); } diff --git a/src/vs/workbench/common/memento.ts b/src/vs/workbench/common/memento.ts index 78881e90d87..eff56087e98 100644 --- a/src/vs/workbench/common/memento.ts +++ b/src/vs/workbench/common/memento.ts @@ -46,7 +46,7 @@ export class Memento { * provided, the scope will be global, Memento.Scope.WORKSPACE can be used to * scope the memento to the workspace. */ - public getMemento(storageService: IStorageService, scope: Scope = Scope.GLOBAL): any { + public getMemento(storageService: IStorageService, scope: Scope = Scope.GLOBAL): object { // Scope by Workspace if (scope === Scope.WORKSPACE) { @@ -89,7 +89,7 @@ export class Memento { class ScopedMemento { private id: string; - private mementoObj: any; + private mementoObj: object; private scope: Scope; constructor(id: string, scope: Scope, private storageService: IStorageService) { @@ -98,11 +98,11 @@ class ScopedMemento { this.mementoObj = this.loadMemento(); } - public getMemento(): any { + public getMemento(): object { return this.mementoObj; } - private loadMemento(): any { + private loadMemento(): object { let storageScope = this.scope === Scope.GLOBAL ? StorageScope.GLOBAL : StorageScope.WORKSPACE; let memento = this.storageService.get(this.id, storageScope); if (memento) { diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index 3f8b05dab1f..a025661a976 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -40,6 +40,8 @@ import { IKeybindingService } from "vs/platform/keybinding/common/keybinding"; import * as os from 'os'; import { webFrame } from 'electron'; import { getPathLabel } from "vs/base/common/labels"; +import { IViewlet } from "vs/workbench/common/viewlet"; +import { IPanel } from "vs/workbench/common/panel"; // --- actions @@ -56,13 +58,13 @@ export class CloseEditorAction extends Action { super(id, label); } - public run(): TPromise { + public run(): TPromise { const activeEditor = this.editorService.getActiveEditor(); if (activeEditor) { return this.editorService.closeEditor(activeEditor.position, activeEditor.input); } - return TPromise.as(false); + return TPromise.as(null); } } @@ -156,7 +158,7 @@ export class ToggleMenuBarAction extends Action { super(id, label); } - public run(): TPromise { + public run(): TPromise { let currentVisibilityValue = this.configurationService.lookup(ToggleMenuBarAction.menuBarVisibilityKey).value; if (typeof currentVisibilityValue !== 'string') { currentVisibilityValue = 'default'; @@ -1112,37 +1114,39 @@ export abstract class BaseNavigationAction extends Action { return TPromise.as(false); } - protected navigateOnEditorFocus(isEditorGroupVertical: boolean, isSidebarPositionLeft: boolean): TPromise { + protected navigateOnEditorFocus(isEditorGroupVertical: boolean, isSidebarPositionLeft: boolean): TPromise { return TPromise.as(true); } - protected navigateOnPanelFocus(isEditorGroupVertical: boolean, isSidebarPositionLeft: boolean): TPromise { + protected navigateOnPanelFocus(isEditorGroupVertical: boolean, isSidebarPositionLeft: boolean): TPromise { return TPromise.as(true); } - protected navigateOnSidebarFocus(isEditorGroupVertical: boolean, isSidebarPositionLeft: boolean): TPromise { + protected navigateOnSidebarFocus(isEditorGroupVertical: boolean, isSidebarPositionLeft: boolean): TPromise { return TPromise.as(true); } - protected navigateToPanel(): TPromise { + protected navigateToPanel(): TPromise { if (!this.partService.isVisible(Parts.PANEL_PART)) { return TPromise.as(false); } const activePanelId = this.panelService.getActivePanel().getId(); + return this.panelService.openPanel(activePanelId, true); } - protected navigateToSidebar(): TPromise { + protected navigateToSidebar(): TPromise { if (!this.partService.isVisible(Parts.SIDEBAR_PART)) { return TPromise.as(false); } const activeViewletId = this.viewletService.getActiveViewlet().getId(); + return this.viewletService.openViewlet(activeViewletId, true); } - protected navigateAcrossEditorGroup(direction): TPromise { + protected navigateAcrossEditorGroup(direction): TPromise { const model = this.groupService.getStacksModel(); const currentPosition = model.positionOfGroup(model.activeGroup); const nextPosition = direction === Direction.Next ? currentPosition + 1 : currentPosition - 1; @@ -1152,25 +1156,29 @@ export abstract class BaseNavigationAction extends Action { } this.groupService.focusGroup(nextPosition); + return TPromise.as(true); } - protected navigateToLastActiveGroup(): TPromise { + protected navigateToLastActiveGroup(): TPromise { const model = this.groupService.getStacksModel(); const lastActiveGroup = model.activeGroup; this.groupService.focusGroup(lastActiveGroup); + return TPromise.as(true); } - protected navigateToFirstEditorGroup(): TPromise { + protected navigateToFirstEditorGroup(): TPromise { this.groupService.focusGroup(0); + return TPromise.as(true); } - protected navigateToLastEditorGroup(): TPromise { + protected navigateToLastEditorGroup(): TPromise { const model = this.groupService.getStacksModel(); const lastEditorGroupPosition = model.groups.length - 1; this.groupService.focusGroup(lastEditorGroupPosition); + return TPromise.as(true); } } @@ -1191,7 +1199,7 @@ export class NavigateLeftAction extends BaseNavigationAction { super(id, label, groupService, panelService, partService, viewletService); } - protected navigateOnEditorFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { + protected navigateOnEditorFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { if (!isEditorGroupVertical) { if (isSidebarPositionLeft) { return this.navigateToSidebar(); @@ -1207,10 +1215,11 @@ export class NavigateLeftAction extends BaseNavigationAction { }); } - protected navigateOnPanelFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { + protected navigateOnPanelFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { if (isSidebarPositionLeft) { return this.navigateToSidebar(); } + return TPromise.as(false); } @@ -1218,9 +1227,11 @@ export class NavigateLeftAction extends BaseNavigationAction { if (isSidebarPositionLeft) { return TPromise.as(false); } + if (isEditorGroupVertical) { return this.navigateToLastEditorGroup(); } + return this.navigateToLastActiveGroup(); } } @@ -1241,13 +1252,14 @@ export class NavigateRightAction extends BaseNavigationAction { super(id, label, groupService, panelService, partService, viewletService); } - protected navigateOnEditorFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { + protected navigateOnEditorFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { if (!isEditorGroupVertical) { if (!isSidebarPositionLeft) { return this.navigateToSidebar(); } return TPromise.as(false); } + return this.navigateAcrossEditorGroup(Direction.Next) .then(didNavigate => { if (!didNavigate && !isSidebarPositionLeft) { @@ -1257,10 +1269,11 @@ export class NavigateRightAction extends BaseNavigationAction { }); } - protected navigateOnPanelFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { + protected navigateOnPanelFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { if (!isSidebarPositionLeft) { return this.navigateToSidebar(); } + return TPromise.as(false); } @@ -1268,9 +1281,11 @@ export class NavigateRightAction extends BaseNavigationAction { if (!isSidebarPositionLeft) { return TPromise.as(false); } + if (isEditorGroupVertical) { return this.navigateToFirstEditorGroup(); } + return this.navigateToLastActiveGroup(); } } @@ -1322,10 +1337,11 @@ export class NavigateDownAction extends BaseNavigationAction { super(id, label, groupService, panelService, partService, viewletService); } - protected navigateOnEditorFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { + protected navigateOnEditorFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { if (isEditorGroupVertical) { return this.navigateToPanel(); } + return this.navigateAcrossEditorGroup(Direction.Next) .then(didNavigate => { if (didNavigate) { diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index 277811b7aac..ac8d4a61edc 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -757,8 +757,8 @@ export class Workbench implements IPartService { this.workbench.removeClass('nosidebar'); } - let promise = TPromise.as(null); // If sidebar becomes hidden, also hide the current active Viewlet if any + let promise = TPromise.as(null); if (hidden && this.sidebarPart.getActiveViewlet()) { promise = this.sidebarPart.hideActiveViewlet().then(() => { const activeEditor = this.editorPart.getActiveEditor(); diff --git a/src/vs/workbench/parts/backup/common/backupRestorer.ts b/src/vs/workbench/parts/backup/common/backupRestorer.ts index a20f365912d..76380720bce 100644 --- a/src/vs/workbench/parts/backup/common/backupRestorer.ts +++ b/src/vs/workbench/parts/backup/common/backupRestorer.ts @@ -41,7 +41,7 @@ export class BackupRestorer implements IWorkbenchContribution { } } - private doRestoreBackups(): TPromise { + private doRestoreBackups(): TPromise { // Find all files and untitled with backups return this.backupFileService.getWorkspaceFileBackups().then(backups => { @@ -62,7 +62,7 @@ export class BackupRestorer implements IWorkbenchContribution { private doResolveOpenedBackups(backups: URI[]): TPromise { const stacks = this.groupService.getStacksModel(); - const restorePromises: TPromise[] = []; + const restorePromises: TPromise[] = []; const unresolved: URI[] = []; backups.forEach(backup => { diff --git a/src/vs/workbench/parts/files/browser/files.contribution.ts b/src/vs/workbench/parts/files/browser/files.contribution.ts index c7f4a9eecf0..35e04c0da2a 100644 --- a/src/vs/workbench/parts/files/browser/files.contribution.ts +++ b/src/vs/workbench/parts/files/browser/files.contribution.ts @@ -105,7 +105,7 @@ Registry.as(EditorExtensions.Editors).registerFileInputFactory( interface ISerializedFileInput { resource: string; - resourceJSON: any; + resourceJSON: object; encoding?: string; } diff --git a/src/vs/workbench/parts/files/common/files.ts b/src/vs/workbench/parts/files/common/files.ts index fcb7b317468..d23d7de9682 100644 --- a/src/vs/workbench/parts/files/common/files.ts +++ b/src/vs/workbench/parts/files/common/files.ts @@ -72,7 +72,7 @@ export interface IFileResource { /** * Helper to get an explorer item from an object. */ -export function explorerItemToFileResource(obj: any): IFileResource { +export function explorerItemToFileResource(obj: FileStat | OpenEditor): IFileResource { if (obj instanceof FileStat) { const stat = obj as FileStat; diff --git a/src/vs/workbench/parts/output/browser/outputActions.ts b/src/vs/workbench/parts/output/browser/outputActions.ts index f083d763cbc..9664d932ba0 100644 --- a/src/vs/workbench/parts/output/browser/outputActions.ts +++ b/src/vs/workbench/parts/output/browser/outputActions.ts @@ -43,7 +43,7 @@ export class ClearOutputAction extends Action { super(id, label, 'output-action clear-output'); } - public run(): TPromise { + public run(): TPromise { this.outputService.getActiveChannel().clear(); this.panelService.getActivePanel().focus(); @@ -64,7 +64,7 @@ export class ToggleOutputScrollLockAction extends Action { this.toDispose.push(this.outputService.onActiveOutputChannel(channel => this.setClass(this.outputService.getActiveChannel().scrollLock))); } - public run(): TPromise { + public run(): TPromise { const activeChannel = this.outputService.getActiveChannel(); if (activeChannel) { activeChannel.scrollLock = !activeChannel.scrollLock; diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts index cf9fd534f85..10b30d1f41c 100644 --- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts @@ -133,7 +133,7 @@ export class ShowAllCommandsAction extends Action { super(id, label); } - public run(context?: any): TPromise { + public run(context?: any): TPromise { const config = this.configurationService.getConfiguration(); const restoreInput = config.workbench && config.workbench.commandPalette && config.workbench.commandPalette.preserveInput === true; @@ -163,7 +163,7 @@ export class ClearCommandHistoryAction extends Action { super(id, label); } - public run(context?: any): TPromise { + public run(context?: any): TPromise { const commandHistoryLength = resolveCommandHistory(this.configurationService); if (commandHistoryLength > 0) { commandHistory = new BoundedMap(commandHistoryLength); diff --git a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts index 5cda2bf9d77..cf7a4d18419 100644 --- a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts @@ -200,7 +200,7 @@ export class QuickOpenViewPickerAction extends Action { super(id, label); } - public run(): TPromise { + public run(): TPromise { const keys = this.keybindingService.lookupKeybindings(this.id); this.quickOpenService.show(VIEW_PICKER_PREFIX, { quickNavigateConfiguration: { keybindings: keys } }); diff --git a/src/vs/workbench/parts/views/browser/views.ts b/src/vs/workbench/parts/views/browser/views.ts index d9fbac64a26..c9d51461eac 100644 --- a/src/vs/workbench/parts/views/browser/views.ts +++ b/src/vs/workbench/parts/views/browser/views.ts @@ -280,7 +280,7 @@ export abstract class CollapsibleView extends AbstractCollapsibleView implements export interface IViewletViewOptions extends IViewOptions { - viewletSettings: any; + viewletSettings: object; } @@ -302,7 +302,7 @@ export class ComposedViewsViewlet extends Viewlet { private splitView: SplitView; protected views: IView[]; private dimension: Dimension; - private viewletSettings: any; + private viewletSettings: object; private readonly viewsContextKeys: Set = new Set(); private readonly viewsStates: Map; diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts index 3e32edce31d..b717a758fe2 100644 --- a/src/vs/workbench/services/editor/browser/editorService.ts +++ b/src/vs/workbench/services/editor/browser/editorService.ts @@ -129,17 +129,17 @@ export class WorkbenchEditorService implements IWorkbenchEditorService { return TPromise.as(null); } - private toOptions(arg1?: any): EditorOptions { - if (!arg1 || arg1 instanceof EditorOptions) { - return arg1; + private toOptions(options?: IEditorOptions | EditorOptions): EditorOptions { + if (!options || options instanceof EditorOptions) { + return options as EditorOptions; } - const textOptions: ITextEditorOptions = arg1; + const textOptions: ITextEditorOptions = options; if (!!textOptions.selection) { - return TextEditorOptions.create(arg1); + return TextEditorOptions.create(options); } - return EditorOptions.create(arg1); + return EditorOptions.create(options); } /** diff --git a/src/vs/workbench/services/files/electron-browser/fileService.ts b/src/vs/workbench/services/files/electron-browser/fileService.ts index 12d8052b9d1..aad50b0289f 100644 --- a/src/vs/workbench/services/files/electron-browser/fileService.ts +++ b/src/vs/workbench/services/files/electron-browser/fileService.ts @@ -104,7 +104,7 @@ export class FileService implements IFileService { return this._onAfterOperation.event; } - private onFileServiceError(msg: any): void { + private onFileServiceError(msg: string): void { errors.onUnexpectedError(msg); // Detect if we run < .NET Framework 4.5 @@ -179,7 +179,7 @@ export class FileService implements IFileService { this.updateOptions(configuration.files); } - public updateOptions(options: any): void { + public updateOptions(options: object): void { this.raw.updateOptions(options); } diff --git a/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts b/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts index 6c1cfbc0611..d10e87c45ec 100644 --- a/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts +++ b/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts @@ -89,14 +89,14 @@ export class OutOfProcessWin32FolderWatcher { this.handle.stderr.on('data', (data: NodeBuffer) => this.onError(data)); // Exit - this.handle.on('exit', (code: any, signal: any) => this.onExit(code, signal)); + this.handle.on('exit', (code: number, signal: string) => this.onExit(code, signal)); } private onError(error: Error | NodeBuffer): void { this.errorCallback('[FileWatcher] process error: ' + error.toString()); } - private onExit(code: any, signal: any): void { + private onExit(code: number, signal: string): void { if (this.handle) { // exit while not yet being disposed is unexpected! this.errorCallback(`[FileWatcher] terminated unexpectedly (code: ${code}, signal: ${signal})`); diff --git a/src/vs/workbench/services/history/browser/history.ts b/src/vs/workbench/services/history/browser/history.ts index c0b7e914c73..c3593c146e1 100644 --- a/src/vs/workbench/services/history/browser/history.ts +++ b/src/vs/workbench/services/history/browser/history.ts @@ -74,7 +74,7 @@ export class EditorState { interface ISerializedFileHistoryEntry { resource?: string; - resourceJSON: any; + resourceJSON: object; } export abstract class BaseHistoryService { diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts index b9903ff7d53..3b60292f8a9 100644 --- a/src/vs/workbench/services/textfile/common/textfiles.ts +++ b/src/vs/workbench/services/textfile/common/textfiles.ts @@ -22,7 +22,7 @@ export interface ISaveErrorHandler { /** * Called whenever a save fails. */ - onSaveError(error: any, model: ITextFileEditorModel): void; + onSaveError(error: Error, model: ITextFileEditorModel): void; } export interface ISaveParticipant { @@ -30,7 +30,7 @@ export interface ISaveParticipant { /** * Participate in a save of a model. Allows to change the model before it is being saved to disk. */ - participate(model: ITextFileEditorModel, env: { reason: SaveReason }): TPromise; + participate(model: ITextFileEditorModel, env: { reason: SaveReason }): void; } /** diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts index 2b5eef2d40f..050d1849d9e 100644 --- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts +++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts @@ -301,7 +301,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService { }); } - private migrate(): TPromise { + private migrate(): TPromise { let legacyColorThemeId = this.storageService.get('workbench.theme', StorageScope.GLOBAL, void 0); let legacyIconThemeId = this.storageService.get('workbench.iconTheme', StorageScope.GLOBAL, void 0); if (types.isUndefined(legacyColorThemeId) && types.isUndefined(legacyIconThemeId)) { @@ -335,7 +335,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService { }); } - private initialize(): TPromise { + private initialize(): TPromise { this.updateColorCustomizations(false); @@ -921,7 +921,7 @@ class ConfigurationWriter { constructor( @IConfigurationService private configurationService: IConfigurationService, @IConfigurationEditingService private configurationEditingService: IConfigurationEditingService) { } - public writeConfiguration(key: string, value: any, settingsTarget: ConfigurationTarget): TPromise { + public writeConfiguration(key: string, value: any, settingsTarget: ConfigurationTarget): TPromise { let settings = this.configurationService.lookup(key); if (settingsTarget === ConfigurationTarget.USER) { if (value === settings.user) { diff --git a/src/vs/workbench/test/common/memento.test.ts b/src/vs/workbench/test/common/memento.test.ts index 78edf69863c..4c5ecf1182c 100644 --- a/src/vs/workbench/test/common/memento.test.ts +++ b/src/vs/workbench/test/common/memento.test.ts @@ -24,7 +24,7 @@ suite('Workbench Memento', () => { let myMemento = new Memento('memento.test'); // Global - let memento = myMemento.getMemento(storage); + let memento: any = myMemento.getMemento(storage); memento.foo = [1, 2, 3]; let globalMemento = myMemento.getMemento(storage, Scope.GLOBAL); assert.deepEqual(globalMemento, memento); @@ -79,7 +79,7 @@ suite('Workbench Memento', () => { let myMemento = new Memento('memento.test'); // Global - let memento = myMemento.getMemento(storage, context); + let memento: any = myMemento.getMemento(storage, context); memento.foo = [1, 2, 3]; // Workspace @@ -144,7 +144,7 @@ suite('Workbench Memento', () => { let myMemento2 = new Memento('memento.test'); // Global - let memento = myMemento.getMemento(storage, context); + let memento: any = myMemento.getMemento(storage, context); memento.foo = [1, 2, 3]; memento = myMemento2.getMemento(storage, context);