Revert "Avoid using import x = require('...')"

This reverts commit 7de696a202.

Seems to have broken loading vs/nls in at least one case in insiders

src/vs/base/browser/builder.ts

@@ -6,11 +6,11 @@
 
 import 'vs/css!./builder';
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as types from 'vs/base/common/types';
+import types = require('vs/base/common/types');
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import * as strings from 'vs/base/common/strings';
-import * as assert from 'vs/base/common/assert';
-import * as DOM from 'vs/base/browser/dom';
+import strings = require('vs/base/common/strings');
+import assert = require('vs/base/common/assert');
+import DOM = require('vs/base/browser/dom');
 
 /**
  * Welcome to the monaco builder. The recommended way to use it is:

src/vs/base/browser/touch.ts

@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as arrays from 'vs/base/common/arrays';
+import arrays = require('vs/base/common/arrays');
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import * as DomUtils from 'vs/base/browser/dom';
+import DomUtils = require('vs/base/browser/dom');
 import { memoize } from 'vs/base/common/decorators';
 
 export namespace EventType {

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

@@ -6,14 +6,14 @@
 'use strict';
 
 import 'vs/css!./actionbar';
-import * as nls from 'vs/nls';
-import * as lifecycle from 'vs/base/common/lifecycle';
+import nls = require('vs/nls');
+import lifecycle = require('vs/base/common/lifecycle');
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Builder, $ } from 'vs/base/browser/builder';
 import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
 import { IAction, IActionRunner, Action, IActionChangeEvent, ActionRunner, IRunEvent } from 'vs/base/common/actions';
-import * as DOM from 'vs/base/browser/dom';
-import * as types from 'vs/base/common/types';
+import DOM = require('vs/base/browser/dom');
+import types = require('vs/base/common/types');
 import { EventType, Gesture } from 'vs/base/browser/touch';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';

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

@@ -6,7 +6,7 @@
 'use strict';
 
 import 'vs/css!./aria';
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import { isMacintosh } from 'vs/base/common/platform';
 import * as dom from 'vs/base/browser/dom';
 

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

@@ -6,7 +6,7 @@
 'use strict';
 
 import 'vs/css!./button';
-import * as DOM from 'vs/base/browser/dom';
+import DOM = require('vs/base/browser/dom');
 import { Builder, $ } from 'vs/base/browser/builder';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';

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

@@ -7,7 +7,7 @@
 
 import 'vs/css!./checkbox';
 
-import * as DOM from 'vs/base/browser/dom';
+import DOM = require('vs/base/browser/dom');
 import * as objects from 'vs/base/common/objects';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { Widget } from 'vs/base/browser/ui/widget';

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

@@ -8,7 +8,7 @@
 
 import 'vs/css!./contextview';
 import { Builder, $ } from 'vs/base/browser/builder';
-import * as DOM from 'vs/base/browser/dom';
+import DOM = require('vs/base/browser/dom');
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 
 export interface IAnchor {

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

@@ -6,11 +6,11 @@
 'use strict';
 
 import 'vs/css!./iconlabel';
-import * as dom from 'vs/base/browser/dom';
+import dom = require('vs/base/browser/dom');
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { IMatch } from 'vs/base/common/filters';
 import uri from 'vs/base/common/uri';
-import * as paths from 'vs/base/common/paths';
+import paths = require('vs/base/common/paths');
 import { IWorkspaceFolderProvider, getPathLabel, IUserHomeProvider, getBaseLabel } from 'vs/base/common/labels';
 import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
 

src/vs/base/browser/ui/inputbox/inputBox.ts

@@ -6,11 +6,11 @@
 
 import 'vs/css!./inputBox';
 
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import * as Bal from 'vs/base/browser/browser';
 import * as dom from 'vs/base/browser/dom';
 import { RenderOptions, renderFormattedText, renderText } from 'vs/base/browser/htmlContentRenderer';
-import * as aria from 'vs/base/browser/ui/aria/aria';
+import aria = require('vs/base/browser/ui/aria/aria');
 import { IAction } from 'vs/base/common/actions';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IContextViewProvider, AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';

src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts

@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as octiconLabel from 'vs/base/browser/ui/octiconLabel/octiconLabel';
+import octiconLabel = require('vs/base/browser/ui/octiconLabel/octiconLabel');
 import { escape } from 'vs/base/common/strings';
 
 function render(text: string): string {

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

@@ -7,9 +7,9 @@
 
 import 'vs/css!./progressbar';
 import { TPromise, ValueCallback } from 'vs/base/common/winjs.base';
-import * as assert from 'vs/base/common/assert';
+import assert = require('vs/base/common/assert');
 import { Builder, $ } from 'vs/base/browser/builder';
-import * as DOM from 'vs/base/browser/dom';
+import DOM = require('vs/base/browser/dom');
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';

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

@@ -10,8 +10,8 @@ import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle';
 import { Builder, $, Dimension } from 'vs/base/browser/builder';
 import { isIPad } from 'vs/base/browser/browser';
 import { isMacintosh } from 'vs/base/common/platform';
-import * as types from 'vs/base/common/types';
-import * as DOM from 'vs/base/browser/dom';
+import types = require('vs/base/common/types');
+import DOM = require('vs/base/browser/dom');
 import { EventType, GestureEvent, Gesture } from 'vs/base/browser/touch';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { Event, Emitter } from 'vs/base/common/event';

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

@@ -8,8 +8,8 @@
 import 'vs/css!./splitview';
 import { IDisposable, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { Event, mapEvent, Emitter } from 'vs/base/common/event';
-import * as types from 'vs/base/common/types';
-import * as dom from 'vs/base/browser/dom';
+import types = require('vs/base/common/types');
+import dom = require('vs/base/browser/dom');
 import { clamp } from 'vs/base/common/numbers';
 import { range, firstIndex } from 'vs/base/common/arrays';
 import { Sash, Orientation, ISashEvent as IBaseSashEvent } from 'vs/base/browser/ui/sash/sash';

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

@@ -6,7 +6,7 @@
 'use strict';
 
 import 'vs/css!./toolbar';
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Builder, $ } from 'vs/base/browser/builder';
 import { Action, IActionRunner, IAction } from 'vs/base/common/actions';

src/vs/base/common/errorMessage.ts

@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as nls from 'vs/nls';
-import * as types from 'vs/base/common/types';
-import * as arrays from 'vs/base/common/arrays';
+import nls = require('vs/nls');
+import types = require('vs/base/common/types');
+import arrays = require('vs/base/common/arrays');
 
 function exceptionToErrorMessage(exception: any, verbose: boolean): string {
 	if (exception.message) {

src/vs/base/common/filters.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as strings from 'vs/base/common/strings';
+import strings = require('vs/base/common/strings');
 import { LRUCache } from 'vs/base/common/map';
 import { CharCode } from 'vs/base/common/charCode';
 

src/vs/base/common/glob.ts

@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as arrays from 'vs/base/common/arrays';
-import * as strings from 'vs/base/common/strings';
-import * as paths from 'vs/base/common/paths';
+import arrays = require('vs/base/common/arrays');
+import strings = require('vs/base/common/strings');
+import paths = require('vs/base/common/paths');
 import { LRUCache } from 'vs/base/common/map';
 import { CharCode } from 'vs/base/common/charCode';
 import { TPromise } from 'vs/base/common/winjs.base';

src/vs/base/common/jsonFormatter.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as Json from './json';
+import Json = require('./json');
 
 export interface FormattingOptions {
 	/**

src/vs/base/common/labels.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import URI from 'vs/base/common/uri';
-import * as platform from 'vs/base/common/platform';
+import platform = require('vs/base/common/platform');
 import { nativeSep, normalize, isEqualOrParent, isEqual, basename as pathsBasename, join } from 'vs/base/common/paths';
 import { endsWith, ltrim } from 'vs/base/common/strings';
 import { Schemas } from 'vs/base/common/network';

src/vs/base/common/mime.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as paths from 'vs/base/common/paths';
-import * as strings from 'vs/base/common/strings';
+import paths = require('vs/base/common/paths');
+import strings = require('vs/base/common/strings');
 import { match } from 'vs/base/common/glob';
 
 export const MIME_TEXT = 'text/plain';

src/vs/base/common/severity.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as nls from 'vs/nls';
-import * as strings from 'vs/base/common/strings';
+import nls = require('vs/nls');
+import strings = require('vs/base/common/strings');
 
 enum Severity {
 	Ignore = 0,

src/vs/base/node/decoder.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import * as sd from 'string_decoder';
+import sd = require('string_decoder');
 import { CharCode } from 'vs/base/common/charCode';
 
 /**

src/vs/base/node/encoding.ts

@@ -5,8 +5,8 @@
 
 'use strict';
 
-import * as stream from 'vs/base/node/stream';
-import * as iconv from 'iconv-lite';
+import stream = require('vs/base/node/stream');
+import iconv = require('iconv-lite');
 import { TPromise } from 'vs/base/common/winjs.base';
 import { isLinux, isMacintosh } from 'vs/base/common/platform';
 import { exec } from 'child_process';

src/vs/base/node/flow.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import * as assert from 'assert';
+import assert = require('assert');
 
 /**
  * Executes the given function (fn) over the given array of items (list) in parallel and returns the resulting errors and results as

src/vs/base/node/mime.ts

@@ -5,11 +5,11 @@
 
 'use strict';
 
-import * as mime from 'vs/base/common/mime';
+import mime = require('vs/base/common/mime');
 import { TPromise } from 'vs/base/common/winjs.base';
 
-import * as stream from 'vs/base/node/stream';
-import * as encoding from 'vs/base/node/encoding';
+import stream = require('vs/base/node/stream');
+import encoding = require('vs/base/node/encoding');
 
 /**
  * Lots of binary file types exists where the type can be determined by matching the first few bytes against some "magic patterns".

src/vs/base/node/ports.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import * as net from 'net';
+import net = require('net');
 
 /**
  * @returns Returns a random port between 1025 and 65535.

src/vs/base/node/processes.ts

@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as path from 'path';
+import path = require('path');
 import * as cp from 'child_process';
 import { fork } from 'vs/base/node/stdFork';
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import { PPromise, TPromise, TValueCallback, TProgressCallback, ErrorCallback } from 'vs/base/common/winjs.base';
 import * as Types from 'vs/base/common/types';
 import { IStringDictionary } from 'vs/base/common/collections';

src/vs/base/node/request.ts

@@ -7,8 +7,8 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { isBoolean, isNumber } from 'vs/base/common/types';
-import * as https from 'https';
-import * as http from 'http';
+import https = require('https');
+import http = require('http');
 import { Stream } from 'stream';
 import { parse as parseUrl } from 'url';
 import { createWriteStream } from 'fs';

src/vs/base/node/stdFork.ts

@@ -5,10 +5,10 @@
 
 'use strict';
 
-import * as path from 'path';
-import * as os from 'os';
-import * as net from 'net';
-import * as cp from 'child_process';
+import path = require('path');
+import os = require('os');
+import net = require('net');
+import cp = require('child_process');
 import uri from 'vs/base/common/uri';
 
 export interface IForkOpts {

src/vs/base/node/stream.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import * as fs from 'fs';
+import fs = require('fs');
 
 import { TPromise } from 'vs/base/common/winjs.base';
 

src/vs/base/node/zip.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import * as path from 'path';
 import { createWriteStream } from 'fs';
 import { Readable } from 'stream';

src/vs/base/parts/quickopen/browser/quickOpenModel.ts

@@ -5,9 +5,9 @@
 
 'use strict';
 
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as types from 'vs/base/common/types';
+import types = require('vs/base/common/types');
 import URI from 'vs/base/common/uri';
 import { ITree, IActionProvider } from 'vs/base/parts/tree/browser/tree';
 import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
@@ -16,7 +16,7 @@ import { Action, IAction, IActionRunner } from 'vs/base/common/actions';
 import { compareAnything } from 'vs/base/common/comparers';
 import { ActionBar, IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import * as DOM from 'vs/base/browser/dom';
+import DOM = require('vs/base/browser/dom');
 import { IQuickOpenStyles } from 'vs/base/parts/quickopen/browser/quickOpenWidget';
 import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
 import { OS } from 'vs/base/common/platform';

src/vs/base/parts/quickopen/browser/quickOpenWidget.ts

@@ -5,11 +5,11 @@
 'use strict';
 
 import 'vs/css!./quickopen';
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as platform from 'vs/base/common/platform';
-import * as types from 'vs/base/common/types';
-import * as errors from 'vs/base/common/errors';
+import platform = require('vs/base/common/platform');
+import types = require('vs/base/common/types');
+import errors = require('vs/base/common/errors');
 import { IQuickNavigateConfiguration, IAutoFocus, IEntryRunContext, IModel, Mode, IKeyMods } from 'vs/base/parts/quickopen/common/quickOpen';
 import { Filter, Renderer, DataSource, IModelProvider, AccessibilityProvider } from 'vs/base/parts/quickopen/browser/quickOpenViewer';
 import { Dimension, Builder, $ } from 'vs/base/browser/builder';
@@ -20,7 +20,7 @@ import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { DefaultController, ClickBehavior } from 'vs/base/parts/tree/browser/treeDefaults';
-import * as DOM from 'vs/base/browser/dom';
+import DOM = require('vs/base/browser/dom');
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';

src/vs/base/parts/tree/browser/tree.ts

@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as WinJS from 'vs/base/common/winjs.base';
-import * as Touch from 'vs/base/browser/touch';
-import * as Mouse from 'vs/base/browser/mouseEvent';
-import * as Keyboard from 'vs/base/browser/keyboardEvent';
+import WinJS = require('vs/base/common/winjs.base');
+import Touch = require('vs/base/browser/touch');
+import Mouse = require('vs/base/browser/mouseEvent');
+import Keyboard = require('vs/base/browser/keyboardEvent');
 import { INavigator } from 'vs/base/common/iterator';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { Event } from 'vs/base/common/event';

src/vs/base/parts/tree/browser/treeDefaults.ts

@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action } from 'vs/base/common/actions';
-import * as platform from 'vs/base/common/platform';
-import * as touch from 'vs/base/browser/touch';
-import * as errors from 'vs/base/common/errors';
-import * as dom from 'vs/base/browser/dom';
-import * as mouse from 'vs/base/browser/mouseEvent';
+import platform = require('vs/base/common/platform');
+import touch = require('vs/base/browser/touch');
+import errors = require('vs/base/common/errors');
+import dom = require('vs/base/browser/dom');
+import mouse = require('vs/base/browser/mouseEvent');
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import * as _ from 'vs/base/parts/tree/browser/tree';
+import _ = require('vs/base/parts/tree/browser/tree');
 import { KeyCode, KeyMod, Keybinding, createKeybinding, SimpleKeybinding } from 'vs/base/common/keyCodes';
 
 export interface IKeyBindingCallback {

src/vs/base/parts/tree/browser/treeDnd.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as _ from 'vs/base/parts/tree/browser/tree';
-import * as Mouse from 'vs/base/browser/mouseEvent';
+import _ = require('vs/base/parts/tree/browser/tree');
+import Mouse = require('vs/base/browser/mouseEvent');
 
 export class ElementsDragAndDropData implements _.IDragAndDropData {
 

src/vs/base/parts/tree/browser/treeImpl.ts

@@ -5,15 +5,17 @@
 'use strict';
 
 import 'vs/css!./tree';
-import * as WinJS from 'vs/base/common/winjs.base';
-import * as TreeDefaults from 'vs/base/parts/tree/browser/treeDefaults';
-import * as Model from 'vs/base/parts/tree/browser/treeModel';
-import * as View from './treeView';
-import * as _ from 'vs/base/parts/tree/browser/tree';
+import WinJS = require('vs/base/common/winjs.base');
+import TreeDefaults = require('vs/base/parts/tree/browser/treeDefaults');
+import Model = require('vs/base/parts/tree/browser/treeModel');
+import View = require('./treeView');
+import _ = require('vs/base/parts/tree/browser/tree');
 import { INavigator, MappedNavigator } from 'vs/base/common/iterator';
 import { Event, Emitter, Relay } from 'vs/base/common/event';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
+import { ISelectionEvent, IFocusEvent, IHighlightEvent } from 'vs/base/parts/tree/browser/tree';
+import { IItemCollapseEvent, IItemExpandEvent } from 'vs/base/parts/tree/browser/treeModel';
 
 export class TreeContext implements _.ITreeContext {
 
@@ -69,16 +71,16 @@ export class Tree implements _.ITree {
 	private model: Model.TreeModel;
 	private view: View.TreeView;
 
-	private _onDidChangeFocus = new Relay<_.IFocusEvent>();
-	readonly onDidChangeFocus: Event<_.IFocusEvent> = this._onDidChangeFocus.event;
-	private _onDidChangeSelection = new Relay<_.ISelectionEvent>();
-	readonly onDidChangeSelection: Event<_.ISelectionEvent> = this._onDidChangeSelection.event;
-	private _onHighlightChange = new Relay<_.IHighlightEvent>();
-	readonly onDidChangeHighlight: Event<_.IHighlightEvent> = this._onHighlightChange.event;
-	private _onDidExpandItem = new Relay<Model.IItemExpandEvent>();
-	readonly onDidExpandItem: Event<Model.IItemExpandEvent> = this._onDidExpandItem.event;
-	private _onDidCollapseItem = new Relay<Model.IItemCollapseEvent>();
-	readonly onDidCollapseItem: Event<Model.IItemCollapseEvent> = this._onDidCollapseItem.event;
+	private _onDidChangeFocus = new Relay<IFocusEvent>();
+	readonly onDidChangeFocus: Event<IFocusEvent> = this._onDidChangeFocus.event;
+	private _onDidChangeSelection = new Relay<ISelectionEvent>();
+	readonly onDidChangeSelection: Event<ISelectionEvent> = this._onDidChangeSelection.event;
+	private _onHighlightChange = new Relay<IHighlightEvent>();
+	readonly onDidChangeHighlight: Event<IHighlightEvent> = this._onHighlightChange.event;
+	private _onDidExpandItem = new Relay<IItemExpandEvent>();
+	readonly onDidExpandItem: Event<IItemExpandEvent> = this._onDidExpandItem.event;
+	private _onDidCollapseItem = new Relay<IItemCollapseEvent>();
+	readonly onDidCollapseItem: Event<IItemCollapseEvent> = this._onDidCollapseItem.event;
 	private _onDispose = new Emitter<void>();
 	readonly onDidDispose: Event<void> = this._onDispose.event;
 

src/vs/base/parts/tree/browser/treeModel.ts

@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as Assert from 'vs/base/common/assert';
+import Assert = require('vs/base/common/assert');
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
-import * as arrays from 'vs/base/common/arrays';
+import arrays = require('vs/base/common/arrays');
 import { INavigator } from 'vs/base/common/iterator';
-import * as WinJS from 'vs/base/common/winjs.base';
-import * as _ from './tree';
+import WinJS = require('vs/base/common/winjs.base');
+import _ = require('./tree');
 import { Event, Emitter, once, EventMultiplexer, Relay } from 'vs/base/common/event';
 
 interface IMap<T> { [id: string]: T; }

src/vs/base/parts/tree/browser/treeView.ts

@@ -4,25 +4,26 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as Platform from 'vs/base/common/platform';
-import * as Browser from 'vs/base/browser/browser';
-import * as WinJS from 'vs/base/common/winjs.base';
-import * as Lifecycle from 'vs/base/common/lifecycle';
-import * as DOM from 'vs/base/browser/dom';
-import * as Diff from 'vs/base/common/diff/diff';
-import * as Touch from 'vs/base/browser/touch';
-import * as strings from 'vs/base/common/strings';
-import * as Mouse from 'vs/base/browser/mouseEvent';
-import * as Keyboard from 'vs/base/browser/keyboardEvent';
-import * as Model from 'vs/base/parts/tree/browser/treeModel';
-import * as dnd from './treeDnd';
+import Platform = require('vs/base/common/platform');
+import Browser = require('vs/base/browser/browser');
+import WinJS = require('vs/base/common/winjs.base');
+import Lifecycle = require('vs/base/common/lifecycle');
+import DOM = require('vs/base/browser/dom');
+import Diff = require('vs/base/common/diff/diff');
+import Touch = require('vs/base/browser/touch');
+import strings = require('vs/base/common/strings');
+import Mouse = require('vs/base/browser/mouseEvent');
+import Keyboard = require('vs/base/browser/keyboardEvent');
+import Model = require('vs/base/parts/tree/browser/treeModel');
+import dnd = require('./treeDnd');
 import { ArrayIterator, MappedIterator } from 'vs/base/common/iterator';
 import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { HeightMap, IViewItem } from 'vs/base/parts/tree/browser/treeViewModel';
-import * as _ from 'vs/base/parts/tree/browser/tree';
+import _ = require('vs/base/parts/tree/browser/tree');
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { Event, Emitter } from 'vs/base/common/event';
+import { IDomNodePagePosition } from 'vs/base/browser/dom';
 import { DataTransfers } from 'vs/base/browser/dnd';
 import { DefaultTreestyler } from './treeDefaults';
 import { Delayer } from 'vs/base/common/async';
@@ -1251,7 +1252,7 @@ export class TreeView extends HeightMap {
 			var keyboardEvent = new Keyboard.StandardKeyboardEvent(<KeyboardEvent>event);
 			element = this.model.getFocus();
 
-			var position: DOM.IDomNodePagePosition;
+			var position: IDomNodePagePosition;
 
 			if (!element) {
 				element = this.model.getInput();

src/vs/base/parts/tree/test/browser/treeModel.test.ts

@@ -5,12 +5,12 @@
 
 'use strict';
 
-import * as assert from 'assert';
-import * as lifecycle from 'vs/base/common/lifecycle';
-import * as _ from 'vs/base/parts/tree/browser/tree';
-import * as WinJS from 'vs/base/common/winjs.base';
-import * as model from 'vs/base/parts/tree/browser/treeModel';
-import * as TreeDefaults from 'vs/base/parts/tree/browser/treeDefaults';
+import assert = require('assert');
+import lifecycle = require('vs/base/common/lifecycle');
+import _ = require('vs/base/parts/tree/browser/tree');
+import WinJS = require('vs/base/common/winjs.base');
+import model = require('vs/base/parts/tree/browser/treeModel');
+import TreeDefaults = require('vs/base/parts/tree/browser/treeDefaults');
 import { Event, Emitter } from 'vs/base/common/event';
 
 export class FakeRenderer {

src/vs/base/parts/tree/test/browser/treeViewModel.test.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import * as assert from 'assert';
+import assert = require('assert');
 import { ArrayIterator } from 'vs/base/common/iterator';
 import { HeightMap, IViewItem } from 'vs/base/parts/tree/browser/treeViewModel';
 

src/vs/base/test/browser/ui/list/rangeMap.test.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as assert from 'assert';
+import assert = require('assert');
 import { RangeMap, intersect, groupIntersect, consolidate } from 'vs/base/browser/ui/list/rangeMap';
 
 suite('RangeMap', () => {

src/vs/base/test/common/arrays.test.ts

@@ -6,7 +6,8 @@
 
 import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as arrays from 'vs/base/common/arrays';
+import arrays = require('vs/base/common/arrays');
+import { coalesce } from 'vs/base/common/arrays';
 
 suite('Arrays', () => {
 	test('findFirst', function () {
@@ -270,13 +271,13 @@ suite('Arrays', () => {
 	}
 
 	test('coalesce', function () {
-		let a = arrays.coalesce([null, 1, null, 2, 3]);
+		let a = coalesce([null, 1, null, 2, 3]);
 		assert.equal(a.length, 3);
 		assert.equal(a[0], 1);
 		assert.equal(a[1], 2);
 		assert.equal(a[2], 3);
 
-		arrays.coalesce([null, 1, null, void 0, undefined, 2, 3]);
+		coalesce([null, 1, null, void 0, undefined, 2, 3]);
 		assert.equal(a.length, 3);
 		assert.equal(a[0], 1);
 		assert.equal(a[1], 2);
@@ -286,7 +287,7 @@ suite('Arrays', () => {
 		b[10] = 1;
 		b[20] = 2;
 		b[30] = 3;
-		b = arrays.coalesce(b);
+		b = coalesce(b);
 		assert.equal(b.length, 3);
 		assert.equal(b[0], 1);
 		assert.equal(b[1], 2);
@@ -301,7 +302,7 @@ suite('Arrays', () => {
 
 		assert.equal(sparse.length, 1002);
 
-		sparse = arrays.coalesce(sparse);
+		sparse = coalesce(sparse);
 		assert.equal(sparse.length, 5);
 	});
 });

src/vs/base/test/common/async.test.ts

@@ -6,7 +6,7 @@
 
 import * as assert from 'assert';
 import { Promise, TPromise } from 'vs/base/common/winjs.base';
-import * as Async from 'vs/base/common/async';
+import Async = require('vs/base/common/async');
 import URI from 'vs/base/common/uri';
 
 suite('Async', () => {

src/vs/base/test/common/collections.test.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import * as collections from 'vs/base/common/collections';
+import collections = require('vs/base/common/collections');
 
 
 suite('Collections', () => {

src/vs/base/test/common/event.test.ts

@@ -7,7 +7,7 @@
 import * as assert from 'assert';
 import { Event, Emitter, debounceEvent, EventBufferer, once, fromPromise, stopwatch, buffer, echo, EventMultiplexer } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import * as Errors from 'vs/base/common/errors';
+import Errors = require('vs/base/common/errors');
 import { TPromise } from 'vs/base/common/winjs.base';
 
 namespace Samples {

src/vs/base/test/common/jsonEdit.test.ts

@@ -6,7 +6,7 @@
 
 import { FormattingOptions, Edit } from 'vs/base/common/jsonFormatter';
 import { setProperty, removeProperty } from 'vs/base/common/jsonEdit';
-import * as assert from 'assert';
+import assert = require('assert');
 
 suite('JSON - edits', () => {
 

src/vs/base/test/common/jsonFormatter.test.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as Formatter from 'vs/base/common/jsonFormatter';
-import * as assert from 'assert';
+import Formatter = require('vs/base/common/jsonFormatter');
+import assert = require('assert');
 
 suite('JSON - formatter', () => {
 

src/vs/base/test/common/labels.test.ts

@@ -6,8 +6,9 @@
 'use strict';
 
 import * as assert from 'assert';
-import * as labels from 'vs/base/common/labels';
-import * as platform from 'vs/base/common/platform';
+import labels = require('vs/base/common/labels');
+import platform = require('vs/base/common/platform');
+import { getBaseLabel } from 'vs/base/common/labels';
 
 suite('Labels', () => {
 	test('shorten - windows', () => {
@@ -150,9 +151,9 @@ suite('Labels', () => {
 			return;
 		}
 
-		assert.equal(labels.getBaseLabel('/some/folder/file.txt'), 'file.txt');
-		assert.equal(labels.getBaseLabel('/some/folder'), 'folder');
-		assert.equal(labels.getBaseLabel('/'), '/');
+		assert.equal(getBaseLabel('/some/folder/file.txt'), 'file.txt');
+		assert.equal(getBaseLabel('/some/folder'), 'folder');
+		assert.equal(getBaseLabel('/'), '/');
 	});
 
 	test('getBaseLabel - windows', () => {
@@ -161,9 +162,9 @@ suite('Labels', () => {
 			return;
 		}
 
-		assert.equal(labels.getBaseLabel('c:'), 'C:');
-		assert.equal(labels.getBaseLabel('c:\\'), 'C:');
-		assert.equal(labels.getBaseLabel('c:\\some\\folder\\file.txt'), 'file.txt');
-		assert.equal(labels.getBaseLabel('c:\\some\\folder'), 'folder');
+		assert.equal(getBaseLabel('c:'), 'C:');
+		assert.equal(getBaseLabel('c:\\'), 'C:');
+		assert.equal(getBaseLabel('c:\\some\\folder\\file.txt'), 'file.txt');
+		assert.equal(getBaseLabel('c:\\some\\folder'), 'folder');
 	});
 });

src/vs/base/test/common/objects.test.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import * as objects from 'vs/base/common/objects';
+import objects = require('vs/base/common/objects');
 
 let check = (one: any, other: any, msg: string) => {
 	assert(objects.equals(one, other), msg);

src/vs/base/test/common/paths.test.ts

@@ -5,8 +5,8 @@
 'use strict';
 
 import * as assert from 'assert';
-import * as paths from 'vs/base/common/paths';
-import * as platform from 'vs/base/common/platform';
+import paths = require('vs/base/common/paths');
+import platform = require('vs/base/common/platform');
 
 suite('Paths', () => {
 

src/vs/base/test/common/strings.test.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import * as strings from 'vs/base/common/strings';
+import strings = require('vs/base/common/strings');
 
 suite('Strings', () => {
 	test('equalsIgnoreCase', function () {

src/vs/base/test/common/types.test.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import * as types from 'vs/base/common/types';
+import types = require('vs/base/common/types');
 
 suite('Types', () => {
 	test('isFunction', () => {

src/vs/base/test/common/uuid.test.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import * as uuid from 'vs/base/common/uuid';
+import uuid = require('vs/base/common/uuid');
 
 suite('UUID', () => {
 	test('generation', () => {

src/vs/base/test/node/config.test.ts

@@ -5,12 +5,12 @@
 
 'use strict';
 
-import * as assert from 'assert';
-import * as os from 'os';
+import assert = require('assert');
+import os = require('os');
 
-import * as path from 'path';
-import * as fs from 'fs';
-import * as uuid from 'vs/base/common/uuid';
+import path = require('path');
+import fs = require('fs');
+import uuid = require('vs/base/common/uuid');
 import { ConfigWatcher } from 'vs/base/node/config';
 import { testFile } from 'vs/base/test/node/utils';
 

src/vs/base/test/node/decoder.test.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import * as decoder from 'vs/base/node/decoder';
+import decoder = require('vs/base/node/decoder');
 
 suite('Decoder', () => {
 

src/vs/base/test/node/encoding/encoding.test.ts

@@ -5,9 +5,10 @@
 
 'use strict';
 
-import * as assert from 'assert';
+import assert = require('assert');
 
-import * as encoding from 'vs/base/node/encoding';
+import encoding = require('vs/base/node/encoding');
+import { encodingExists } from 'vs/base/node/encoding';
 
 suite('Encoding', () => {
 	test('detectBOM UTF-8', () => {
@@ -51,17 +52,17 @@ suite('Encoding', () => {
 	});
 
 	test('resolve terminal encoding (detect)', function () {
-		return encoding.resolveTerminalEncoding().then(enc => {
-			assert.ok(encoding.encodingExists(enc));
+		return encoding.resolveTerminalEncoding().then(encoding => {
+			assert.ok(encodingExists(encoding));
 		});
 	});
 
 	test('resolve terminal encoding (environment)', function () {
 		process.env['VSCODE_CLI_ENCODING'] = 'utf16le';
 
-		return encoding.resolveTerminalEncoding().then(enc => {
-			assert.ok(encoding.encodingExists(enc));
-			assert.equal(enc, 'utf16le');
+		return encoding.resolveTerminalEncoding().then(encoding => {
+			assert.ok(encodingExists(encoding));
+			assert.equal(encoding, 'utf16le');
 		});
 	});
 });

src/vs/base/test/node/extfs/extfs.test.ts

@@ -5,15 +5,15 @@
 
 'use strict';
 
-import * as assert from 'assert';
-import * as os from 'os';
+import assert = require('assert');
+import os = require('os');
 
-import * as path from 'path';
-import * as fs from 'fs';
+import path = require('path');
+import fs = require('fs');
 
-import * as uuid from 'vs/base/common/uuid';
-import * as strings from 'vs/base/common/strings';
-import * as extfs from 'vs/base/node/extfs';
+import uuid = require('vs/base/common/uuid');
+import strings = require('vs/base/common/strings');
+import extfs = require('vs/base/node/extfs');
 import { Readable } from 'stream';
 import { isLinux, isWindows } from 'vs/base/common/platform';
 

src/vs/base/test/node/flow.test.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import * as flow from 'vs/base/node/flow';
+import flow = require('vs/base/node/flow');
 
 const loop = flow.loop;
 const sequence = flow.sequence;

src/vs/base/test/node/glob.test.ts

@@ -6,7 +6,7 @@
 
 import * as assert from 'assert';
 import * as path from 'path';
-import * as glob from 'vs/base/common/glob';
+import glob = require('vs/base/common/glob');
 import { isWindows } from 'vs/base/common/platform';
 
 suite('Glob', () => {

src/vs/base/test/node/mime/mime.test.ts

@@ -5,10 +5,10 @@
 
 'use strict';
 
-import * as assert from 'assert';
+import assert = require('assert');
 
-import * as mimeCommon from 'vs/base/common/mime';
-import * as mime from 'vs/base/node/mime';
+import mimeCommon = require('vs/base/common/mime');
+import mime = require('vs/base/node/mime');
 import { readExactlyByFile } from 'vs/base/node/stream';
 
 suite('Mime', () => {

src/vs/base/test/node/pfs.test.ts

@@ -6,13 +6,13 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 
-import * as assert from 'assert';
-import * as os from 'os';
+import assert = require('assert');
+import os = require('os');
 
-import * as path from 'path';
-import * as fs from 'fs';
+import path = require('path');
+import fs = require('fs');
 
-import * as uuid from 'vs/base/common/uuid';
+import uuid = require('vs/base/common/uuid');
 import * as pfs from 'vs/base/node/pfs';
 import { timeout } from 'vs/base/common/async';
 

src/vs/base/test/node/port.test.ts

@@ -7,7 +7,7 @@
 
 import * as assert from 'assert';
 import * as net from 'net';
-import * as ports from 'vs/base/node/ports';
+import ports = require('vs/base/node/ports');
 
 suite('Ports', () => {
 	test('Finds a free port (no timeout)', function (done) {

src/vs/base/test/node/processes/fixtures/fork.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import * as processes from 'vs/base/node/processes';
+import processes = require('vs/base/node/processes');
 
 const sender = processes.createQueuedSender(process);
 

src/vs/base/test/node/processes/fixtures/fork_large.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import * as processes from 'vs/base/node/processes';
+import processes = require('vs/base/node/processes');
 
 const sender = processes.createQueuedSender(process);
 

src/vs/base/test/node/processes/processes.test.ts

@@ -10,7 +10,7 @@ import * as cp from 'child_process';
 import * as objects from 'vs/base/common/objects';
 import * as platform from 'vs/base/common/platform';
 import URI from 'vs/base/common/uri';
-import * as processes from 'vs/base/node/processes';
+import processes = require('vs/base/node/processes');
 
 function fork(id: string): cp.ChildProcess {
 	const opts: any = {

src/vs/base/test/node/stream/stream.test.ts

@@ -5,9 +5,9 @@
 
 'use strict';
 
-import * as assert from 'assert';
+import assert = require('assert');
 
-import * as stream from 'vs/base/node/stream';
+import stream = require('vs/base/node/stream');
 
 suite('Stream', () => {
 	test('readExactlyByFile - ANSI', function () {

src/vs/code/electron-main/window.ts

@@ -7,7 +7,7 @@
 
 import * as path from 'path';
 import * as objects from 'vs/base/common/objects';
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import URI from 'vs/base/common/uri';
 import { IStateService } from 'vs/platform/state/common/state';
 import { shell, screen, BrowserWindow, systemPreferences, app, TouchBar, nativeImage } from 'electron';

src/vs/code/test/node/argv.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as assert from 'assert';
+import assert = require('assert');
 import { formatOptions } from 'vs/platform/environment/node/argv';
 
 suite('formatOptions', () => {

src/vs/code/test/node/windowsFinder.test.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as assert from 'assert';
-import * as path from 'path';
+import assert = require('assert');
+import path = require('path');
 import { findBestWindowOrFolderForFile, ISimpleWindow, IBestWindowOrFolderOptions } from 'vs/code/node/windowsFinder';
 import { OpenContext } from 'vs/platform/windows/common/windows';
 import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';

src/vs/editor/common/services/modelServiceImpl.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import * as network from 'vs/base/common/network';
+import network = require('vs/base/common/network');
 import { Event, Emitter } from 'vs/base/common/event';
 import { MarkdownString } from 'vs/base/common/htmlContent';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';

src/vs/editor/common/view/editorColorRegistry.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import { registerColor, editorBackground, activeContrastBorder, editorForeground } from 'vs/platform/theme/common/colorRegistry';
 import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { Color, RGBA } from 'vs/base/common/color';

src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts

@@ -6,11 +6,11 @@
 'use strict';
 
 import 'vs/css!./parameterHints';
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as dom from 'vs/base/browser/dom';
-import * as aria from 'vs/base/browser/ui/aria/aria';
+import aria = require('vs/base/browser/ui/aria/aria');
 import { SignatureHelp, SignatureInformation, SignatureHelpProviderRegistry } from 'vs/editor/common/modes';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
 import { RunOnceScheduler } from 'vs/base/common/async';

src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 
 import { sequence, asWinJsPromise } from 'vs/base/common/async';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';

src/vs/platform/backup/test/electron-main/backupMainService.test.ts

@@ -7,10 +7,10 @@
 
 import * as assert from 'assert';
 import * as platform from 'vs/base/common/platform';
-import * as fs from 'fs';
-import * as os from 'os';
-import * as path from 'path';
-import * as pfs from 'vs/base/node/pfs';
+import fs = require('fs');
+import os = require('os');
+import path = require('path');
+import pfs = require('vs/base/node/pfs');
 import Uri from 'vs/base/common/uri';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { parseArgs } from 'vs/platform/environment/node/argv';

src/vs/platform/configuration/common/configurationRegistry.ts

@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import { Event, Emitter } from 'vs/base/common/event';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { Registry } from 'vs/platform/registry/common/platform';
-import * as types from 'vs/base/common/types';
+import types = require('vs/base/common/types');
 import * as strings from 'vs/base/common/strings';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { deepClone } from 'vs/base/common/objects';

src/vs/platform/configuration/test/node/configurationService.test.ts

@@ -5,17 +5,17 @@
 
 'use strict';
 
-import * as assert from 'assert';
-import * as os from 'os';
-import * as path from 'path';
-import * as fs from 'fs';
+import assert = require('assert');
+import os = require('os');
+import path = require('path');
+import fs = require('fs');
 
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ConfigurationService } from 'vs/platform/configuration/node/configurationService';
 import { ParsedArgs } from 'vs/platform/environment/common/environment';
 import { parseArgs } from 'vs/platform/environment/node/argv';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
-import * as uuid from 'vs/base/common/uuid';
+import uuid = require('vs/base/common/uuid');
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { testFile } from 'vs/base/test/node/utils';
 

src/vs/platform/extensionManagement/node/extensionManagementService.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import * as path from 'path';
 import * as pfs from 'vs/base/node/pfs';
 import * as errors from 'vs/base/common/errors';

src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts

@@ -7,7 +7,7 @@
 
 import * as assert from 'assert';
 import * as os from 'os';
-import * as extfs from 'vs/base/node/extfs';
+import extfs = require('vs/base/node/extfs');
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { parseArgs } from 'vs/platform/environment/node/argv';
 import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices';

src/vs/platform/files/common/files.ts

@@ -5,9 +5,9 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as paths from 'vs/base/common/paths';
+import paths = require('vs/base/common/paths');
 import URI from 'vs/base/common/uri';
-import * as glob from 'vs/base/common/glob';
+import glob = require('vs/base/common/glob');
 import { isLinux } from 'vs/base/common/platform';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Event } from 'vs/base/common/event';

src/vs/platform/instantiation/test/common/instantiationService.test.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 
-import * as assert from 'assert';
+import assert = require('assert');
 import { createDecorator, optional, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';

src/vs/platform/markers/test/common/markerService.test.ts

@@ -5,9 +5,9 @@
 'use strict';
 
 
-import * as assert from 'assert';
+import assert = require('assert');
 import URI from 'vs/base/common/uri';
-import * as markerService from 'vs/platform/markers/common/markerService';
+import markerService = require('vs/platform/markers/common/markerService');
 import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
 
 function randomMarkerData(severity = MarkerSeverity.Error): IMarkerData {

src/vs/platform/registry/common/platform.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as Types from 'vs/base/common/types';
-import * as Assert from 'vs/base/common/assert';
+import Types = require('vs/base/common/types');
+import Assert = require('vs/base/common/assert');
 
 export interface IRegistry {
 

src/vs/platform/registry/test/common/platform.test.ts

@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as assert from 'assert';
-import * as Platform from 'vs/platform/registry/common/platform';
-import * as Types from 'vs/base/common/types';
+import assert = require('assert');
+import Platform = require('vs/platform/registry/common/platform');
+import Types = require('vs/base/common/types');
 
 suite('Platform / Registry', () => {
 

src/vs/platform/state/test/node/state.test.ts

@@ -6,10 +6,11 @@
 'use strict';
 
 import * as assert from 'assert';
-import * as os from 'os';
-import * as path from 'path';
-import * as extfs from 'vs/base/node/extfs';
+import os = require('os');
+import path = require('path');
+import extfs = require('vs/base/node/extfs');
 import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices';
+import { writeFileAndFlushSync, mkdirp } from 'vs/base/node/extfs';
 import { FileStorage } from 'vs/platform/state/node/stateService';
 
 suite('StateService', () => {
@@ -21,8 +22,8 @@ suite('StateService', () => {
 	});
 
 	test('Basics', () => {
-		return extfs.mkdirp(parentDir).then(() => {
-			extfs.writeFileAndFlushSync(storageFile, '');
+		return mkdirp(parentDir).then(() => {
+			writeFileAndFlushSync(storageFile, '');
 
 			let service = new FileStorage(storageFile, () => null);
 

src/vs/platform/storage/common/storageService.ts

@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as types from 'vs/base/common/types';
-import * as errors from 'vs/base/common/errors';
-import * as strings from 'vs/base/common/strings';
+import types = require('vs/base/common/types');
+import errors = require('vs/base/common/errors');
+import strings = require('vs/base/common/strings');
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import * as perf from 'vs/base/common/performance';
 

src/vs/platform/telemetry/browser/errorTelemetry.ts

@@ -9,7 +9,7 @@ import { binarySearch } from 'vs/base/common/arrays';
 import { globals } from 'vs/base/common/platform';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IDisposable, toDisposable, dispose } from 'vs/base/common/lifecycle';
-import * as Errors from 'vs/base/common/errors';
+import Errors = require('vs/base/common/errors');
 import { safeStringify } from 'vs/base/common/objects';
 
 interface ErrorEvent {

src/vs/platform/telemetry/common/telemetryUtils.ts

@@ -7,7 +7,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { guessMimeTypes } from 'vs/base/common/mime';
-import * as paths from 'vs/base/common/paths';
+import paths = require('vs/base/common/paths');
 import URI from 'vs/base/common/uri';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IKeybindingService, KeybindingSource } from 'vs/platform/keybinding/common/keybinding';

src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts

@@ -10,7 +10,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
 import ErrorTelemetry from 'vs/platform/telemetry/browser/errorTelemetry';
 import { NullAppender, ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils';
-import * as Errors from 'vs/base/common/errors';
+import Errors = require('vs/base/common/errors');
 import * as sinon from 'sinon';
 import { getConfigurationValue } from 'vs/platform/configuration/common/configuration';
 

src/vs/platform/theme/common/colorRegistry.ts

@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as platform from 'vs/platform/registry/common/platform';
+import platform = require('vs/platform/registry/common/platform');
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { Color, RGBA } from 'vs/base/common/color';
 import { ITheme } from 'vs/platform/theme/common/themeService';
 
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 
 //  ------ API types
 

src/vs/platform/theme/common/themeService.ts

@@ -7,7 +7,7 @@
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Color } from 'vs/base/common/color';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import * as platform from 'vs/platform/registry/common/platform';
+import platform = require('vs/platform/registry/common/platform');
 import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
 import { Event, Emitter } from 'vs/base/common/event';
 

src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts

@@ -6,11 +6,11 @@
 'use strict';
 
 import * as assert from 'assert';
-import * as fs from 'fs';
-import * as os from 'os';
-import * as path from 'path';
-import * as extfs from 'vs/base/node/extfs';
-import * as pfs from 'vs/base/node/pfs';
+import fs = require('fs');
+import os = require('os');
+import path = require('path');
+import extfs = require('vs/base/node/extfs');
+import pfs = require('vs/base/node/pfs');
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { parseArgs } from 'vs/platform/environment/node/argv';
 import { WorkspacesMainService, IStoredWorkspace } from 'vs/platform/workspaces/electron-main/workspacesMainService';

src/vs/workbench/api/electron-browser/mainThreadMessageService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import Severity from 'vs/base/common/severity';
 import { Action, IAction } from 'vs/base/common/actions';
 import { MainThreadMessageServiceShape, MainContext, IExtHostContext, MainThreadMessageOptions } from '../node/extHost.protocol';
@@ -14,6 +14,7 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { once } from 'vs/base/common/event';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import { localize } from 'vs/nls';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 @extHostNamedCustomer(MainContext.MainThreadMessageService)
@@ -70,11 +71,11 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 
 			let source: string;
 			if (extension) {
-				source = nls.localize('extensionSource', "{0} (Extension)", extension.displayName || extension.name);
+				source = localize('extensionSource', "{0} (Extension)", extension.displayName || extension.name);
 			}
 
 			if (!source) {
-				source = nls.localize('defaultSource', "Extension");
+				source = localize('defaultSource', "Extension");
 			}
 
 			const secondaryActions: IAction[] = [];

src/vs/workbench/api/node/extHostMessageService.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import Severity from 'vs/base/common/severity';
-import * as vscode from 'vscode';
+import vscode = require('vscode');
 import { MainContext, MainThreadMessageServiceShape, MainThreadMessageOptions, IMainContext } from './extHost.protocol';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 

src/vs/workbench/api/node/extHostTerminalService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as vscode from 'vscode';
+import vscode = require('vscode');
 import { Event, Emitter } from 'vs/base/common/event';
 import { ExtHostTerminalServiceShape, MainContext, MainThreadTerminalServiceShape, IMainContext } from './extHost.protocol';
 

src/vs/workbench/browser/actions.ts

@@ -6,7 +6,7 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Registry } from 'vs/platform/registry/common/platform';
-import * as types from 'vs/base/common/types';
+import types = require('vs/base/common/types');
 import { Action, IAction } from 'vs/base/common/actions';
 import { BaseActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ITree, IActionProvider } from 'vs/base/parts/tree/browser/tree';

src/vs/workbench/browser/actions/toggleActivityBarVisibility.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Action } from 'vs/base/common/actions';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';

src/vs/workbench/browser/actions/toggleCenteredLayout.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import { Action } from 'vs/base/common/actions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';

src/vs/workbench/browser/actions/toggleEditorLayout.ts

@@ -6,7 +6,7 @@
 
 import 'vs/css!./media/actions';
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Action } from 'vs/base/common/actions';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';

src/vs/workbench/browser/actions/toggleSidebarPosition.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as nls from 'vs/nls';
+import nls = require('vs/nls');
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Action } from 'vs/base/common/actions';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';