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

some workbench linting

Browse source
This commit is contained in:
Benjamin Pasero 2016-02-04 17:57:35 +01:00
parent a47f67668f
commit 76fd097af4
43 changed files with 61 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/vs/workbench/browser/actions/openSettings.ts
View file

@ -7,7 +7,6 @@
import {Promise, TPromise} from 'vs/base/common/winjs.base';
import nls = require('vs/nls');
import URI from 'vs/base/common/uri';
import network = require('vs/base/common/network');
import labels = require('vs/base/common/labels');
import {Registry} from 'vs/platform/platform';
import {Action} from 'vs/base/common/actions';

2
src/vs/workbench/browser/actions/triggerEditorActions.ts
View file

@ -414,8 +414,6 @@ function toEditorQuickOpenEntry(element: any): IEditorQuickOpenEntry {
return null;
}
let CLOSE_EDITOR_ACTION_ID = 'workbench.action.closeActiveEditor';
let CLOSE_EDITOR_ACTION_LABEL = nls.localize('closeActiveEditor', "Close Editor");
export class CloseEditorAction extends Action {
constructor(id: string, label: string, @IWorkbenchEditorService private editorService: IWorkbenchEditorService) {

6
src/vs/workbench/browser/composite.ts
View file

@ -5,9 +5,9 @@
import {Promise, TPromise} from 'vs/base/common/winjs.base';
import {IEventEmitter} from 'vs/base/common/eventEmitter';
import {Dimension, Builder, $} from 'vs/base/browser/builder';
import {IAction, IActionRunner, Action, ActionRunner} from 'vs/base/common/actions';
import {IActionItem, ActionsOrientation} from 'vs/base/browser/ui/actionbar/actionbar';
import {Dimension, Builder} from 'vs/base/browser/builder';
import {IAction, IActionRunner, ActionRunner} from 'vs/base/common/actions';
import {IActionItem} from 'vs/base/browser/ui/actionbar/actionbar';
import {WorkbenchComponent} from 'vs/workbench/common/component';
import {CompositeEvent} from 'vs/workbench/common/events';
import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';

2
src/vs/workbench/browser/layout.ts
View file

@ -44,7 +44,7 @@ export class LayoutOptions {
interface ComputedStyles {
activitybar: { minWidth: number; };
sidebar: { minWidth: number; };
panel: { minHeight: number; }
panel: { minHeight: number; };
editor: { minWidth: number; };
statusbar: { height: number; };
}

1
src/vs/workbench/browser/panel.ts
View file

@ -6,7 +6,6 @@
import {Registry} from 'vs/platform/platform';
import {IPanel} from 'vs/workbench/common/panel';
import {Composite, CompositeDescriptor, CompositeRegistry} from 'vs/workbench/browser/composite';
import {IPartService} from 'vs/workbench/services/part/common/partService';
export abstract class Panel extends Composite implements IPanel { }

7
src/vs/workbench/browser/parts/compositePart.ts
View file

@ -18,14 +18,13 @@ import errors = require('vs/base/common/errors');
import {CONTEXT as ToolBarContext, ToolBar} from 'vs/base/browser/ui/toolbar/toolbar';
import {IActionItem, ActionsOrientation} from 'vs/base/browser/ui/actionbar/actionbar';
import {ProgressBar} from 'vs/base/browser/ui/progressbar/progressbar';
import {Scope, IActionBarRegistry, Extensions, prepareActions} from 'vs/workbench/browser/actionBarRegistry';
import {IActionBarRegistry, Extensions, prepareActions} from 'vs/workbench/browser/actionBarRegistry';
import {Action, IAction} from 'vs/base/common/actions';
import {Part} from 'vs/workbench/browser/part';
import {Composite, CompositeDescriptor, CompositeRegistry} from 'vs/workbench/browser/composite';
import {Composite, CompositeRegistry} from 'vs/workbench/browser/composite';
import {IComposite} from 'vs/workbench/common/composite';
import {EventType as WorkbenchEventType, CompositeEvent} from 'vs/workbench/common/events';
import {EventType as CompositeEventType} from 'vs/workbench/browser/composite';
import {SyncActionDescriptor} from 'vs/platform/actions/common/actions';
import {WorkbenchProgressService} from 'vs/workbench/services/progress/browser/progressService';
import {IPartService} from 'vs/workbench/services/part/common/partService';
import {IStorageService, StorageScope} from 'vs/platform/storage/common/storage';
@ -359,7 +358,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
this.titleLabel.safeInnerHtml(compositeTitle);
this.titleLabel.title(keybinding ? nls.localize('compositeTitleTooltip', "{0} ({1})", compositeTitle, keybinding) : compositeTitle);
this.toolBar.setAriaLabel(nls.localize('ariaCompositeToolbarLabel',"{0} actions", compositeTitle));
this.toolBar.setAriaLabel(nls.localize('ariaCompositeToolbarLabel', "{0} actions", compositeTitle));
}
private collectCompositeActions(composite: Composite): () => void {

4
src/vs/workbench/browser/parts/editor/editor.contribution.ts
View file

@ -17,7 +17,7 @@ import {UntitledEditorInput} from 'vs/workbench/common/editor/untitledEditorInpu
import {ResourceEditorInput} from 'vs/workbench/common/editor/resourceEditorInput';
import {IInstantiationService, ServicesAccessor} from 'vs/platform/instantiation/common/instantiation';
import {KeybindingsRegistry} from 'vs/platform/keybinding/common/keybindingsRegistry';
import {KbExpr, IKeybindings} from 'vs/platform/keybinding/common/keybindingService';
import {KbExpr} from 'vs/platform/keybinding/common/keybindingService';
import {TextDiffEditor} from 'vs/workbench/browser/parts/editor/textDiffEditor';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
import {BinaryResourceDiffEditor} from 'vs/workbench/browser/parts/editor/binaryDiffEditor';
@ -25,7 +25,7 @@ import {IFrameEditor} from 'vs/workbench/browser/parts/editor/iframeEditor';
import {IFrameEditorInput} from 'vs/workbench/common/editor/iframeEditorInput';
import {ChangeEncodingAction, ChangeEOLAction, ChangeModeAction, EditorStatus} from 'vs/workbench/browser/parts/editor/editorStatus';
import {IWorkbenchActionRegistry, Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry';
import {Scope, IActionBarRegistry, Extensions as ActionBarExtensions, ActionBarContributor} from 'vs/workbench/browser/actionBarRegistry';
import {Scope, IActionBarRegistry, Extensions as ActionBarExtensions} from 'vs/workbench/browser/actionBarRegistry';
import {SyncActionDescriptor} from 'vs/platform/actions/common/actions';
import {SyncDescriptor} from 'vs/platform/instantiation/common/descriptors';
import {KeyMod, KeyCode} from 'vs/base/common/keyCodes';

7
src/vs/workbench/browser/parts/editor/iframeEditor.ts
View file

@ -7,16 +7,15 @@
import 'vs/css!./media/iframeeditor';
import nls = require('vs/nls');
import {Promise, TPromise} from 'vs/base/common/winjs.base';
import {TPromise} from 'vs/base/common/winjs.base';
import URI from 'vs/base/common/uri';
import {Dimension, Builder, $} from 'vs/base/browser/builder';
import DOM = require('vs/base/browser/dom');
import errors = require('vs/base/common/errors');
import {EditorOptions, EditorInput} from 'vs/workbench/common/editor';
import {EditorInputAction, BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor';
import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor';
import {IFrameEditorInput} from 'vs/workbench/common/editor/iframeEditorInput';
import {IFrameEditorModel} from 'vs/workbench/common/editor/iframeEditorModel';
import {IStorageService, StorageScope} from 'vs/platform/storage/common/storage';
import {IStorageService} from 'vs/platform/storage/common/storage';
import {Position} from 'vs/platform/editor/common/editor';
import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';

2
src/vs/workbench/browser/parts/editor/stringEditor.ts
View file

@ -9,8 +9,6 @@ import nls = require('vs/nls');
import types = require('vs/base/common/types');
import {ICodeEditor} from 'vs/editor/browser/editorBrowser';
import {IEditorOptions, IEditorViewState} from 'vs/editor/common/editorCommon';
import {DefaultConfig} from 'vs/editor/common/config/defaultConfig';
import {EditorConfiguration} from 'vs/editor/common/config/commonEditorConfig';
import {TextEditorOptions, EditorModel, EditorInput, EditorOptions} from 'vs/workbench/common/editor';
import {BaseTextEditorModel} from 'vs/workbench/common/editor/textEditorModel';
import {UntitledEditorInput} from 'vs/workbench/common/editor/untitledEditorInput';

2
src/vs/workbench/browser/parts/editor/textEditor.ts
View file

@ -15,7 +15,7 @@ import {Preferences} from 'vs/workbench/common/constants';
import {IEditorViewState} from 'vs/editor/common/editorCommon';
import {OptionsChangeEvent, EventType as WorkbenchEventType, EditorEvent, TextEditorSelectionEvent} from 'vs/workbench/common/events';
import {Scope} from 'vs/workbench/common/memento';
import {EditorInput, IFileEditorInput, EditorOptions} from 'vs/workbench/common/editor';
import {EditorInput, EditorOptions} from 'vs/workbench/common/editor';
import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor';
import {EditorConfiguration} from 'vs/editor/common/config/commonEditorConfig';
import {IEditorSelection, IEditor, EventType, IConfigurationChangedEvent, IModelContentChangedEvent, IModelModeChangedEvent, ICursorPositionChangedEvent, IEditorOptions} from 'vs/editor/common/editorCommon';

11
src/vs/workbench/browser/parts/panel/panelPart.ts
View file

@ -7,7 +7,6 @@ import 'vs/css!./media/panelPart';
import nls = require('vs/nls');
import {TPromise, Promise} from 'vs/base/common/winjs.base';
import {KeyMod, KeyCode, CommonKeybindings} from 'vs/base/common/keyCodes';
import strings = require('vs/base/common/strings');
import {Action, IAction} from 'vs/base/common/actions';
import {Builder} from 'vs/base/browser/builder';
import dom = require('vs/base/browser/dom');
@ -16,17 +15,15 @@ import {Scope} from 'vs/workbench/browser/actionBarRegistry';
import {SyncActionDescriptor} from 'vs/platform/actions/common/actions';
import {IWorkbenchActionRegistry, Extensions as WorkbenchExtensions} from 'vs/workbench/common/actionRegistry';
import {IPanel} from 'vs/workbench/common/panel';
import {EventType as WorkbenchEventType, CompositeEvent} from 'vs/workbench/common/events';
import {CompositePart} from 'vs/workbench/browser/parts/compositePart';
import {Panel, PanelRegistry, Extensions as PanelExtensions} from 'vs/workbench/browser/panel';
import {IPanelService} from 'vs/workbench/services/panel/common/panelService';
import {IPartService} from 'vs/workbench/services/part/common/partService';
import {IStorageService, StorageScope} from 'vs/platform/storage/common/storage';
import {IStorageService} from 'vs/platform/storage/common/storage';
import {IContextMenuService} from 'vs/platform/contextview/browser/contextView';
import {IEventService} from 'vs/platform/event/common/event';
import {IMessageService, Severity} from 'vs/platform/message/common/message';
import {IMessageService} from 'vs/platform/message/common/message';
import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService';
import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
export class PanelPart extends CompositePart<Panel> implements IPanelService {
@ -65,7 +62,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
public create(parent: Builder): void {
super.create(parent);
dom.addStandardDisposableListener(this.getContainer().getHTMLElement(), 'keyup', (e: dom.IKeyboardEvent) => {
if (e.equals(CommonKeybindings.ESCAPE)) {
this.partService.setPanelHidden(true);
@ -93,7 +90,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
}
protected getActions(): IAction[] {
return [this.instantiationService.createInstance(ClosePanelAction, ClosePanelAction.ID, ClosePanelAction.LABEL)]
return [this.instantiationService.createInstance(ClosePanelAction, ClosePanelAction.ID, ClosePanelAction.LABEL)];
}
public getActivePanel(): IPanel {

2
src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
View file

@ -216,7 +216,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
resolve(new TPromise(init));
}
return !message;
})
});
}, err => {
// ignore
});

9
src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
View file

@ -7,10 +7,8 @@ import 'vs/css!./media/sidebarpart';
import {TPromise} from 'vs/base/common/winjs.base';
import nls = require('vs/nls');
import {Registry} from 'vs/platform/platform';
import strings = require('vs/base/common/strings');
import {Action, IAction} from 'vs/base/common/actions';
import {Action} from 'vs/base/common/actions';
import {CompositePart} from 'vs/workbench/browser/parts/compositePart';
import {EventType as WorkbenchEventType, CompositeEvent} from 'vs/workbench/common/events';
import {Viewlet, ViewletRegistry, Extensions as ViewletExtensions} from 'vs/workbench/browser/viewlet';
import {IWorkbenchActionRegistry, Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry';
import {SyncActionDescriptor} from 'vs/platform/actions/common/actions';
@ -18,10 +16,10 @@ import {IViewletService} from 'vs/workbench/services/viewlet/common/viewletServi
import {IPartService} from 'vs/workbench/services/part/common/partService';
import {IViewlet} from 'vs/workbench/common/viewlet';
import {Scope} from 'vs/workbench/browser/actionBarRegistry';
import {IStorageService, StorageScope} from 'vs/platform/storage/common/storage';
import {IStorageService} from 'vs/platform/storage/common/storage';
import {IContextMenuService} from 'vs/platform/contextview/browser/contextView';
import {IEventService} from 'vs/platform/event/common/event';
import {IMessageService, Severity} from 'vs/platform/message/common/message';
import {IMessageService} from 'vs/platform/message/common/message';
import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
import {KeyMod, KeyCode} from 'vs/base/common/keyCodes';
@ -33,7 +31,6 @@ export class SidebarPart extends CompositePart<Viewlet> implements IViewletServi
public serviceId = IViewletService;
private blockOpeningViewlet: boolean;
private currentViewletOpenToken: string;
constructor(
messageService: IMessageService,

4
src/vs/workbench/browser/viewlet.ts
View file

@ -9,7 +9,7 @@ import DOM = require('vs/base/browser/dom');
import errors = require('vs/base/common/errors');
import {Registry} from 'vs/platform/platform';
import {Dimension, Builder, $} from 'vs/base/browser/builder';
import {IAction, IActionRunner, Action, ActionRunner} from 'vs/base/common/actions';
import {IAction, IActionRunner, Action} from 'vs/base/common/actions';
import {IActionItem, ActionsOrientation} from 'vs/base/browser/ui/actionbar/actionbar';
import {ITree, IFocusEvent, ISelectionEvent} from 'vs/base/parts/tree/browser/tree';
import {prepareActions} from 'vs/workbench/browser/actionBarRegistry';
@ -291,7 +291,7 @@ export class AdaptiveCollapsibleViewletView extends FixedCollapsibleView impleme
protected actionRunner: IActionRunner;
protected isDisposed: boolean;
private dragHandler: DelayedDragHandler
private dragHandler: DelayedDragHandler;
constructor(
actionRunner: IActionRunner,

4
src/vs/workbench/browser/workbench.ts
View file

@ -50,7 +50,7 @@ import {IActivityService} from 'vs/workbench/services/activity/common/activitySe
import {IViewletService} from 'vs/workbench/services/viewlet/common/viewletService';
import {IPanelService} from 'vs/workbench/services/panel/common/panelService';
import {WorkbenchMessageService} from 'vs/workbench/services/message/browser/messageService';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
import {IQuickOpenService} from 'vs/workbench/services/quickopen/common/quickOpenService';
import {IHistoryService} from 'vs/workbench/services/history/common/history';
import {IEventService} from 'vs/platform/event/common/event';
@ -291,7 +291,7 @@ export class Workbench implements IPartService {
(<AbstractKeybindingService><any>this.keybindingService).setMessageService(messageService);
}
let threadService = this.instantiationService.getInstance(IThreadService);
let pluginService = this.instantiationService.getInstance(IPluginService);
this.instantiationService.getInstance(IPluginService);
this.lifecycleService = this.instantiationService.getInstance(ILifecycleService);
this.toDispose.push(this.lifecycleService.onShutdown(this.shutdownComponents, this));
let contextMenuService = this.instantiationService.getInstance(IContextMenuService);

2
src/vs/workbench/common/contributions.ts
View file

@ -22,7 +22,7 @@ export interface IWorkbenchContribution {
export namespace Extensions {
export const Workbench = 'workbench.contributions.kind';
};
}
export type IWorkbenchContributionSignature = IConstructorSignature0<IWorkbenchContribution> | INewConstructorSignature0<IWorkbenchContribution>;

1
src/vs/workbench/common/editor/iframeEditorInput.ts
View file

@ -6,7 +6,6 @@
import {TPromise} from 'vs/base/common/winjs.base';
import {EditorModel, EditorInput} from 'vs/workbench/common/editor';
import {Registry} from 'vs/platform/platform';
import URI from 'vs/base/common/uri';
/**

2
src/vs/workbench/common/editor/resourceEditorInput.ts
View file

@ -89,7 +89,7 @@ export class ResourceEditorInput extends EditorInput {
lastError = err;
});
}
}
};
})).then(() => {
if (!result && lastError) {
reject(lastError);

5
src/vs/workbench/electron-main/sharedProcessMain.ts
View file

@ -30,7 +30,10 @@ interface IInitData {
}
function quit(err?: Error) {
if (err) console.error(err);
if (err) {
console.error(err);
}
process.exit(err ? 1 : 0);
}

8
src/vs/workbench/electron-main/window.ts
View file

@ -115,19 +115,17 @@ export interface IWindowConfiguration extends env.ICommandLineArguments {
releaseNotesUrl: string;
productDownloadUrl: string;
enableTelemetry: boolean;
userEnv: env.IProcessEnvironment,
userEnv: env.IProcessEnvironment;
aiConfig: {
key: string;
asimovKey: string;
},
};
sendASmile: {
reportIssueUrl: string,
requestFeatureUrl: string
}
};
}
const enableDebugLogging = false;
export class VSCodeWindow {
public static menuBarHiddenKey = 'menuBarHidden';

2
src/vs/workbench/parts/contentprovider/common/contentprovider.contribution.ts
View file

@ -37,7 +37,7 @@ export class WorkbenchContentProvider implements IWorkbenchContribution {
}
private start(): void {
ResourceEditorInput.registerResourceContentProvider("vscode", {
ResourceEditorInput.registerResourceContentProvider('vscode', {
provideTextContent: (uri: URI): TPromise<IModel> => {
if (uri.scheme !== 'vscode') {
return null;

3
src/vs/workbench/parts/execution/electron-browser/terminalService.ts
View file

@ -6,9 +6,8 @@
import errors = require('vs/base/common/errors');
import uri from 'vs/base/common/uri';
import severity from 'vs/base/common/severity';
import {TPromise} from 'vs/base/common/winjs.base';
import {ITerminalService, IExecutionService} from 'vs/workbench/parts/execution/common/execution';
import {ITerminalService} from 'vs/workbench/parts/execution/common/execution';
import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
import {IMessageService} from 'vs/platform/message/common/message';

11
src/vs/workbench/parts/feedback/browser/feedback.ts
View file

@ -9,16 +9,11 @@ import 'vs/css!./media/feedback';
import nls = require('vs/nls');
import {IDisposable} from 'vs/base/common/lifecycle';
import {Builder, $} from 'vs/base/browser/builder';
import errors = require('vs/base/common/errors');
import {Promise} from 'vs/base/common/winjs.base';
import {Dropdown} from 'vs/base/browser/ui/dropdown/dropdown';
import {IXHRResponse} from 'vs/base/common/http';
import {IContextViewService} from 'vs/platform/contextview/browser/contextView';
import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService';
const STATUS_TIMEOUT = 500;
export interface IFeedback {
feedback: string;
sentiment: number;
@ -37,7 +32,7 @@ enum FormEvent {
SENDING,
SENT,
SEND_ERROR
};
}
export class FeedbackDropdown extends Dropdown {
protected static MAX_FEEDBACK_CHARS: number = 140;
@ -283,7 +278,9 @@ export class FeedbackDropdown extends Dropdown {
}
protected resetForm(): void {
if (this.feedbackDescriptionInput) this.feedbackDescriptionInput.value = '';
if (this.feedbackDescriptionInput) {
this.feedbackDescriptionInput.value = '';
}
this.sentiment = 1;
this.aliasEnabled = false;
}

3
src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
View file

@ -10,13 +10,10 @@ import {IStatusbarItem} from 'vs/workbench/browser/parts/statusbar/statusbar';
import {FeedbackDropdown, IFeedback, IFeedbackService} from 'vs/workbench/parts/feedback/browser/feedback';
import {IContextViewService} from 'vs/platform/contextview/browser/contextView';
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
import {IRequestService} from 'vs/platform/request/common/request';
import {shell} from 'electron';
class TwitterFeedbackService implements IFeedbackService {
private serviceUrl: string;
private static TWITTER_URL: string = 'https://twitter.com/intent/tweet';
public submitFeedback(feedback: IFeedback): void {

3
src/vs/workbench/parts/files/browser/fileActions.ts
View file

@ -25,7 +25,6 @@ import {disposeAll, IDisposable} from 'vs/base/common/lifecycle';
import {EventType as WorkbenchEventType, EditorEvent} from 'vs/workbench/common/events';
import Files = require('vs/workbench/parts/files/common/files');
import {IFileService, IFileStat, IImportResult} from 'vs/platform/files/common/files';
import {EditorInputAction} from 'vs/workbench/browser/parts/editor/baseEditor';
import {DiffEditorInput} from 'vs/workbench/common/editor/diffEditorInput';
import workbenchEditorCommon = require('vs/workbench/common/editor');
import {IEditorSelection} from 'vs/editor/common/editorCommon';
@ -1898,7 +1897,7 @@ export abstract class BaseCloseWorkingFileAction extends Action {
input.dispose();
}
}
};
}
export class CloseAllWorkingFilesAction extends BaseCloseWorkingFileAction {

1
src/vs/workbench/parts/files/browser/saveErrorHandler.ts
View file

@ -13,7 +13,6 @@ import URI from 'vs/base/common/uri';
import {EditorModel} from 'vs/workbench/common/editor';
import {guessMimeTypes} from 'vs/base/common/mime';
import {EditorInputAction} from 'vs/workbench/browser/parts/editor/baseEditor';
import {IModel} from 'vs/editor/common/editorCommon';
import {ResourceEditorInput} from 'vs/workbench/common/editor/resourceEditorInput';
import {DiffEditorInput} from 'vs/workbench/common/editor/diffEditorInput';
import {DiffEditorModel} from 'vs/workbench/common/editor/diffEditorModel';

2
src/vs/workbench/parts/files/browser/textFileServices.ts
View file

@ -264,7 +264,7 @@ export abstract class TextFileService implements ITextFileService {
return {
autoSaveDelay: this.configuredAutoSaveDelay && this.configuredAutoSaveDelay > 0 ? this.configuredAutoSaveDelay : void 0,
autoSaveFocusChange: this.configuredAutoSaveOnFocusChange
}
};
}
public dispose(): void {

2
src/vs/workbench/parts/files/browser/views/explorerViewer.ts
View file

@ -27,7 +27,7 @@ import {IFileOperationResult, FileOperationResult, IFileStat, IFileService} from
import {FileEditorInput} from 'vs/workbench/parts/files/browser/editors/fileEditorInput';
import {DuplicateFileAction, ImportFileAction, PasteFileAction, keybindingForAction, IEditableData, IFileViewletState} from 'vs/workbench/parts/files/browser/fileActions';
import {EditorOptions} from 'vs/workbench/common/editor';
import {IDataSource, ITree, IElementCallback, IAccessibilityProvider, IRenderer, ContextMenuEvent, ISorter, IFilter, IDragAndDrop, IDragAndDropData, IDragOverReaction, DRAG_OVER_ACCEPT, DRAG_OVER_ACCEPT_BUBBLE_DOWN, DRAG_OVER_ACCEPT_BUBBLE_DOWN_COPY, DRAG_OVER_ACCEPT_BUBBLE_UP, DRAG_OVER_ACCEPT_BUBBLE_UP_COPY, DRAG_OVER_REJECT} from 'vs/base/parts/tree/browser/tree';
import {IDataSource, ITree, IElementCallback, IAccessibilityProvider, IRenderer, ContextMenuEvent, ISorter, IFilter, IDragAndDrop, IDragAndDropData, IDragOverReaction, DRAG_OVER_ACCEPT_BUBBLE_DOWN, DRAG_OVER_ACCEPT_BUBBLE_DOWN_COPY, DRAG_OVER_ACCEPT_BUBBLE_UP, DRAG_OVER_ACCEPT_BUBBLE_UP_COPY, DRAG_OVER_REJECT} from 'vs/base/parts/tree/browser/tree';
import labels = require('vs/base/common/labels');
import {DesktopDragAndDropData, ExternalElementsDragAndDropData} from 'vs/base/parts/tree/browser/treeDnd';
import {ClickBehavior, DefaultController} from 'vs/base/parts/tree/browser/treeDefaults';

3
src/vs/workbench/parts/files/common/editors/textFileEditorModel.ts
View file

@ -72,7 +72,6 @@ export class TextFileEditorModel extends BaseTextEditorModel implements IEncodin
public static ID = 'workbench.editors.files.textFileEditorModel';
private static DEFAULT_AUTO_SAVE_DELAY = 1000;
private static saveErrorHandler: ISaveErrorHandler;
private resource: URI;
@ -749,7 +748,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements IEncodin
isDirectory: stat.isDirectory,
hasChildren: stat.hasChildren,
children: stat.children
}
};
}
}

9
src/vs/workbench/parts/files/electron-browser/textFileServices.ts
View file

@ -13,21 +13,18 @@ import paths = require('vs/base/common/paths');
import strings = require('vs/base/common/strings');
import {isWindows} from 'vs/base/common/platform';
import URI from 'vs/base/common/uri';
import {Action} from 'vs/base/common/actions';
import {UntitledEditorModel} from 'vs/workbench/common/editor/untitledEditorModel';
import {IEventService} from 'vs/platform/event/common/event';
import {TextFileService as AbstractTextFileService} from 'vs/workbench/parts/files/browser/textFileServices';
import {CACHE, TextFileEditorModel} from 'vs/workbench/parts/files/common/editors/textFileEditorModel';
import {ITextFileOperationResult, ConfirmResult, AutoSaveMode} from 'vs/workbench/parts/files/common/files';
import {IWorkbenchActionRegistry, Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry';
import {SyncActionDescriptor} from 'vs/platform/actions/common/actions';
import {IUntitledEditorService} from 'vs/workbench/services/untitled/common/untitledEditorService';
import {IFileService} from 'vs/platform/files/common/files';
import {IInstantiationService, INullService} from 'vs/platform/instantiation/common/instantiation';
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService';
import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle';
import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
import {IConfigurationService, IConfigurationServiceEvent, ConfigurationServiceEventTypes} from 'vs/platform/configuration/common/configuration';
import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
import {remote} from 'electron';
@ -384,7 +381,7 @@ export class TextFileService extends AbstractTextFileService {
return options;
}
interface IFilter { name: string, extensions: string[] };
interface IFilter { name: string; extensions: string[]; }
// Build the file filter by using our known languages
let ext: string = paths.extname(defaultPath);

2
src/vs/workbench/parts/gettingStarted/common/abstractGettingStarted.ts
View file

@ -6,7 +6,7 @@
import {IWorkbenchContribution} from 'vs/workbench/common/contributions';
import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService';
import {IStorageService, StorageScope, StorageEvent, StorageEventType} from 'vs/platform/storage/common/storage';
import {IStorageService} from 'vs/platform/storage/common/storage';
import {ITelemetryService, ITelemetryInfo} from 'vs/platform/telemetry/common/telemetry';
/**

5
src/vs/workbench/parts/markdown/browser/markdownActions.ts
View file

@ -10,17 +10,14 @@ import {Promise} from 'vs/base/common/winjs.base';
import {Action} from 'vs/base/common/actions';
import URI from 'vs/base/common/uri';
import errors = require('vs/base/common/errors');
import paths = require('vs/base/common/paths');
import nls = require('vs/nls');
import {FileEditorInput} from 'vs/workbench/parts/files/common/files';
import {EditorInputAction} from 'vs/workbench/browser/parts/editor/baseEditor';
import {EditorOptions, getUntitledOrFileResource} from 'vs/workbench/common/editor';
import {getUntitledOrFileResource} from 'vs/workbench/common/editor';
import {MarkdownEditorInput} from 'vs/workbench/parts/markdown/common/markdownEditorInput';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
import {IPartService} from 'vs/workbench/services/part/common/partService';
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
import {IMessageService, Severity} from 'vs/platform/message/common/message';
import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService';
export class GlobalTogglePreviewMarkdownAction extends Action {

3
src/vs/workbench/parts/output/browser/outputPanel.ts
View file

@ -81,10 +81,7 @@ export class OutputPanel extends StringEditor {
options.glyphMargin = false;
options.lineDecorationsWidth = 20;
let input = this.getInput();
let ariaLabel: string;
let channel = this.outputService.getActiveChannel();
options.ariaLabel = channel ? nls.localize('outputPanelWithInputAriaLabel', "{0}, Output panel", channel) : nls.localize('outputPanelAriaLabel', "Output panel");
return options;

2
src/vs/workbench/parts/output/common/output.ts
View file

@ -8,7 +8,7 @@ import {TPromise} from 'vs/base/common/winjs.base';
import Event from 'vs/base/common/event';
import {Registry} from 'vs/platform/platform';
import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation';
import {IEditor, Position} from 'vs/platform/editor/common/editor';
import {IEditor} from 'vs/platform/editor/common/editor';
/**
* Mime type used by the output editor.

2
src/vs/workbench/parts/output/common/outputEditorInput.ts
View file

@ -97,7 +97,7 @@ export class OutputEditorInput extends StringEditorInput {
let otherOutputEditorInput = <OutputEditorInput>otherInput;
if (otherOutputEditorInput.getChannel() === this.channel) {
return super.matches(otherInput);
};
}
}
return false;

4
src/vs/workbench/parts/output/common/outputServices.ts
View file

@ -3,10 +3,10 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import {Promise, TPromise} from 'vs/base/common/winjs.base';
import {TPromise} from 'vs/base/common/winjs.base';
import strings = require('vs/base/common/strings');
import Event, {Emitter} from 'vs/base/common/event';
import {IEditor, Position} from 'vs/platform/editor/common/editor';
import {IEditor} from 'vs/platform/editor/common/editor';
import {IEventService} from 'vs/platform/event/common/event';
import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle';
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';

4
src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
View file

@ -14,11 +14,11 @@ import strings = require('vs/base/common/strings');
import {IAction, Action} from 'vs/base/common/actions';
import {toErrorMessage} from 'vs/base/common/errors';
import {Mode, IContext, IAutoFocus} from 'vs/base/parts/quickopen/common/quickOpen';
import {QuickOpenEntryGroup, IHighlight, QuickOpenModel, QuickOpenEntry} from 'vs/base/parts/quickopen/browser/quickOpenModel';
import {QuickOpenEntryGroup, IHighlight, QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel';
import {SyncActionDescriptor, IActionsService} from 'vs/platform/actions/common/actions';
import {IWorkbenchActionRegistry, Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry';
import {Registry} from 'vs/platform/platform';
import {Extensions as QuickOpenExtensions, QuickOpenHandler} from 'vs/workbench/browser/quickopen';
import {QuickOpenHandler} from 'vs/workbench/browser/quickopen';
import {QuickOpenAction} from 'vs/workbench/browser/actions/quickOpenAction';
import filters = require('vs/base/common/filters');
import {ICommonCodeEditor, IEditorActionDescriptorData} from 'vs/editor/common/editorCommon';

3
src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts
View file

@ -10,8 +10,7 @@ import types = require('vs/base/common/types');
import errors = require('vs/base/common/errors');
import {IContext, Mode, IAutoFocus} from 'vs/base/parts/quickopen/common/quickOpen';
import {QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel';
import {Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry';
import {Extensions as QuickOpenExtensions, QuickOpenHandler, EditorQuickOpenEntry} from 'vs/workbench/browser/quickopen';
import {QuickOpenHandler, EditorQuickOpenEntry} from 'vs/workbench/browser/quickopen';
import {QuickOpenAction} from 'vs/workbench/browser/actions/quickOpenAction';
import {TextEditorOptions, EditorOptions, EditorInput} from 'vs/workbench/common/editor';
import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor';

3
src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
View file

@ -14,8 +14,7 @@ import types = require('vs/base/common/types');
import strings = require('vs/base/common/strings');
import {IContext, Mode, IAutoFocus} from 'vs/base/parts/quickopen/common/quickOpen';
import {QuickOpenModel, IHighlight} from 'vs/base/parts/quickopen/browser/quickOpenModel';
import {Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry';
import {Extensions as QuickOpenExtensions, QuickOpenHandler, EditorQuickOpenEntryGroup} from 'vs/workbench/browser/quickopen';
import {QuickOpenHandler, EditorQuickOpenEntryGroup} from 'vs/workbench/browser/quickopen';
import {QuickOpenAction} from 'vs/workbench/browser/actions/quickOpenAction';
import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor';
import {TextEditorOptions, EditorOptions, EditorInput} from 'vs/workbench/common/editor';

4
src/vs/workbench/parts/quickopen/browser/markersHandler.ts
View file

@ -87,13 +87,13 @@ class MarkerEntry extends QuickOpenEntryItem {
dom.addClass(icon, `severity ${Severity.toString(this._marker.severity).toLowerCase()}`);
row1.appendChild(icon);
const labelContainer = document.createElement('div');
dom.addClass(labelContainer, 'inline')
dom.addClass(labelContainer, 'inline');
new HighlightedLabel(labelContainer).set(this._label, labelHighlights);
row1.appendChild(labelContainer);
// fill second row with descriptions
const descContainer = document.createElement('div');
dom.addClass(descContainer, 'inline description')
dom.addClass(descContainer, 'inline description');
new HighlightedLabel(descContainer).set(this._description, descHighlights);
row2.appendChild(descContainer);

1
src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts
View file

@ -12,7 +12,6 @@ import {Registry} from 'vs/platform/platform';
import {SyncActionDescriptor} from 'vs/platform/actions/common/actions';
import {IWorkbenchActionRegistry, Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry';
import {KeyMod, KeyCode} from 'vs/base/common/keyCodes';
import {Extensions as ConfigurationExtensions} from 'vs/platform/configuration/common/configurationRegistry';
import {GotoSymbolAction, GOTO_SYMBOL_PREFIX, SCOPE_PREFIX} from 'vs/workbench/parts/quickopen/browser/gotoSymbolHandler';
import {ShowAllCommandsAction, ALL_COMMANDS_PREFIX} from 'vs/workbench/parts/quickopen/browser/commandsHandler';
import {GotoLineAction, GOTO_LINE_PREFIX} from 'vs/workbench/parts/quickopen/browser/gotoLineHandler';

9
src/vs/workbench/parts/search/browser/openAnythingHandler.ts
View file

@ -12,12 +12,9 @@ import types = require('vs/base/common/types');
import {isWindows} from 'vs/base/common/platform';
import scorer = require('vs/base/common/scorer');
import paths = require('vs/base/common/paths');
import filters = require('vs/base/common/filters');
import labels = require('vs/base/common/labels');
import strings = require('vs/base/common/strings');
import {IRange} from 'vs/editor/common/editorCommon';
import {ListenerUnbind} from 'vs/base/common/eventEmitter';
import {compareByPrefix} from 'vs/base/common/comparers';
import {IAutoFocus} from 'vs/base/parts/quickopen/common/quickOpen';
import {QuickOpenEntry, QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel';
import {QuickOpenHandler} from 'vs/workbench/browser/quickopen';
@ -26,8 +23,7 @@ import * as openSymbolHandler from 'vs/workbench/parts/search/browser/openSymbol
import {IMessageService, Severity} from 'vs/platform/message/common/message';
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService';
import {ISearchConfiguration} from 'vs/platform/search/common/search';
import {IConfigurationService, IConfigurationServiceEvent, ConfigurationServiceEventTypes} from 'vs/platform/configuration/common/configuration';
import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
interface ISearchWithRange {
search: string;
@ -53,7 +49,6 @@ export class OpenAnythingHandler extends QuickOpenHandler {
private pendingSearch: TPromise<QuickOpenModel>;
private isClosed: boolean;
private scorerCache: { [key: string]: number };
private configurationListenerUnbind: ListenerUnbind;
constructor(
@IMessageService private messageService: IMessageService,
@ -237,7 +232,7 @@ export class OpenAnythingHandler extends QuickOpenHandler {
return {
search: value.substr(0, patternMatch.index), // clear range suffix from search value
range: range
}
};
}
return null;

1
src/vs/workbench/parts/search/browser/openFileHandler.ts
View file

@ -6,7 +6,6 @@
import {TPromise} from 'vs/base/common/winjs.base';
import nls = require('vs/nls');
import {ThrottledDelayer} from 'vs/base/common/async';
import paths = require('vs/base/common/paths');
import labels = require('vs/base/common/labels');
import URI from 'vs/base/common/uri';