some linting and import polish

src/vs/base/browser/ui/button/button.ts

@@ -6,17 +6,15 @@
 'use strict';
 
 import 'vs/css!./button';
-import EventEmitter = require('vs/base/common/eventEmitter');
+import {EventEmitter} from 'vs/base/common/eventEmitter';
 import DOM = require('vs/base/browser/dom');
-import Builder = require('vs/base/browser/builder');
+import {Builder, $} from 'vs/base/browser/builder';
 
-var $ = Builder.$;
+export class Button extends EventEmitter {
 
-export class Button extends EventEmitter.EventEmitter {
+	private $el: Builder;
 
-	private $el: Builder.Builder;
-
-	constructor(container: Builder.Builder);
+	constructor(container: Builder);
 	constructor(container: HTMLElement);
 	constructor(container: any) {
 		super();

src/vs/base/browser/ui/checkbox/checkbox.ts

@@ -17,7 +17,7 @@ export interface ICheckboxOpts {
 	title: string;
 	isChecked: boolean;
 	onChange: () => void;
-	onKeyDown?: (e:StandardKeyboardEvent) => void;
+	onKeyDown?: (e: StandardKeyboardEvent) => void;
 }
 
 export class Checkbox extends Widget {
@@ -27,7 +27,7 @@ export class Checkbox extends Widget {
 
 	private _checked: boolean;
 
-	constructor(opts:ICheckboxOpts) {
+	constructor(opts: ICheckboxOpts) {
 		super();
 		this._opts = opts;
 		this._checked = this._opts.isChecked;
@@ -70,7 +70,7 @@ export class Checkbox extends Widget {
 		return this._checked;
 	}
 
-	public set checked(newIsChecked:boolean) {
+	public set checked(newIsChecked: boolean) {
 		this._checked = newIsChecked;
 		this.domNode.setAttribute('aria-checked', String(this._checked));
 		this.domNode.className = this._className();

src/vs/base/browser/ui/countBadge/countBadge.ts

@@ -6,18 +6,16 @@
 'use strict';
 
 import 'vs/css!./countBadge';
-import Builder = require('vs/base/browser/builder');
-import Strings = require('vs/base/common/strings');
-
-const $ = Builder.$;
+import {Builder, $} from 'vs/base/browser/builder';
+import strings = require('vs/base/common/strings');
 
 export class CountBadge {
 
-	private $el: Builder.Builder;
+	private $el: Builder;
 	private count: number;
 	private titleFormat: string;
 
-	constructor(container: Builder.Builder, count?: number, titleFormat?: string);
+	constructor(container: Builder, count?: number, titleFormat?: string);
 	constructor(container: HTMLElement, count?: number, titleFormat?: string);
 	constructor(container: any, count?: number, titleFormat?: string) {
 		this.$el = $('.monaco-count-badge').appendTo(container);
@@ -37,7 +35,7 @@ export class CountBadge {
 
 	private render() {
 		this.$el.text('' + this.count);
-		this.$el.title(Strings.format(this.titleFormat, this.count));
+		this.$el.title(strings.format(this.titleFormat, this.count));
 	}
 
 	public dispose() {

src/vs/base/browser/ui/toolbar/toolbar.ts

@@ -7,21 +7,19 @@
 
 import 'vs/css!./toolbar';
 import nls = require('vs/nls');
-import Lifecycle = require('vs/base/common/lifecycle');
-import Builder = require('vs/base/browser/builder');
-import Types = require('vs/base/common/types');
-import Actions = require('vs/base/common/actions');
-import ActionBar = require('vs/base/browser/ui/actionbar/actionbar');
-import Dropdown = require('vs/base/browser/ui/dropdown/dropdown');
-import EventEmitter = require('vs/base/common/eventEmitter');
-
-var $ = <Builder.QuickBuilder> Builder.$;
+import {IDisposable} from 'vs/base/common/lifecycle';
+import {Builder, $} from 'vs/base/browser/builder';
+import types = require('vs/base/common/types');
+import {Action, IActionRunner, IAction} from 'vs/base/common/actions';
+import {ActionBar, ActionsOrientation, IActionItemProvider, BaseActionItem} from 'vs/base/browser/ui/actionbar/actionbar';
+import {IContextMenuProvider, DropdownMenu, IActionProvider, ILabelRenderer, IDropdownMenuOptions} from 'vs/base/browser/ui/dropdown/dropdown';
+import {ListenerUnbind} from 'vs/base/common/eventEmitter';
 
 export var CONTEXT = 'context.toolbar';
 
 export interface IToolBarOptions {
-	orientation?: ActionBar.ActionsOrientation;
-	actionItemProvider?: ActionBar.IActionItemProvider;
+	orientation?: ActionsOrientation;
+	actionItemProvider?: IActionItemProvider;
 }
 
 /**
@@ -29,12 +27,12 @@ export interface IToolBarOptions {
  */
 export class ToolBar {
 	private options: IToolBarOptions;
-	private actionBar: ActionBar.ActionBar;
+	private actionBar: ActionBar;
 	private toggleMenuAction: ToggleMenuAction;
 	private toggleMenuActionItem: DropdownMenuActionItem;
 	private hasSecondaryActions: boolean;
 
-	constructor(container: HTMLElement, contextMenuProvider: Dropdown.IContextMenuProvider, options: IToolBarOptions = { orientation: ActionBar.ActionsOrientation.HORIZONTAL }) {
+	constructor(container: HTMLElement, contextMenuProvider: IContextMenuProvider, options: IToolBarOptions = { orientation: ActionsOrientation.HORIZONTAL }) {
 		this.options = options;
 		this.toggleMenuAction = new ToggleMenuAction();
 
@@ -42,9 +40,9 @@ export class ToolBar {
 		element.className = 'monaco-toolbar';
 		container.appendChild(element);
 
-		this.actionBar = new ActionBar.ActionBar($(element), {
+		this.actionBar = new ActionBar($(element), {
 			orientation: options.orientation,
-			actionItemProvider: (action: Actions.Action) => {
+			actionItemProvider: (action: Action) => {
 
 				// Return special action item for the toggle menu action
 				if (action.id === ToggleMenuAction.ID) {
@@ -60,7 +58,7 @@ export class ToolBar {
 						(<ToggleMenuAction>action).menuActions,
 						contextMenuProvider,
 						this.options.actionItemProvider,
-						this.options.orientation === ActionBar.ActionsOrientation.HORIZONTAL,
+						this.options.orientation === ActionsOrientation.HORIZONTAL,
 						this.actionRunner,
 						'toolbar-toggle-more'
 					);
@@ -73,19 +71,19 @@ export class ToolBar {
 		});
 	}
 
-	public set actionRunner(actionRunner: Actions.IActionRunner) {
+	public set actionRunner(actionRunner: IActionRunner) {
 		this.actionBar.actionRunner = actionRunner;
 	}
 
-	public get actionRunner(): Actions.IActionRunner {
+	public get actionRunner(): IActionRunner {
 		return this.actionBar.actionRunner;
 	}
 
-	public getContainer(): Builder.Builder {
+	public getContainer(): Builder {
 		return this.actionBar.getContainer();
 	}
 
-	public setActions(primaryActions: Actions.IAction[], secondaryActions?: Actions.IAction[]): () => void {
+	public setActions(primaryActions: IAction[], secondaryActions?: IAction[]): () => void {
 		return () => {
 			var primaryActionsToSet = primaryActions ? primaryActions.slice(0) : [];
 
@@ -101,7 +99,7 @@ export class ToolBar {
 		};
 	}
 
-	public addPrimaryAction(primaryActions: Actions.IAction): () => void {
+	public addPrimaryAction(primaryActions: IAction): () => void {
 		return () => {
 
 			// Add after the "..." action if we have secondary actions
@@ -127,11 +125,11 @@ export class ToolBar {
 	}
 }
 
-class ToggleMenuAction extends Actions.Action {
+class ToggleMenuAction extends Action {
 
 	public static ID = 'toolbar.toggle.more';
 
-	private _menuActions: Actions.IAction[];
+	private _menuActions: IAction[];
 
 	constructor() {
 		super(ToggleMenuAction.ID, nls.localize('more', "More"), null, true);
@@ -141,24 +139,24 @@ class ToggleMenuAction extends Actions.Action {
 		return this._menuActions;
 	}
 
-	public set menuActions(actions: Actions.IAction[]) {
+	public set menuActions(actions: IAction[]) {
 		this._menuActions = actions;
 	}
 }
 
-export class DropdownMenuActionItem extends ActionBar.BaseActionItem {
+export class DropdownMenuActionItem extends BaseActionItem {
 
 	private menuActionsOrProvider: any;
 	private animateClick: boolean;
-	private dropdownMenu: Dropdown.DropdownMenu;
-	private toUnbind: EventEmitter.ListenerUnbind;
-	private contextMenuProvider: Dropdown.IContextMenuProvider;
-	private actionItemProvider: ActionBar.IActionItemProvider;
+	private dropdownMenu: DropdownMenu;
+	private toUnbind: ListenerUnbind;
+	private contextMenuProvider: IContextMenuProvider;
+	private actionItemProvider: IActionItemProvider;
 	private clazz: string;
 
-	constructor(action: Actions.IAction, menuActions: Actions.IAction[], contextMenuProvider: Dropdown.IContextMenuProvider, actionItemProvider: ActionBar.IActionItemProvider, animateClick: boolean, actionRunner: Actions.IActionRunner, clazz: string);
-	constructor(action: Actions.IAction, actionProvider: Dropdown.IActionProvider, contextMenuProvider: Dropdown.IContextMenuProvider, actionItemProvider: ActionBar.IActionItemProvider, animateClick: boolean, actionRunner: Actions.IActionRunner, clazz: string);
-	constructor(action: Actions.IAction, menuActionsOrProvider: any, contextMenuProvider: Dropdown.IContextMenuProvider, actionItemProvider: ActionBar.IActionItemProvider, animateClick: boolean, actionRunner: Actions.IActionRunner, clazz: string) {
+	constructor(action: IAction, menuActions: IAction[], contextMenuProvider: IContextMenuProvider, actionItemProvider: IActionItemProvider, animateClick: boolean, actionRunner: IActionRunner, clazz: string);
+	constructor(action: IAction, actionProvider: IActionProvider, contextMenuProvider: IContextMenuProvider, actionItemProvider: IActionItemProvider, animateClick: boolean, actionRunner: IActionRunner, clazz: string);
+	constructor(action: IAction, menuActionsOrProvider: any, contextMenuProvider: IContextMenuProvider, actionItemProvider: IActionItemProvider, animateClick: boolean, actionRunner: IActionRunner, clazz: string) {
 		super(null, action);
 
 		this.menuActionsOrProvider = menuActionsOrProvider;
@@ -172,8 +170,8 @@ export class DropdownMenuActionItem extends ActionBar.BaseActionItem {
 	public render(container: HTMLElement): void {
 		super.render(container);
 
-		var labelRenderer: Dropdown.ILabelRenderer = (el: HTMLElement): Lifecycle.IDisposable => {
-			var e = Builder.$('a.action-label').attr({
+		var labelRenderer: ILabelRenderer = (el: HTMLElement): IDisposable => {
+			var e = $('a.action-label').attr({
 				tabIndex: '-1',
 				role: 'menuitem',
 				title: this._action.label || '',
@@ -199,19 +197,19 @@ export class DropdownMenuActionItem extends ActionBar.BaseActionItem {
 			return null;
 		};
 
-		var options: Dropdown.IDropdownMenuOptions = {
+		var options: IDropdownMenuOptions = {
 			contextMenuProvider: this.contextMenuProvider,
 			labelRenderer: labelRenderer
 		};
 
 		// Render the DropdownMenu around a simple action to toggle it
-		if (Types.isArray(this.menuActionsOrProvider)) {
+		if (types.isArray(this.menuActionsOrProvider)) {
 			options.actions = this.menuActionsOrProvider;
 		} else {
 			options.actionProvider = this.menuActionsOrProvider;
 		}
 
-		this.dropdownMenu = new Dropdown.DropdownMenu(container, options);
+		this.dropdownMenu = new DropdownMenu(container, options);
 
 		this.dropdownMenu.menuOptions = {
 			actionItemProvider: this.actionItemProvider,