diff --git a/src/vs/base/browser/builder.ts b/src/vs/base/browser/builder.ts index 83cbd65af57..b87a92dfb9e 100644 --- a/src/vs/base/browser/builder.ts +++ b/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: diff --git a/src/vs/base/browser/touch.ts b/src/vs/base/browser/touch.ts index 5620c65ccb6..a9478ba3025 100644 --- a/src/vs/base/browser/touch.ts +++ b/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 { diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts index cda6b71cc41..80cd302aa74 100644 --- a/src/vs/base/browser/ui/actionbar/actionbar.ts +++ b/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'; diff --git a/src/vs/base/browser/ui/aria/aria.ts b/src/vs/base/browser/ui/aria/aria.ts index 9d59cecfdce..40b28f69b44 100644 --- a/src/vs/base/browser/ui/aria/aria.ts +++ b/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'; diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts index b3f1bce162d..f70c096d0bf 100644 --- a/src/vs/base/browser/ui/button/button.ts +++ b/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'; diff --git a/src/vs/base/browser/ui/checkbox/checkbox.ts b/src/vs/base/browser/ui/checkbox/checkbox.ts index 8725ab207d0..6ae948d2402 100644 --- a/src/vs/base/browser/ui/checkbox/checkbox.ts +++ b/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'; diff --git a/src/vs/base/browser/ui/contextview/contextview.ts b/src/vs/base/browser/ui/contextview/contextview.ts index 78ddfdb7361..03e10dd9ebd 100644 --- a/src/vs/base/browser/ui/contextview/contextview.ts +++ b/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 { diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts index 5fa3acf907c..764e32a0c84 100644 --- a/src/vs/base/browser/ui/iconLabel/iconLabel.ts +++ b/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'; diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts index 793fee96a71..8bd9fb56f46 100644 --- a/src/vs/base/browser/ui/inputbox/inputBox.ts +++ b/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'; diff --git a/src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts b/src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts index 632743659d0..181885fc256 100644 --- a/src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts +++ b/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 { diff --git a/src/vs/base/browser/ui/progressbar/progressbar.ts b/src/vs/base/browser/ui/progressbar/progressbar.ts index 7a08ea37265..2814a5c5c63 100644 --- a/src/vs/base/browser/ui/progressbar/progressbar.ts +++ b/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'; diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts index a20fac5fd15..7e9bb90e95d 100644 --- a/src/vs/base/browser/ui/sash/sash.ts +++ b/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'; diff --git a/src/vs/base/browser/ui/splitview/splitview.ts b/src/vs/base/browser/ui/splitview/splitview.ts index 7971784ad65..d53bf084896 100644 --- a/src/vs/base/browser/ui/splitview/splitview.ts +++ b/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'; diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts index db1c64ffd53..b195b4d11f3 100644 --- a/src/vs/base/browser/ui/toolbar/toolbar.ts +++ b/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'; diff --git a/src/vs/base/common/errorMessage.ts b/src/vs/base/common/errorMessage.ts index 7d2f7b4210d..3e0faf812d8 100644 --- a/src/vs/base/common/errorMessage.ts +++ b/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) { diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts index 9c7dc2dc68d..d5bec85ebaf 100644 --- a/src/vs/base/common/filters.ts +++ b/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'; diff --git a/src/vs/base/common/glob.ts b/src/vs/base/common/glob.ts index cd8d81b84f3..451a01bb666 100644 --- a/src/vs/base/common/glob.ts +++ b/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'; diff --git a/src/vs/base/common/jsonFormatter.ts b/src/vs/base/common/jsonFormatter.ts index 24ca1a49adc..f41a0d71216 100644 --- a/src/vs/base/common/jsonFormatter.ts +++ b/src/vs/base/common/jsonFormatter.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as Json from './json'; +import Json = require('./json'); export interface FormattingOptions { /** diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts index ce7439790af..60b7381d5a6 100644 --- a/src/vs/base/common/labels.ts +++ b/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'; diff --git a/src/vs/base/common/mime.ts b/src/vs/base/common/mime.ts index b8075dc6001..467e8322249 100644 --- a/src/vs/base/common/mime.ts +++ b/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'; diff --git a/src/vs/base/common/severity.ts b/src/vs/base/common/severity.ts index fd6980d689e..02e8d6471a3 100644 --- a/src/vs/base/common/severity.ts +++ b/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, diff --git a/src/vs/base/node/decoder.ts b/src/vs/base/node/decoder.ts index de145fc29b2..112c6cdf6cb 100644 --- a/src/vs/base/node/decoder.ts +++ b/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'; /** diff --git a/src/vs/base/node/encoding.ts b/src/vs/base/node/encoding.ts index a84cec1f952..12018bf0138 100644 --- a/src/vs/base/node/encoding.ts +++ b/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'; diff --git a/src/vs/base/node/flow.ts b/src/vs/base/node/flow.ts index 24fd79a900a..4e8d4c5245a 100644 --- a/src/vs/base/node/flow.ts +++ b/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 diff --git a/src/vs/base/node/mime.ts b/src/vs/base/node/mime.ts index 1e38a4e02f3..1b915e78117 100644 --- a/src/vs/base/node/mime.ts +++ b/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". diff --git a/src/vs/base/node/ports.ts b/src/vs/base/node/ports.ts index 49f2f47b155..bcc8064e12d 100644 --- a/src/vs/base/node/ports.ts +++ b/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. diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts index 8c351239652..32ee843b5ae 100644 --- a/src/vs/base/node/processes.ts +++ b/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'; diff --git a/src/vs/base/node/request.ts b/src/vs/base/node/request.ts index b3d3a11f3e3..49c9cd6998f 100644 --- a/src/vs/base/node/request.ts +++ b/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'; diff --git a/src/vs/base/node/stdFork.ts b/src/vs/base/node/stdFork.ts index aaade12a2fc..1bdcd138309 100644 --- a/src/vs/base/node/stdFork.ts +++ b/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 { diff --git a/src/vs/base/node/stream.ts b/src/vs/base/node/stream.ts index a9ba27bb005..94c9b297162 100644 --- a/src/vs/base/node/stream.ts +++ b/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'; diff --git a/src/vs/base/node/zip.ts b/src/vs/base/node/zip.ts index 9ffea7f4620..61d88800b89 100644 --- a/src/vs/base/node/zip.ts +++ b/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'; diff --git a/src/vs/base/parts/quickopen/browser/quickOpenModel.ts b/src/vs/base/parts/quickopen/browser/quickOpenModel.ts index db04c0b00dd..59262f0adb8 100644 --- a/src/vs/base/parts/quickopen/browser/quickOpenModel.ts +++ b/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'; diff --git a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts index 2c7e62ed4e9..85f3df9b800 100644 --- a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts +++ b/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'; diff --git a/src/vs/base/parts/tree/browser/tree.ts b/src/vs/base/parts/tree/browser/tree.ts index 870524c1616..1c7947a3c92 100644 --- a/src/vs/base/parts/tree/browser/tree.ts +++ b/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'; diff --git a/src/vs/base/parts/tree/browser/treeDefaults.ts b/src/vs/base/parts/tree/browser/treeDefaults.ts index a8a1469c9a9..6e9aaf44b6c 100644 --- a/src/vs/base/parts/tree/browser/treeDefaults.ts +++ b/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 { diff --git a/src/vs/base/parts/tree/browser/treeDnd.ts b/src/vs/base/parts/tree/browser/treeDnd.ts index 768a47c6a44..a13cf53a55c 100644 --- a/src/vs/base/parts/tree/browser/treeDnd.ts +++ b/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 { diff --git a/src/vs/base/parts/tree/browser/treeImpl.ts b/src/vs/base/parts/tree/browser/treeImpl.ts index 42df25ee308..365983aba43 100644 --- a/src/vs/base/parts/tree/browser/treeImpl.ts +++ b/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(); - readonly onDidExpandItem: Event = this._onDidExpandItem.event; - private _onDidCollapseItem = new Relay(); - readonly onDidCollapseItem: Event = this._onDidCollapseItem.event; + private _onDidChangeFocus = new Relay(); + readonly onDidChangeFocus: Event = this._onDidChangeFocus.event; + private _onDidChangeSelection = new Relay(); + readonly onDidChangeSelection: Event = this._onDidChangeSelection.event; + private _onHighlightChange = new Relay(); + readonly onDidChangeHighlight: Event = this._onHighlightChange.event; + private _onDidExpandItem = new Relay(); + readonly onDidExpandItem: Event = this._onDidExpandItem.event; + private _onDidCollapseItem = new Relay(); + readonly onDidCollapseItem: Event = this._onDidCollapseItem.event; private _onDispose = new Emitter(); readonly onDidDispose: Event = this._onDispose.event; diff --git a/src/vs/base/parts/tree/browser/treeModel.ts b/src/vs/base/parts/tree/browser/treeModel.ts index 7e7fbe18c49..017d44533e7 100644 --- a/src/vs/base/parts/tree/browser/treeModel.ts +++ b/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 { [id: string]: T; } diff --git a/src/vs/base/parts/tree/browser/treeView.ts b/src/vs/base/parts/tree/browser/treeView.ts index 024564b7faa..8fc720d11dc 100644 --- a/src/vs/base/parts/tree/browser/treeView.ts +++ b/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(event); element = this.model.getFocus(); - var position: DOM.IDomNodePagePosition; + var position: IDomNodePagePosition; if (!element) { element = this.model.getInput(); diff --git a/src/vs/base/parts/tree/test/browser/treeModel.test.ts b/src/vs/base/parts/tree/test/browser/treeModel.test.ts index 449830f5786..6fe48c6cbad 100644 --- a/src/vs/base/parts/tree/test/browser/treeModel.test.ts +++ b/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 { diff --git a/src/vs/base/parts/tree/test/browser/treeViewModel.test.ts b/src/vs/base/parts/tree/test/browser/treeViewModel.test.ts index 10140d5e2c0..9bc0a347dcf 100644 --- a/src/vs/base/parts/tree/test/browser/treeViewModel.test.ts +++ b/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'; diff --git a/src/vs/base/test/browser/ui/list/rangeMap.test.ts b/src/vs/base/test/browser/ui/list/rangeMap.test.ts index 770dab011da..4968d59bac9 100644 --- a/src/vs/base/test/browser/ui/list/rangeMap.test.ts +++ b/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', () => { diff --git a/src/vs/base/test/common/arrays.test.ts b/src/vs/base/test/common/arrays.test.ts index e05fed736e1..d9c2935ac4b 100644 --- a/src/vs/base/test/common/arrays.test.ts +++ b/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); }); }); diff --git a/src/vs/base/test/common/async.test.ts b/src/vs/base/test/common/async.test.ts index c7b0f56a989..cb52335ed36 100644 --- a/src/vs/base/test/common/async.test.ts +++ b/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', () => { diff --git a/src/vs/base/test/common/collections.test.ts b/src/vs/base/test/common/collections.test.ts index 673bbae83fd..bddabee8303 100644 --- a/src/vs/base/test/common/collections.test.ts +++ b/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', () => { diff --git a/src/vs/base/test/common/event.test.ts b/src/vs/base/test/common/event.test.ts index 748b6ea5138..18a8f152864 100644 --- a/src/vs/base/test/common/event.test.ts +++ b/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 { diff --git a/src/vs/base/test/common/jsonEdit.test.ts b/src/vs/base/test/common/jsonEdit.test.ts index 45b9ceb08f0..ef996642448 100644 --- a/src/vs/base/test/common/jsonEdit.test.ts +++ b/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', () => { diff --git a/src/vs/base/test/common/jsonFormatter.test.ts b/src/vs/base/test/common/jsonFormatter.test.ts index 210660e4aeb..df717bf58c8 100644 --- a/src/vs/base/test/common/jsonFormatter.test.ts +++ b/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', () => { diff --git a/src/vs/base/test/common/labels.test.ts b/src/vs/base/test/common/labels.test.ts index bb1f68357d0..a2b4adfec35 100644 --- a/src/vs/base/test/common/labels.test.ts +++ b/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'); }); }); \ No newline at end of file diff --git a/src/vs/base/test/common/objects.test.ts b/src/vs/base/test/common/objects.test.ts index e4e346167b2..5a05e1f5be4 100644 --- a/src/vs/base/test/common/objects.test.ts +++ b/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); diff --git a/src/vs/base/test/common/paths.test.ts b/src/vs/base/test/common/paths.test.ts index 6001c5b00ba..4ed6d54b5f9 100644 --- a/src/vs/base/test/common/paths.test.ts +++ b/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', () => { diff --git a/src/vs/base/test/common/strings.test.ts b/src/vs/base/test/common/strings.test.ts index 4db726aae72..770cccff2f0 100644 --- a/src/vs/base/test/common/strings.test.ts +++ b/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 () { diff --git a/src/vs/base/test/common/types.test.ts b/src/vs/base/test/common/types.test.ts index a4d750c99e9..205c0b088c7 100644 --- a/src/vs/base/test/common/types.test.ts +++ b/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', () => { diff --git a/src/vs/base/test/common/uuid.test.ts b/src/vs/base/test/common/uuid.test.ts index 435e47839f9..eaa4ed3dbf0 100644 --- a/src/vs/base/test/common/uuid.test.ts +++ b/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', () => { diff --git a/src/vs/base/test/node/config.test.ts b/src/vs/base/test/node/config.test.ts index 8a0002bc406..9b9678330a9 100644 --- a/src/vs/base/test/node/config.test.ts +++ b/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'; diff --git a/src/vs/base/test/node/decoder.test.ts b/src/vs/base/test/node/decoder.test.ts index b8a0a04dd78..0e4fb68d16c 100644 --- a/src/vs/base/test/node/decoder.test.ts +++ b/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', () => { diff --git a/src/vs/base/test/node/encoding/encoding.test.ts b/src/vs/base/test/node/encoding/encoding.test.ts index d5fc48bf381..66af6ae8212 100644 --- a/src/vs/base/test/node/encoding/encoding.test.ts +++ b/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'); }); }); }); diff --git a/src/vs/base/test/node/extfs/extfs.test.ts b/src/vs/base/test/node/extfs/extfs.test.ts index 5df24aa3f3a..2872a9aecf2 100644 --- a/src/vs/base/test/node/extfs/extfs.test.ts +++ b/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'; diff --git a/src/vs/base/test/node/flow.test.ts b/src/vs/base/test/node/flow.test.ts index c421bc56b45..f1edf9c98de 100644 --- a/src/vs/base/test/node/flow.test.ts +++ b/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; diff --git a/src/vs/base/test/node/glob.test.ts b/src/vs/base/test/node/glob.test.ts index 6538ee24941..df770c9c862 100644 --- a/src/vs/base/test/node/glob.test.ts +++ b/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', () => { diff --git a/src/vs/base/test/node/mime/mime.test.ts b/src/vs/base/test/node/mime/mime.test.ts index f99d59fb012..ecf8f4d92a7 100644 --- a/src/vs/base/test/node/mime/mime.test.ts +++ b/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', () => { diff --git a/src/vs/base/test/node/pfs.test.ts b/src/vs/base/test/node/pfs.test.ts index a01770f5f36..c4e3a088af5 100644 --- a/src/vs/base/test/node/pfs.test.ts +++ b/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'; diff --git a/src/vs/base/test/node/port.test.ts b/src/vs/base/test/node/port.test.ts index c5be291c34e..16e7cdf949a 100644 --- a/src/vs/base/test/node/port.test.ts +++ b/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) { diff --git a/src/vs/base/test/node/processes/fixtures/fork.ts b/src/vs/base/test/node/processes/fixtures/fork.ts index 10537b1b6cc..f4ac8978d77 100644 --- a/src/vs/base/test/node/processes/fixtures/fork.ts +++ b/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); diff --git a/src/vs/base/test/node/processes/fixtures/fork_large.ts b/src/vs/base/test/node/processes/fixtures/fork_large.ts index e89bc4bb394..77ab54d8c01 100644 --- a/src/vs/base/test/node/processes/fixtures/fork_large.ts +++ b/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); diff --git a/src/vs/base/test/node/processes/processes.test.ts b/src/vs/base/test/node/processes/processes.test.ts index 332bdcdbff7..b2d157ef8d6 100644 --- a/src/vs/base/test/node/processes/processes.test.ts +++ b/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 = { diff --git a/src/vs/base/test/node/stream/stream.test.ts b/src/vs/base/test/node/stream/stream.test.ts index c2c5f1b2f9a..72114ec4684 100644 --- a/src/vs/base/test/node/stream/stream.test.ts +++ b/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 () { diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts index 7ba536117de..3f692a0f8d7 100644 --- a/src/vs/code/electron-main/window.ts +++ b/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'; diff --git a/src/vs/code/test/node/argv.test.ts b/src/vs/code/test/node/argv.test.ts index 2eae7e9e923..c322fc5f96f 100644 --- a/src/vs/code/test/node/argv.test.ts +++ b/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', () => { diff --git a/src/vs/code/test/node/windowsFinder.test.ts b/src/vs/code/test/node/windowsFinder.test.ts index 084d8546224..985f06f0bbc 100644 --- a/src/vs/code/test/node/windowsFinder.test.ts +++ b/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'; diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts index b9ebd872c10..95b944e2c8e 100644 --- a/src/vs/editor/common/services/modelServiceImpl.ts +++ b/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'; diff --git a/src/vs/editor/common/view/editorColorRegistry.ts b/src/vs/editor/common/view/editorColorRegistry.ts index e2e22b04e11..9dede5375a4 100644 --- a/src/vs/editor/common/view/editorColorRegistry.ts +++ b/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'; diff --git a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts index 0724631045a..43340b5719a 100644 --- a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts +++ b/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'; diff --git a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts index 93889953d49..3918a0f64db 100644 --- a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts +++ b/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'; diff --git a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts b/src/vs/platform/backup/test/electron-main/backupMainService.test.ts index ff421ddbdf7..3c9b911a1ca 100644 --- a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts +++ b/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'; diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts index 1db8bcc8ff4..cfa055b5c08 100644 --- a/src/vs/platform/configuration/common/configurationRegistry.ts +++ b/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'; diff --git a/src/vs/platform/configuration/test/node/configurationService.test.ts b/src/vs/platform/configuration/test/node/configurationService.test.ts index 2a03ed6f153..7d16273c1f5 100644 --- a/src/vs/platform/configuration/test/node/configurationService.test.ts +++ b/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'; diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index f5537e156c8..22b93e52cc3 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/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'; diff --git a/src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts b/src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts index e562d9e3cc4..e6d0bc1ad62 100644 --- a/src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts +++ b/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'; diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts index c6b978da5b9..2d28cc258d7 100644 --- a/src/vs/platform/files/common/files.ts +++ b/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'; diff --git a/src/vs/platform/instantiation/test/common/instantiationService.test.ts b/src/vs/platform/instantiation/test/common/instantiationService.test.ts index db042a9cc4f..a3230c93f55 100644 --- a/src/vs/platform/instantiation/test/common/instantiationService.test.ts +++ b/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'; diff --git a/src/vs/platform/markers/test/common/markerService.test.ts b/src/vs/platform/markers/test/common/markerService.test.ts index 06495c239e4..e29b2f52413 100644 --- a/src/vs/platform/markers/test/common/markerService.test.ts +++ b/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 { diff --git a/src/vs/platform/registry/common/platform.ts b/src/vs/platform/registry/common/platform.ts index db2569b9bd3..3b9cfab1e40 100644 --- a/src/vs/platform/registry/common/platform.ts +++ b/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 { diff --git a/src/vs/platform/registry/test/common/platform.test.ts b/src/vs/platform/registry/test/common/platform.test.ts index d3e653af565..c07a25dbaf2 100644 --- a/src/vs/platform/registry/test/common/platform.test.ts +++ b/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', () => { diff --git a/src/vs/platform/state/test/node/state.test.ts b/src/vs/platform/state/test/node/state.test.ts index 2334d7912f7..6e4d1824ec0 100644 --- a/src/vs/platform/state/test/node/state.test.ts +++ b/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); diff --git a/src/vs/platform/storage/common/storageService.ts b/src/vs/platform/storage/common/storageService.ts index a15769237a5..7cf9aa4f4ba 100644 --- a/src/vs/platform/storage/common/storageService.ts +++ b/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'; diff --git a/src/vs/platform/telemetry/browser/errorTelemetry.ts b/src/vs/platform/telemetry/browser/errorTelemetry.ts index abc5a96d207..cdb7dba39a8 100644 --- a/src/vs/platform/telemetry/browser/errorTelemetry.ts +++ b/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 { diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts index 60edb06869e..c911a2beec7 100644 --- a/src/vs/platform/telemetry/common/telemetryUtils.ts +++ b/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'; diff --git a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts index b29b0fff824..b269f49b287 100644 --- a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts +++ b/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'; diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts index 221cfd9c85c..14e74226c78 100644 --- a/src/vs/platform/theme/common/colorRegistry.ts +++ b/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 diff --git a/src/vs/platform/theme/common/themeService.ts b/src/vs/platform/theme/common/themeService.ts index 6c0181bc7d4..db1415b0735 100644 --- a/src/vs/platform/theme/common/themeService.ts +++ b/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'; diff --git a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts b/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts index 210d5253765..7767ece253b 100644 --- a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts +++ b/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'; diff --git a/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts b/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts index 165265c8088..d53c42223b1 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts +++ b/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[] = []; diff --git a/src/vs/workbench/api/node/extHostMessageService.ts b/src/vs/workbench/api/node/extHostMessageService.ts index 2c5f81d54f4..dd9f29177d4 100644 --- a/src/vs/workbench/api/node/extHostMessageService.ts +++ b/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'; diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts index 2a0f3081e2b..5ec15998039 100644 --- a/src/vs/workbench/api/node/extHostTerminalService.ts +++ b/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'; diff --git a/src/vs/workbench/browser/actions.ts b/src/vs/workbench/browser/actions.ts index 8538ba3afdb..e15e84abf60 100644 --- a/src/vs/workbench/browser/actions.ts +++ b/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'; diff --git a/src/vs/workbench/browser/actions/toggleActivityBarVisibility.ts b/src/vs/workbench/browser/actions/toggleActivityBarVisibility.ts index 3018aeda0d8..a201dbe174b 100644 --- a/src/vs/workbench/browser/actions/toggleActivityBarVisibility.ts +++ b/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'; diff --git a/src/vs/workbench/browser/actions/toggleCenteredLayout.ts b/src/vs/workbench/browser/actions/toggleCenteredLayout.ts index 663541555e4..0b3680cd170 100644 --- a/src/vs/workbench/browser/actions/toggleCenteredLayout.ts +++ b/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'; diff --git a/src/vs/workbench/browser/actions/toggleEditorLayout.ts b/src/vs/workbench/browser/actions/toggleEditorLayout.ts index a02f3b68235..ad5306eeaad 100644 --- a/src/vs/workbench/browser/actions/toggleEditorLayout.ts +++ b/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'; diff --git a/src/vs/workbench/browser/actions/toggleSidebarPosition.ts b/src/vs/workbench/browser/actions/toggleSidebarPosition.ts index b0a223a0ab6..d338760c2c3 100644 --- a/src/vs/workbench/browser/actions/toggleSidebarPosition.ts +++ b/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'; diff --git a/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts b/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts index 72afba76346..25c9a4ab019 100644 --- a/src/vs/workbench/browser/actions/toggleSidebarVisibility.ts +++ b/src/vs/workbench/browser/actions/toggleSidebarVisibility.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'; diff --git a/src/vs/workbench/browser/actions/toggleStatusbarVisibility.ts b/src/vs/workbench/browser/actions/toggleStatusbarVisibility.ts index da09591e2d0..1cbd330b34c 100644 --- a/src/vs/workbench/browser/actions/toggleStatusbarVisibility.ts +++ b/src/vs/workbench/browser/actions/toggleStatusbarVisibility.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'; diff --git a/src/vs/workbench/browser/actions/toggleTabsVisibility.ts b/src/vs/workbench/browser/actions/toggleTabsVisibility.ts index 9bf5df9e7a3..e094cff637e 100644 --- a/src/vs/workbench/browser/actions/toggleTabsVisibility.ts +++ b/src/vs/workbench/browser/actions/toggleTabsVisibility.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'; diff --git a/src/vs/workbench/browser/actions/toggleZenMode.ts b/src/vs/workbench/browser/actions/toggleZenMode.ts index 3d58623c10c..3776fb6e5db 100644 --- a/src/vs/workbench/browser/actions/toggleZenMode.ts +++ b/src/vs/workbench/browser/actions/toggleZenMode.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 { KeyCode, KeyMod, KeyChord } from 'vs/base/common/keyCodes'; import { Registry } from 'vs/platform/registry/common/platform'; diff --git a/src/vs/workbench/browser/actions/workspaceActions.ts b/src/vs/workbench/browser/actions/workspaceActions.ts index 3fac4bd4ed4..f41e4ae7c05 100644 --- a/src/vs/workbench/browser/actions/workspaceActions.ts +++ b/src/vs/workbench/browser/actions/workspaceActions.ts @@ -7,7 +7,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows'; import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry'; import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace'; diff --git a/src/vs/workbench/browser/actions/workspaceCommands.ts b/src/vs/workbench/browser/actions/workspaceCommands.ts index d598e0b465c..dab1034cf38 100644 --- a/src/vs/workbench/browser/actions/workspaceCommands.ts +++ b/src/vs/workbench/browser/actions/workspaceCommands.ts @@ -6,7 +6,7 @@ 'use strict'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { IWindowService } from 'vs/platform/windows/common/windows'; import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace'; import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing'; diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts index 0e85d241b4f..fad64be0b91 100644 --- a/src/vs/workbench/browser/composite.ts +++ b/src/vs/workbench/browser/composite.ts @@ -14,7 +14,7 @@ import { IEditorControl } from 'vs/platform/editor/common/editor'; import { Event, Emitter } from 'vs/base/common/event'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IConstructorSignature0, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import * as DOM from 'vs/base/browser/dom'; +import DOM = require('vs/base/browser/dom'); import { IDisposable } from 'vs/base/common/lifecycle'; /** diff --git a/src/vs/workbench/browser/labels.ts b/src/vs/workbench/browser/labels.ts index f9f42654c52..fc729f22485 100644 --- a/src/vs/workbench/browser/labels.ts +++ b/src/vs/workbench/browser/labels.ts @@ -6,7 +6,7 @@ 'use strict'; import uri from 'vs/base/common/uri'; -import * as resources from 'vs/base/common/resources'; +import resources = require('vs/base/common/resources'); import { IconLabel, IIconLabelValueOptions, IIconLabelCreationOptions } from 'vs/base/browser/ui/iconLabel/iconLabel'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; import { IModeService } from 'vs/editor/common/services/modeService'; diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts index 96ec92771ac..9bb1df4387a 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts @@ -6,7 +6,7 @@ 'use strict'; import 'vs/css!./media/activityaction'; -import * as DOM from 'vs/base/browser/dom'; +import DOM = require('vs/base/browser/dom'); import { EventType as TouchEventType, GestureEvent } from 'vs/base/browser/touch'; import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts index 6a68273d4c7..24a49d7d397 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts @@ -6,7 +6,7 @@ 'use strict'; import 'vs/css!./media/activitybarpart'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { TPromise } from 'vs/base/common/winjs.base'; import { illegalArgument } from 'vs/base/common/errors'; import { Builder, $, Dimension } from 'vs/base/browser/builder'; diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts index a209aeada4f..8b738ccedec 100644 --- a/src/vs/workbench/browser/parts/compositePart.ts +++ b/src/vs/workbench/browser/parts/compositePart.ts @@ -6,15 +6,15 @@ 'use strict'; import 'vs/css!./media/compositepart'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { defaultGenerator } from 'vs/base/common/idGenerator'; import { TPromise } from 'vs/base/common/winjs.base'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { Dimension, Builder, $ } from 'vs/base/browser/builder'; -import * as strings from 'vs/base/common/strings'; +import strings = require('vs/base/common/strings'); import { Emitter } from 'vs/base/common/event'; -import * as types from 'vs/base/common/types'; -import * as errors from 'vs/base/common/errors'; +import types = require('vs/base/common/types'); +import errors = require('vs/base/common/errors'); import * as DOM from 'vs/base/browser/dom'; import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar'; diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts index 62f8a5b6e1a..550933a7c3f 100644 --- a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts +++ b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { Action } from 'vs/base/common/actions'; import { illegalArgument } from 'vs/base/common/errors'; import * as dom from 'vs/base/browser/dom'; diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts index 6fb75715ca3..3092f639a4b 100644 --- a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts +++ b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { Action } from 'vs/base/common/actions'; import { TPromise } from 'vs/base/common/winjs.base'; import * as dom from 'vs/base/browser/dom'; diff --git a/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts b/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts index 8383ebf5b42..0062a8f016a 100644 --- a/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts +++ b/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { BINARY_DIFF_EDITOR_ID } from 'vs/workbench/common/editor'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService } from 'vs/platform/theme/common/themeService'; diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts index 28e2795592b..97218e52eed 100644 --- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts +++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { Event, Emitter } from 'vs/base/common/event'; import URI from 'vs/base/common/uri'; import { TPromise } from 'vs/base/common/winjs.base'; diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts index 8b01f38ce81..f23667c9b62 100644 --- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts +++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts @@ -5,7 +5,7 @@ 'use strict'; import { Registry } from 'vs/platform/registry/common/platform'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import URI from 'vs/base/common/uri'; import { Action, IAction } from 'vs/base/common/actions'; import { IEditorQuickOpenEntry, IQuickOpenRegistry, Extensions as QuickOpenExtensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen'; diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts index 3f03c99402a..94ab58c880e 100644 --- a/src/vs/workbench/browser/parts/editor/editorActions.ts +++ b/src/vs/workbench/browser/parts/editor/editorActions.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 { Action } from 'vs/base/common/actions'; import { mixin } from 'vs/base/common/objects'; import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts index 87fea4fca7f..4a1ef4b3822 100644 --- a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts +++ b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts @@ -6,16 +6,16 @@ 'use strict'; import 'vs/css!./media/editorGroupsControl'; -import * as arrays from 'vs/base/common/arrays'; +import arrays = require('vs/base/common/arrays'); import { Event, Emitter } from 'vs/base/common/event'; import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; -import * as types from 'vs/base/common/types'; +import types = require('vs/base/common/types'); import { Dimension, Builder, $ } from 'vs/base/browser/builder'; import { Sash, ISashEvent, IVerticalSashLayoutProvider, IHorizontalSashLayoutProvider, Orientation } from 'vs/base/browser/ui/sash/sash'; import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar'; import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; -import * as DOM from 'vs/base/browser/dom'; -import * as errors from 'vs/base/common/errors'; +import DOM = require('vs/base/browser/dom'); +import errors = require('vs/base/common/errors'); import { RunOnceScheduler } from 'vs/base/common/async'; import { isMacintosh } from 'vs/base/common/platform'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 1f0f0186974..a3db36d2e3b 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -10,11 +10,11 @@ import 'vs/workbench/browser/parts/editor/editor.contribution'; import { TPromise } from 'vs/base/common/winjs.base'; import { Registry } from 'vs/platform/registry/common/platform'; import { Dimension, Builder, $ } from 'vs/base/browser/builder'; -import * as nls from 'vs/nls'; -import * as strings from 'vs/base/common/strings'; -import * as arrays from 'vs/base/common/arrays'; -import * as types from 'vs/base/common/types'; -import * as errors from 'vs/base/common/errors'; +import nls = require('vs/nls'); +import strings = require('vs/base/common/strings'); +import arrays = require('vs/base/common/arrays'); +import types = require('vs/base/common/types'); +import errors = require('vs/base/common/errors'); import * as objects from 'vs/base/common/objects'; import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; import { toErrorMessage } from 'vs/base/common/errorMessage'; @@ -46,7 +46,9 @@ import { join } from 'vs/base/common/paths'; import { IEditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor'; import { ThrottledEmitter } from 'vs/base/common/async'; import { isCodeEditor } from 'vs/editor/browser/editorBrowser'; +import { isUndefinedOrNull } from 'vs/base/common/types'; import { INotificationService, Severity, INotificationActions } from 'vs/platform/notification/common/notification'; +import { isErrorWithActions } from 'vs/base/common/errors'; class ProgressMonitor { @@ -548,7 +550,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService // Report error only if this was not us restoring previous error state if (this.partService.isCreated() && !errors.isPromiseCanceledError(error)) { const actions: INotificationActions = { primary: [] }; - if (errors.isErrorWithActions(error)) { + if (isErrorWithActions(error)) { actions.primary = error.actions; } @@ -700,7 +702,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService } // Then check for array of positions to close - if (Array.isArray(positionsOrEditors) || types.isUndefinedOrNull(positionsOrEditors)) { + if (Array.isArray(positionsOrEditors) || isUndefinedOrNull(positionsOrEditors)) { return this.doCloseAllEditorsAtPositions(positionsOrEditors as Position[]); } diff --git a/src/vs/workbench/browser/parts/editor/editorPicker.ts b/src/vs/workbench/browser/parts/editor/editorPicker.ts index 265325544be..cea42aceaa9 100644 --- a/src/vs/workbench/browser/parts/editor/editorPicker.ts +++ b/src/vs/workbench/browser/parts/editor/editorPicker.ts @@ -6,9 +6,9 @@ import 'vs/css!./media/editorpicker'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import URI from 'vs/base/common/uri'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import { IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel'; import { IAutoFocus, Mode, IEntryRunContext, IQuickNavigateConfiguration, IModel } from 'vs/base/parts/quickopen/common/quickOpen'; import { QuickOpenModel, QuickOpenEntry, QuickOpenEntryGroup, QuickOpenItemAccessor } from 'vs/base/parts/quickopen/browser/quickOpenModel'; diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts index 01ed2d2da59..8686449a3b6 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -6,14 +6,14 @@ 'use strict'; import 'vs/css!./media/editorstatus'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { TPromise } from 'vs/base/common/winjs.base'; import { $, append, runAtThisOrScheduleAtNextAnimationFrame, addDisposableListener, getDomNodePagePosition } from 'vs/base/browser/dom'; -import * as strings from 'vs/base/common/strings'; -import * as paths from 'vs/base/common/paths'; -import * as types from 'vs/base/common/types'; +import strings = require('vs/base/common/strings'); +import paths = require('vs/base/common/paths'); +import types = require('vs/base/common/types'); import uri from 'vs/base/common/uri'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar'; import { Action } from 'vs/base/common/actions'; import { language, LANGUAGE_DEFAULT, AccessibilitySupport } from 'vs/base/common/platform'; diff --git a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts index 6b0144487c7..fa570c9cf6a 100644 --- a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts @@ -6,9 +6,9 @@ 'use strict'; import 'vs/css!./media/notabstitle'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import { toResource } from 'vs/workbench/common/editor'; -import * as DOM from 'vs/base/browser/dom'; +import DOM = require('vs/base/browser/dom'); import { TitleControl } from 'vs/workbench/browser/parts/editor/titleControl'; import { ResourceLabel } from 'vs/workbench/browser/labels'; import { Verbosity } from 'vs/platform/editor/common/editor'; diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts index 1d2ac46a693..8daf9d05d72 100644 --- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts @@ -6,12 +6,12 @@ 'use strict'; import 'vs/css!./media/resourceviewer'; -import * as nls from 'vs/nls'; -import * as mimes from 'vs/base/common/mime'; +import nls = require('vs/nls'); +import mimes = require('vs/base/common/mime'); import URI from 'vs/base/common/uri'; -import * as paths from 'vs/base/common/paths'; +import paths = require('vs/base/common/paths'); import { Builder, $, Dimension } from 'vs/base/browser/builder'; -import * as DOM from 'vs/base/browser/dom'; +import DOM = require('vs/base/browser/dom'); import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; import { LRUCache } from 'vs/base/common/map'; import { Schemas } from 'vs/base/common/network'; diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index ece29d8aec6..696d593bbf1 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -6,10 +6,10 @@ 'use strict'; import 'vs/css!./media/tabstitle'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { TPromise } from 'vs/base/common/winjs.base'; -import * as errors from 'vs/base/common/errors'; -import * as DOM from 'vs/base/browser/dom'; +import errors = require('vs/base/common/errors'); +import DOM = require('vs/base/browser/dom'); import { isMacintosh } from 'vs/base/common/platform'; import { shorten } from 'vs/base/common/labels'; import { ActionRunner, IAction } from 'vs/base/common/actions'; @@ -39,6 +39,7 @@ import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } import { TAB_INACTIVE_BACKGROUND, TAB_ACTIVE_BACKGROUND, TAB_ACTIVE_FOREGROUND, TAB_INACTIVE_FOREGROUND, TAB_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND, TAB_UNFOCUSED_INACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_BORDER, TAB_ACTIVE_BORDER, TAB_HOVER_BACKGROUND, TAB_HOVER_BORDER, TAB_UNFOCUSED_HOVER_BACKGROUND, TAB_UNFOCUSED_HOVER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_GROUP_BACKGROUND, WORKBENCH_BACKGROUND } from 'vs/workbench/common/theme'; import { activeContrastBorder, contrastBorder, editorBackground } from 'vs/platform/theme/common/colorRegistry'; import { Dimension } from 'vs/base/browser/builder'; +import { scheduleAtNextAnimationFrame } from 'vs/base/browser/dom'; import { ResourcesDropHandler, fillResourceDataTransfers, LocalSelectionTransfer, DraggedEditorIdentifier } from 'vs/workbench/browser/dnd'; import { Color } from 'vs/base/common/color'; import { INotificationService } from 'vs/platform/notification/common/notification'; @@ -566,7 +567,7 @@ export class TabsTitleControl extends TitleControl { // that can result in the browser doing a full page layout to validate them. To buffer // this a little bit we try at least to schedule this work on the next animation frame. if (!this.layoutScheduled) { - this.layoutScheduled = DOM.scheduleAtNextAnimationFrame(() => { + this.layoutScheduled = scheduleAtNextAnimationFrame(() => { this.doLayout(this.dimension); this.layoutScheduled = void 0; }); @@ -758,7 +759,7 @@ export class TabsTitleControl extends TitleControl { // Fixes https://github.com/Microsoft/vscode/issues/18733 DOM.addClass(tab, 'dragged'); - DOM.scheduleAtNextAnimationFrame(() => DOM.removeClass(tab, 'dragged')); + scheduleAtNextAnimationFrame(() => DOM.removeClass(tab, 'dragged')); })); // We need to keep track of DRAG_ENTER and DRAG_LEAVE events because a tab is not just a div without children, diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts index d82743f7c8e..7fba798b626 100644 --- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts @@ -7,12 +7,12 @@ import 'vs/css!./media/textdiffeditor'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; -import * as objects from 'vs/base/common/objects'; +import nls = require('vs/nls'); +import objects = require('vs/base/common/objects'); import { Builder } from 'vs/base/browser/builder'; import { Action, IAction } from 'vs/base/common/actions'; import { onUnexpectedError } from 'vs/base/common/errors'; -import * as types from 'vs/base/common/types'; +import types = require('vs/base/common/types'); import { IDiffEditor } from 'vs/editor/browser/editorBrowser'; import { IDiffEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions'; import { BaseTextEditor, IEditorConfiguration } from 'vs/workbench/browser/parts/editor/textEditor'; diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts index e1fb9987eb2..13827bc1503 100644 --- a/src/vs/workbench/browser/parts/editor/textEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textEditor.ts @@ -5,14 +5,14 @@ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { TPromise } from 'vs/base/common/winjs.base'; import URI from 'vs/base/common/uri'; import { Dimension, Builder } from 'vs/base/browser/builder'; -import * as objects from 'vs/base/common/objects'; -import * as types from 'vs/base/common/types'; -import * as errors from 'vs/base/common/errors'; -import * as DOM from 'vs/base/browser/dom'; +import objects = require('vs/base/common/objects'); +import types = require('vs/base/common/types'); +import errors = require('vs/base/common/errors'); +import DOM = require('vs/base/browser/dom'); import { CodeEditor } from 'vs/editor/browser/codeEditor'; import { EditorInput, EditorOptions } from 'vs/workbench/common/editor'; import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; diff --git a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts index 71f1e85147b..e1dc80aef83 100644 --- a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts @@ -5,8 +5,8 @@ 'use strict'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; -import * as types from 'vs/base/common/types'; +import nls = require('vs/nls'); +import types = require('vs/base/common/types'); import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { IEditorOptions } from 'vs/editor/common/config/editorOptions'; import { TextEditorOptions, EditorModel, EditorInput, EditorOptions } from 'vs/workbench/common/editor'; diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts index edcaa336ae5..fda09f5920b 100644 --- a/src/vs/workbench/browser/parts/editor/titleControl.ts +++ b/src/vs/workbench/browser/parts/editor/titleControl.ts @@ -6,15 +6,15 @@ 'use strict'; import 'vs/css!./media/titlecontrol'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { prepareActions } from 'vs/workbench/browser/actions'; import { IAction, Action, IRunEvent } from 'vs/base/common/actions'; -import * as errors from 'vs/base/common/errors'; -import * as DOM from 'vs/base/browser/dom'; +import errors = require('vs/base/common/errors'); +import DOM = require('vs/base/browser/dom'); import { TPromise } from 'vs/base/common/winjs.base'; import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import { RunOnceScheduler } from 'vs/base/common/async'; -import * as arrays from 'vs/base/common/arrays'; +import arrays = require('vs/base/common/arrays'); import { IEditorStacksModel, IEditorGroup, IEditorIdentifier, EditorInput, IStacksModelChangeEvent, toResource, IEditorCommandsContext } from 'vs/workbench/common/editor'; import { IActionItem, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar'; import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar'; diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts index b1451168b72..d572d7e30b8 100644 --- a/src/vs/workbench/browser/parts/panel/panelActions.ts +++ b/src/vs/workbench/browser/parts/panel/panelActions.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./media/panelpart'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { TPromise } from 'vs/base/common/winjs.base'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts index 28896b52a38..68379669e8d 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts @@ -7,15 +7,15 @@ import 'vs/css!./media/quickopen'; import { TPromise, ValueCallback } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import * as browser from 'vs/base/browser/browser'; import { Dimension, withElementById } from 'vs/base/browser/builder'; -import * as strings from 'vs/base/common/strings'; -import * as DOM from 'vs/base/browser/dom'; +import strings = require('vs/base/common/strings'); +import DOM = require('vs/base/browser/dom'); import URI from 'vs/base/common/uri'; import * as resources from 'vs/base/common/resources'; import { defaultGenerator } from 'vs/base/common/idGenerator'; -import * as types from 'vs/base/common/types'; +import types = require('vs/base/common/types'); import { Action, IAction } from 'vs/base/common/actions'; import { IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel'; import { CancellationToken } from 'vs/base/common/cancellation'; @@ -23,7 +23,7 @@ import { Mode, IEntryRunContext, IAutoFocus, IQuickNavigateConfiguration, IModel import { QuickOpenEntry, QuickOpenModel, QuickOpenEntryGroup, compareEntries, QuickOpenItemAccessorClass } from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { QuickOpenWidget, HideReason } from 'vs/base/parts/quickopen/browser/quickOpenWidget'; import { ContributableActionProvider } from 'vs/workbench/browser/actions'; -import * as labels from 'vs/base/common/labels'; +import labels = require('vs/base/common/labels'); import { ITextFileService, AutoSaveMode } from 'vs/workbench/services/textfile/common/textfiles'; import { Registry } from 'vs/platform/registry/common/platform'; import { IResourceInput, IEditorInput } from 'vs/platform/editor/common/editor'; @@ -35,7 +35,7 @@ import { Component } from 'vs/workbench/common/component'; import { Event, Emitter } from 'vs/base/common/event'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { QuickOpenHandler, QuickOpenHandlerDescriptor, IQuickOpenRegistry, Extensions, EditorQuickOpenEntry, CLOSE_ON_FOCUS_LOST_CONFIG } from 'vs/workbench/browser/quickopen'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IPickOpenEntry, IFilePickOpenEntry, IInputOptions, IQuickOpenService, IPickOptions, IShowOptions, IPickOpenItem } from 'vs/platform/quickOpen/common/quickOpen'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; @@ -51,6 +51,7 @@ import { ITree, IActionProvider } from 'vs/base/parts/tree/browser/tree'; import { BaseActionItem } from 'vs/base/browser/ui/actionbar/actionbar'; import { FileKind, IFileService } from 'vs/platform/files/common/files'; import { scoreItem, ScorerCache, compareItemsByScore, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer'; +import { getBaseLabel } from 'vs/base/common/labels'; import { WorkbenchTree } from 'vs/platform/list/browser/listService'; import { matchesFuzzyOcticonAware, parseOcticons, IParsedOcticons } from 'vs/base/common/octicon'; import { IMatch } from 'vs/base/common/filters'; @@ -1291,7 +1292,7 @@ export class EditorHistoryEntry extends EditorQuickOpenEntry { } else { const resourceInput = input as IResourceInput; this.resource = resourceInput.resource; - this.label = labels.getBaseLabel(resourceInput.resource); + this.label = getBaseLabel(resourceInput.resource); this.description = labels.getPathLabel(resources.dirname(this.resource), contextService, environmentService); this.dirty = this.resource && this.textFileService.isDirty(this.resource); diff --git a/src/vs/workbench/browser/parts/quickopen/quickopen.ts b/src/vs/workbench/browser/parts/quickopen/quickopen.ts index c05a1a9424c..0d9151b461c 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickopen.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickopen.ts @@ -6,7 +6,7 @@ 'use strict'; 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 { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts index c944aae93aa..4139a67bf98 100644 --- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts +++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts @@ -5,7 +5,7 @@ import 'vs/css!./media/sidebarpart'; 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 { CompositePart } from 'vs/workbench/browser/parts/compositePart'; diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts index 1004fac2c9b..27f620c0539 100644 --- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts +++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts @@ -6,7 +6,7 @@ 'use strict'; import 'vs/css!./media/statusbarpart'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { toErrorMessage } from 'vs/base/common/errorMessage'; import { TPromise } from 'vs/base/common/winjs.base'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts index 49198a0da14..613f53ddd87 100644 --- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts +++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts @@ -22,7 +22,7 @@ import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/co import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import * as labels from 'vs/base/common/labels'; import { EditorInput, toResource } from 'vs/workbench/common/editor'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; diff --git a/src/vs/workbench/browser/quickopen.ts b/src/vs/workbench/browser/quickopen.ts index 90637cb8ba5..39f9a21eda2 100644 --- a/src/vs/workbench/browser/quickopen.ts +++ b/src/vs/workbench/browser/quickopen.ts @@ -4,13 +4,13 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { TPromise } from 'vs/base/common/winjs.base'; import * as objects from 'vs/base/common/objects'; -import * as arrays from 'vs/base/common/arrays'; -import * as strings from 'vs/base/common/strings'; -import * as types from 'vs/base/common/types'; -import * as errors from 'vs/base/common/errors'; +import arrays = require('vs/base/common/arrays'); +import strings = require('vs/base/common/strings'); +import types = require('vs/base/common/types'); +import errors = require('vs/base/common/errors'); import { Registry } from 'vs/platform/registry/common/platform'; import { Action } from 'vs/base/common/actions'; import { Mode, IEntryRunContext, IAutoFocus, IModel, IQuickNavigateConfiguration } from 'vs/base/parts/quickopen/common/quickOpen'; diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts index 1d5419d0e5e..43f5f492104 100644 --- a/src/vs/workbench/browser/viewlet.ts +++ b/src/vs/workbench/browser/viewlet.ts @@ -3,9 +3,9 @@ * 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 { TPromise } from 'vs/base/common/winjs.base'; -import * as DOM from 'vs/base/browser/dom'; +import DOM = require('vs/base/browser/dom'); import { Registry } from 'vs/platform/registry/common/platform'; import { Action, IAction } from 'vs/base/common/actions'; import { ITree } from 'vs/base/parts/tree/browser/tree'; diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts index 12e0cbaae6b..ed4f468ce30 100644 --- a/src/vs/workbench/common/editor.ts +++ b/src/vs/workbench/common/editor.ts @@ -7,7 +7,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { Event, Emitter, once } from 'vs/base/common/event'; import * as objects from 'vs/base/common/objects'; -import * as types from 'vs/base/common/types'; +import types = require('vs/base/common/types'); import URI from 'vs/base/common/uri'; import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle'; import { IEditor, IEditorViewState, ScrollType } from 'vs/editor/common/editorCommon'; diff --git a/src/vs/workbench/common/editor/untitledEditorInput.ts b/src/vs/workbench/common/editor/untitledEditorInput.ts index bbbed7f54b7..93d992f0a21 100644 --- a/src/vs/workbench/common/editor/untitledEditorInput.ts +++ b/src/vs/workbench/common/editor/untitledEditorInput.ts @@ -8,10 +8,10 @@ import { TPromise } from 'vs/base/common/winjs.base'; import URI from 'vs/base/common/uri'; import { suggestFilename } from 'vs/base/common/mime'; import { memoize } from 'vs/base/common/decorators'; -import * as labels from 'vs/base/common/labels'; +import labels = require('vs/base/common/labels'); import { PLAINTEXT_MODE_ID } from 'vs/editor/common/modes/modesRegistry'; -import * as paths from 'vs/base/common/paths'; -import * as resources from 'vs/base/common/resources'; +import paths = require('vs/base/common/paths'); +import resources = require('vs/base/common/resources'); import { EditorInput, IEncodingSupport, EncodingMode, ConfirmResult } from 'vs/workbench/common/editor'; import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/workbench/common/memento.ts b/src/vs/workbench/common/memento.ts index d26ab2ba8a0..60067a20425 100644 --- a/src/vs/workbench/common/memento.ts +++ b/src/vs/workbench/common/memento.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as types from 'vs/base/common/types'; +import types = require('vs/base/common/types'); import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; /** diff --git a/src/vs/workbench/common/resources.ts b/src/vs/workbench/common/resources.ts index 4809497f2a8..ce37e8b8eff 100644 --- a/src/vs/workbench/common/resources.ts +++ b/src/vs/workbench/common/resources.ts @@ -6,7 +6,8 @@ 'use strict'; import URI from 'vs/base/common/uri'; -import * as paths from 'vs/base/common/paths'; +import paths = require('vs/base/common/paths'); +import { basename } from 'vs/base/common/paths'; import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { IModeService } from 'vs/editor/common/services/modeService'; import { IFileService } from 'vs/platform/files/common/files'; @@ -46,7 +47,7 @@ export class ResourceContextKey implements IContextKey { set(value: URI) { this._resourceKey.set(value); this._schemeKey.set(value && value.scheme); - this._filenameKey.set(value && paths.basename(value.fsPath)); + this._filenameKey.set(value && basename(value.fsPath)); this._langIdKey.set(value && this._modeService.getModeIdByFilenameOrFirstLine(value.fsPath)); this._extensionKey.set(value && paths.extname(value.fsPath)); this._hasResource.set(!!value); diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts index fc93969262c..6e7330fe86f 100644 --- a/src/vs/workbench/common/theme.ts +++ b/src/vs/workbench/common/theme.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, contrastBorder, transparent, editorWidgetBackground, textLinkForeground, lighten, darken } from 'vs/platform/theme/common/colorRegistry'; import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle'; import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index 3e0b42414db..623ee02918c 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -11,15 +11,15 @@ import URI from 'vs/base/common/uri'; import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; import { IWindowService, IWindowsService, MenuBarVisibility } from 'vs/platform/windows/common/windows'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import product from 'vs/platform/node/product'; import pkg from 'vs/platform/node/package'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; -import * as paths from 'vs/base/common/paths'; +import paths = require('vs/base/common/paths'); import { isMacintosh, isLinux } from 'vs/base/common/platform'; import { IQuickOpenService, IFilePickOpenEntry, ISeparator, IPickOpenAction, IPickOpenItem } from 'vs/platform/quickOpen/common/quickOpen'; import * as browser from 'vs/base/browser/browser'; diff --git a/src/vs/workbench/electron-browser/commands.ts b/src/vs/workbench/electron-browser/commands.ts index 7291d47fe72..50a3c4d915e 100644 --- a/src/vs/workbench/electron-browser/commands.ts +++ b/src/vs/workbench/electron-browser/commands.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; @@ -13,7 +13,7 @@ import { IPartService } from 'vs/workbench/services/part/common/partService'; import { NoEditorsVisibleContext, InZenModeContext } from 'vs/workbench/electron-browser/workbench'; import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows'; import { List } from 'vs/base/browser/ui/list/listWidget'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import URI from 'vs/base/common/uri'; diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts index 6846791700a..9835b2a8f27 100644 --- a/src/vs/workbench/electron-browser/main.contribution.ts +++ b/src/vs/workbench/electron-browser/main.contribution.ts @@ -6,7 +6,7 @@ 'use strict'; import { Registry } from 'vs/platform/registry/common/platform'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import product from 'vs/platform/node/product'; import * as os from 'os'; import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts index e6f251eb548..6c93107c6cc 100644 --- a/src/vs/workbench/electron-browser/main.ts +++ b/src/vs/workbench/electron-browser/main.ts @@ -5,25 +5,25 @@ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import * as perf from 'vs/base/common/performance'; import { TPromise } from 'vs/base/common/winjs.base'; import { WorkbenchShell } from 'vs/workbench/electron-browser/shell'; import * as browser from 'vs/base/browser/browser'; import { domContentLoaded } from 'vs/base/browser/dom'; -import * as errors from 'vs/base/common/errors'; -import * as comparer from 'vs/base/common/comparers'; -import * as platform from 'vs/base/common/platform'; -import * as paths from 'vs/base/common/paths'; +import errors = require('vs/base/common/errors'); +import comparer = require('vs/base/common/comparers'); +import platform = require('vs/base/common/platform'); +import paths = require('vs/base/common/paths'); import uri from 'vs/base/common/uri'; -import * as strings from 'vs/base/common/strings'; +import strings = require('vs/base/common/strings'); import { IWorkspaceContextService, Workspace, WorkbenchState } from 'vs/platform/workspace/common/workspace'; import { WorkspaceService } from 'vs/workbench/services/configuration/node/configurationService'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { realpath } from 'vs/base/node/pfs'; import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; -import * as gracefulFs from 'graceful-fs'; +import gracefulFs = require('graceful-fs'); import { IInitData } from 'vs/workbench/services/timer/common/timerService'; import { TimerService } from 'vs/workbench/services/timer/node/timerService'; import { KeyboardMapperFactory } from 'vs/workbench/services/keybinding/electron-browser/keybindingService'; @@ -42,7 +42,7 @@ import { WorkspacesChannelClient } from 'vs/platform/workspaces/common/workspace import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces'; import { createSpdLogService } from 'vs/platform/log/node/spdlogService'; -import * as fs from 'fs'; +import fs = require('fs'); import { ConsoleLogService, MultiplexLogService, ILogService } from 'vs/platform/log/common/log'; import { IssueChannelClient } from 'vs/platform/issue/common/issueIpc'; import { IIssueService } from 'vs/platform/issue/common/issue'; diff --git a/src/vs/workbench/electron-browser/resources.ts b/src/vs/workbench/electron-browser/resources.ts index fce07d4794d..64c921b11f6 100644 --- a/src/vs/workbench/electron-browser/resources.ts +++ b/src/vs/workbench/electron-browser/resources.ts @@ -6,7 +6,7 @@ 'use strict'; import URI from 'vs/base/common/uri'; -import * as objects from 'vs/base/common/objects'; +import objects = require('vs/base/common/objects'); import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts index b4d8097c5fe..5879508b80c 100644 --- a/src/vs/workbench/electron-browser/shell.ts +++ b/src/vs/workbench/electron-browser/shell.ts @@ -10,10 +10,10 @@ import 'vs/css!./media/shell'; import * as platform from 'vs/base/common/platform'; import * as perf from 'vs/base/common/performance'; import { Dimension, Builder, $ } from 'vs/base/browser/builder'; -import * as dom from 'vs/base/browser/dom'; -import * as aria from 'vs/base/browser/ui/aria/aria'; +import dom = require('vs/base/browser/dom'); +import aria = require('vs/base/browser/ui/aria/aria'); import { dispose, IDisposable } from 'vs/base/common/lifecycle'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import { toErrorMessage } from 'vs/base/common/errorMessage'; import product from 'vs/platform/node/product'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts index 53402073fbf..157a77a14bf 100644 --- a/src/vs/workbench/electron-browser/window.ts +++ b/src/vs/workbench/electron-browser/window.ts @@ -5,14 +5,14 @@ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import URI from 'vs/base/common/uri'; -import * as errors from 'vs/base/common/errors'; -import * as types from 'vs/base/common/types'; +import errors = require('vs/base/common/errors'); +import types = require('vs/base/common/types'); import { TPromise } from 'vs/base/common/winjs.base'; -import * as arrays from 'vs/base/common/arrays'; -import * as objects from 'vs/base/common/objects'; -import * as DOM from 'vs/base/browser/dom'; +import arrays = require('vs/base/common/arrays'); +import objects = require('vs/base/common/objects'); +import DOM = require('vs/base/browser/dom'); import { Separator } from 'vs/base/browser/ui/actionbar/actionbar'; import { IAction, Action } from 'vs/base/common/actions'; import { AutoSaveConfiguration, IFileService } from 'vs/platform/files/common/files'; diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index 88d3f128bba..6719e146c8d 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -11,12 +11,12 @@ import { localize } from 'vs/nls'; import { TPromise } from 'vs/base/common/winjs.base'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { Event, Emitter } from 'vs/base/common/event'; -import * as DOM from 'vs/base/browser/dom'; +import DOM = require('vs/base/browser/dom'); import { Builder, $ } from 'vs/base/browser/builder'; import { Delayer, RunOnceScheduler } from 'vs/base/common/async'; import * as browser from 'vs/base/browser/browser'; import * as perf from 'vs/base/common/performance'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import { BackupFileService } from 'vs/workbench/services/backup/node/backupFileService'; import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { Registry } from 'vs/platform/registry/common/platform'; diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts index f0a8fe9cacf..4672e94e23b 100644 --- a/src/vs/workbench/node/extensionHostMain.ts +++ b/src/vs/workbench/node/extensionHostMain.ts @@ -5,8 +5,8 @@ 'use strict'; -import * as nls from 'vs/nls'; -import * as pfs from 'vs/base/node/pfs'; +import nls = require('vs/nls'); +import pfs = require('vs/base/node/pfs'); import { TPromise } from 'vs/base/common/winjs.base'; import { join } from 'path'; import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionService'; diff --git a/src/vs/workbench/parts/backup/common/backupModelTracker.ts b/src/vs/workbench/parts/backup/common/backupModelTracker.ts index 4cb9b8c7670..1c61b9715e2 100644 --- a/src/vs/workbench/parts/backup/common/backupModelTracker.ts +++ b/src/vs/workbench/parts/backup/common/backupModelTracker.ts @@ -6,7 +6,7 @@ 'use strict'; import Uri from 'vs/base/common/uri'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { ITextFileService, TextFileModelChangeEvent, StateChange } from 'vs/workbench/services/textfile/common/textfiles'; diff --git a/src/vs/workbench/parts/backup/common/backupRestorer.ts b/src/vs/workbench/parts/backup/common/backupRestorer.ts index ffd765da9aa..54c0b064a01 100644 --- a/src/vs/workbench/parts/backup/common/backupRestorer.ts +++ b/src/vs/workbench/parts/backup/common/backupRestorer.ts @@ -9,7 +9,7 @@ import URI from 'vs/base/common/uri'; import { TPromise } from 'vs/base/common/winjs.base'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; diff --git a/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts b/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts index 66905ae107a..e9e32b77180 100644 --- a/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts +++ b/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts @@ -3,15 +3,16 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as nls from 'vs/nls'; -import * as Filters from 'vs/base/common/filters'; +import nls = require('vs/nls'); +import Filters = require('vs/base/common/filters'); import { TPromise } from 'vs/base/common/winjs.base'; -import * as Quickopen from 'vs/workbench/browser/quickopen'; -import * as QuickOpen from 'vs/base/parts/quickopen/common/quickOpen'; -import * as Model from 'vs/base/parts/quickopen/browser/quickOpenModel'; +import Quickopen = require('vs/workbench/browser/quickopen'); +import QuickOpen = require('vs/base/parts/quickopen/common/quickOpen'); +import Model = require('vs/base/parts/quickopen/browser/quickOpenModel'); import { IDebugService, ILaunch } from 'vs/workbench/parts/debug/common/debug'; import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace'; import * as errors from 'vs/base/common/errors'; +import { QuickOpenEntry, QuickOpenEntryGroup } from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { StartAction } from 'vs/workbench/parts/debug/browser/debugActions'; import { INotificationService } from 'vs/platform/notification/common/notification'; @@ -93,7 +94,7 @@ export class DebugQuickOpenHandler extends Quickopen.QuickOpenHandler { } public getResults(input: string): TPromise { - const configurations: Model.QuickOpenEntry[] = []; + const configurations: QuickOpenEntry[] = []; const configManager = this.debugService.getConfigurationManager(); const launches = configManager.getLaunches(); @@ -112,7 +113,7 @@ export class DebugQuickOpenHandler extends Quickopen.QuickOpenHandler { const label = this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? nls.localize("addConfigTo", "Add Config ({0})...", l.name) : nls.localize('addConfiguration', "Add Configuration..."); const entry = new AddConfigEntry(label, l, this.commandService, this.contextService, Filters.matchesContiguousSubString(input, label)); if (index === 0) { - configurations.push(new Model.QuickOpenEntryGroup(entry, undefined, true)); + configurations.push(new QuickOpenEntryGroup(entry, undefined, true)); } else { configurations.push(entry); } diff --git a/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts b/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts index 18de389aa6a..526b29dabb9 100644 --- a/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts +++ b/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts @@ -3,20 +3,20 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as nls from 'vs/nls'; -import * as cp from 'child_process'; -import * as net from 'net'; +import nls = require('vs/nls'); +import cp = require('child_process'); +import net = require('net'); import { Event, Emitter } from 'vs/base/common/event'; -import * as platform from 'vs/base/common/platform'; -import * as objects from 'vs/base/common/objects'; +import platform = require('vs/base/common/platform'); +import objects = require('vs/base/common/objects'); import { Action } from 'vs/base/common/actions'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import { TPromise } from 'vs/base/common/winjs.base'; -import * as stdfork from 'vs/base/node/stdFork'; +import stdfork = require('vs/base/node/stdFork'); import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { ITerminalService } from 'vs/workbench/parts/terminal/common/terminal'; import { ITerminalService as IExternalTerminalService } from 'vs/workbench/parts/execution/common/execution'; -import * as debug from 'vs/workbench/parts/debug/common/debug'; +import debug = require('vs/workbench/parts/debug/common/debug'); import { Adapter } from 'vs/workbench/parts/debug/node/debugAdapter'; import { V8Protocol } from 'vs/workbench/parts/debug/node/v8Protocol'; import { IOutputService } from 'vs/workbench/parts/output/common/output'; diff --git a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts index 084ff3264de..b3677c3dd12 100644 --- a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts +++ b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts @@ -5,7 +5,7 @@ import * as nls from 'vs/nls'; import * as platform from 'vs/base/common/platform'; -import * as cp from 'child_process'; +import cp = require('child_process'); import { IDisposable } from 'vs/base/common/lifecycle'; import { TPromise } from 'vs/base/common/winjs.base'; import { ITerminalService, ITerminalInstance, ITerminalConfiguration } from 'vs/workbench/parts/terminal/common/terminal'; diff --git a/src/vs/workbench/parts/debug/node/debugAdapter.ts b/src/vs/workbench/parts/debug/node/debugAdapter.ts index 632847907bb..b39e2c838e2 100644 --- a/src/vs/workbench/parts/debug/node/debugAdapter.ts +++ b/src/vs/workbench/parts/debug/node/debugAdapter.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as fs from 'fs'; -import * as path from 'path'; +import fs = require('fs'); +import path = require('path'); import * as nls from 'vs/nls'; import { TPromise } from 'vs/base/common/winjs.base'; import * as strings from 'vs/base/common/strings'; diff --git a/src/vs/workbench/parts/debug/node/v8Protocol.ts b/src/vs/workbench/parts/debug/node/v8Protocol.ts index cd9c151d7cb..99e2a2672cd 100644 --- a/src/vs/workbench/parts/debug/node/v8Protocol.ts +++ b/src/vs/workbench/parts/debug/node/v8Protocol.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as stream from 'stream'; +import stream = require('stream'); import { TPromise } from 'vs/base/common/winjs.base'; import { canceled } from 'vs/base/common/errors'; diff --git a/src/vs/workbench/parts/debug/test/common/debugUtils.test.ts b/src/vs/workbench/parts/debug/test/common/debugUtils.test.ts index e9c9390ec89..7e91cac8960 100644 --- a/src/vs/workbench/parts/debug/test/common/debugUtils.test.ts +++ b/src/vs/workbench/parts/debug/test/common/debugUtils.test.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as debug from 'vs/workbench/parts/debug/common/debug'; -import * as assert from 'assert'; +import debug = require('vs/workbench/parts/debug/common/debug'); +import assert = require('assert'); suite('Debug - Utils', () => { test('formatPII', () => { diff --git a/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.ts b/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.ts index ea18fc77506..6be3a0c2f8a 100644 --- a/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.ts +++ b/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { TPromise } from 'vs/base/common/winjs.base'; import { registerEditorAction, EditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions'; diff --git a/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts b/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts index 7a713f9c901..abdc3e4a456 100644 --- a/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts +++ b/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { EmmetEditorAction } from 'vs/workbench/parts/emmet/electron-browser/emmetActions'; import { registerEditorAction } from 'vs/editor/browser/editorExtensions'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; diff --git a/src/vs/workbench/parts/emmet/test/electron-browser/emmetAction.test.ts b/src/vs/workbench/parts/emmet/test/electron-browser/emmetAction.test.ts index 6dcb146ee6a..b72c00c8dda 100644 --- a/src/vs/workbench/parts/emmet/test/electron-browser/emmetAction.test.ts +++ b/src/vs/workbench/parts/emmet/test/electron-browser/emmetAction.test.ts @@ -7,7 +7,7 @@ import { IGrammarContributions, ILanguageIdentifierResolver, EmmetEditorAction } from 'vs/workbench/parts/emmet/electron-browser/emmetActions'; import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor'; -import * as assert from 'assert'; +import assert = require('assert'); import { LanguageId, LanguageIdentifier } from 'vs/editor/common/modes'; // diff --git a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts index 003b60d75b2..98f1b6b31ab 100644 --- a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts +++ b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts @@ -9,7 +9,7 @@ import * as env from 'vs/base/common/platform'; import { Registry } from 'vs/platform/registry/common/platform'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; -import * as paths from 'vs/base/common/paths'; +import paths = require('vs/base/common/paths'); import uri from 'vs/base/common/uri'; import { ITerminalService } from 'vs/workbench/parts/execution/common/execution'; import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; diff --git a/src/vs/workbench/parts/execution/electron-browser/terminal.ts b/src/vs/workbench/parts/execution/electron-browser/terminal.ts index 9e938b97b96..260feb51c62 100644 --- a/src/vs/workbench/parts/execution/electron-browser/terminal.ts +++ b/src/vs/workbench/parts/execution/electron-browser/terminal.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as env from 'vs/base/common/platform'; +import env = require('vs/base/common/platform'); import * as pfs from 'vs/base/node/pfs'; import { TPromise } from 'vs/base/common/winjs.base'; diff --git a/src/vs/workbench/parts/execution/electron-browser/terminalService.ts b/src/vs/workbench/parts/execution/electron-browser/terminalService.ts index 275f11a662e..6c383779843 100644 --- a/src/vs/workbench/parts/execution/electron-browser/terminalService.ts +++ b/src/vs/workbench/parts/execution/electron-browser/terminalService.ts @@ -5,11 +5,11 @@ 'use strict'; -import * as cp from 'child_process'; -import * as path from 'path'; -import * as processes from 'vs/base/node/processes'; -import * as nls from 'vs/nls'; -import * as errors from 'vs/base/common/errors'; +import cp = require('child_process'); +import path = require('path'); +import processes = require('vs/base/node/processes'); +import nls = require('vs/nls'); +import errors = require('vs/base/common/errors'); import { assign } from 'vs/base/common/objects'; import { TPromise } from 'vs/base/common/winjs.base'; import { ITerminalService } from 'vs/workbench/parts/execution/common/execution'; diff --git a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts index fa0bc5914ae..b9781f88d18 100644 --- a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts +++ b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts @@ -9,7 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IAction, Action } from 'vs/base/common/actions'; import { Throttler } from 'vs/base/common/async'; import * as DOM from 'vs/base/browser/dom'; -import * as paths from 'vs/base/common/paths'; +import paths = require('vs/base/common/paths'); import { Event } from 'vs/base/common/event'; import * as json from 'vs/base/common/json'; import { ActionItem, IActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar'; diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts index 6cdd37b47c3..4bfc9601b56 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts @@ -30,7 +30,7 @@ import { ExtensionEditor } from 'vs/workbench/parts/extensions/electron-browser/ import { StatusUpdater, ExtensionsViewlet, MaliciousExtensionChecker } from 'vs/workbench/parts/extensions/electron-browser/extensionsViewlet'; import { IQuickOpenRegistry, Extensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen'; import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry'; -import * as jsonContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; +import jsonContributionRegistry = require('vs/platform/jsonschemas/common/jsonContributionRegistry'); import { ExtensionsConfigurationSchema, ExtensionsConfigurationSchemaId } from 'vs/workbench/parts/extensions/common/extensionsFileTemplate'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts index aa3773bbe87..b9c27924e0f 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts @@ -6,7 +6,7 @@ import { localize } from 'vs/nls'; import { TPromise } from 'vs/base/common/winjs.base'; import { Action, IAction } from 'vs/base/common/actions'; -import * as paths from 'vs/base/common/paths'; +import paths = require('vs/base/common/paths'); import { IExtensionsWorkbenchService, IExtension } from 'vs/workbench/parts/extensions/common/extensions'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows'; diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts index 3eb46fe2ffd..2538e6facbe 100644 --- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts +++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { readFile } from 'vs/base/node/pfs'; import * as semver from 'semver'; import * as path from 'path'; diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts index e0947d14220..4b77d0803a2 100644 --- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts +++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts @@ -10,7 +10,7 @@ import * as path from 'path'; import * as fs from 'fs'; import * as os from 'os'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as uuid from 'vs/base/common/uuid'; +import uuid = require('vs/base/common/uuid'); import { mkdirp } from 'vs/base/node/pfs'; import { IExtensionGalleryService, IGalleryExtensionAssets, IGalleryExtension, IExtensionManagementService, LocalExtensionType, @@ -29,11 +29,12 @@ import URI from 'vs/base/common/uri'; import { testWorkspace } from 'vs/platform/workspace/test/common/testWorkspace'; import { IFileService } from 'vs/platform/files/common/files'; import { FileService } from 'vs/workbench/services/files/node/fileService'; -import * as extfs from 'vs/base/node/extfs'; +import extfs = require('vs/base/node/extfs'); import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; import { IPager } from 'vs/base/common/paging'; import { assign } from 'vs/base/common/objects'; import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; +import { generateUuid } from 'vs/base/common/uuid'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { IExtensionsWorkbenchService, ConfigurationKey } from 'vs/workbench/parts/extensions/common/extensions'; @@ -154,7 +155,7 @@ function aGalleryExtension(name: string, properties: any = {}, galleryExtensionP assign(galleryExtension, { name, publisher: 'pub', version: '1.0.0', properties: {}, assets: {} }, properties); assign(galleryExtension.properties, { dependencies: [] }, galleryExtensionProperties); assign(galleryExtension.assets, assets); - galleryExtension.identifier = { id: getGalleryExtensionId(galleryExtension.publisher, galleryExtension.name), uuid: uuid.generateUuid() }; + galleryExtension.identifier = { id: getGalleryExtensionId(galleryExtension.publisher, galleryExtension.name), uuid: generateUuid() }; return galleryExtension; } diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedback.ts b/src/vs/workbench/parts/feedback/electron-browser/feedback.ts index 4503ee13ed2..70313249fd8 100644 --- a/src/vs/workbench/parts/feedback/electron-browser/feedback.ts +++ b/src/vs/workbench/parts/feedback/electron-browser/feedback.ts @@ -6,7 +6,7 @@ 'use strict'; import 'vs/css!./media/feedback'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { IDisposable } from 'vs/base/common/lifecycle'; import { Builder, $ } from 'vs/base/browser/builder'; import { Dropdown } from 'vs/base/browser/ui/dropdown/dropdown'; diff --git a/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts index 346898902ab..485173c6d4b 100644 --- a/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts +++ b/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { BaseBinaryResourceEditor } from 'vs/workbench/browser/parts/editor/binaryEditor'; import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts b/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts index 25645702a6e..a4b89ff6e86 100644 --- a/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts +++ b/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts @@ -6,9 +6,9 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import URI from 'vs/base/common/uri'; -import * as paths from 'vs/base/common/paths'; +import paths = require('vs/base/common/paths'); import { IEditorViewState } from 'vs/editor/common/editorCommon'; import { toResource, SideBySideEditorInput, IEditorGroup, IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor'; import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files'; diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts index 66adc9a01a8..1b3333b2d28 100644 --- a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts +++ b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts @@ -5,11 +5,11 @@ 'use strict'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; -import * as errors from 'vs/base/common/errors'; +import nls = require('vs/nls'); +import errors = require('vs/base/common/errors'); import { toErrorMessage } from 'vs/base/common/errorMessage'; -import * as types from 'vs/base/common/types'; -import * as paths from 'vs/base/common/paths'; +import types = require('vs/base/common/types'); +import paths = require('vs/base/common/paths'); import { Action } from 'vs/base/common/actions'; import { VIEWLET_ID, TEXT_FILE_EDITOR_ID, IExplorerViewlet } from 'vs/workbench/parts/files/common/files'; import { ITextFileEditorModel, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; diff --git a/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts b/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts index 035f61d85b7..5f17473b327 100644 --- a/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts +++ b/src/vs/workbench/parts/files/common/dirtyFilesTracker.ts @@ -5,8 +5,8 @@ 'use strict'; -import * as nls from 'vs/nls'; -import * as errors from 'vs/base/common/errors'; +import nls = require('vs/nls'); +import errors = require('vs/base/common/errors'); import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { VIEWLET_ID } from 'vs/workbench/parts/files/common/files'; import { TextFileModelChangeEvent, ITextFileService, AutoSaveMode, ModelState } from 'vs/workbench/services/textfile/common/textfiles'; @@ -21,7 +21,7 @@ import URI from 'vs/base/common/uri'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; -import * as arrays from 'vs/base/common/arrays'; +import arrays = require('vs/base/common/arrays'); export class DirtyFilesTracker implements IWorkbenchContribution { private isDocumentedEdited: boolean; diff --git a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts index 5c353824875..f6a8ad3ec7d 100644 --- a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts +++ b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts @@ -7,9 +7,9 @@ import { localize } from 'vs/nls'; import { TPromise } from 'vs/base/common/winjs.base'; import { memoize } from 'vs/base/common/decorators'; -import * as paths from 'vs/base/common/paths'; -import * as resources from 'vs/base/common/resources'; -import * as labels from 'vs/base/common/labels'; +import paths = require('vs/base/common/paths'); +import resources = require('vs/base/common/resources'); +import labels = require('vs/base/common/labels'); import URI from 'vs/base/common/uri'; import { EncodingMode, ConfirmResult, EditorInput, IFileEditorInput, ITextEditorModel } from 'vs/workbench/common/editor'; import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel'; diff --git a/src/vs/workbench/parts/files/common/explorerModel.ts b/src/vs/workbench/parts/files/common/explorerModel.ts index bcdb0f772b4..04ae7fc3b7a 100644 --- a/src/vs/workbench/parts/files/common/explorerModel.ts +++ b/src/vs/workbench/parts/files/common/explorerModel.ts @@ -6,8 +6,8 @@ 'use strict'; import URI from 'vs/base/common/uri'; -import * as paths from 'vs/base/common/paths'; -import * as resources from 'vs/base/common/resources'; +import paths = require('vs/base/common/paths'); +import resources = require('vs/base/common/resources'); import { ResourceMap } from 'vs/base/common/map'; import { isLinux } from 'vs/base/common/platform'; import { IFileStat } from 'vs/platform/files/common/files'; diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts index 6ce839bb348..8d6a84a0802 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { Registry } from 'vs/platform/registry/common/platform'; import { GlobalNewUntitledFileAction, ShowOpenedFileInNewWindow, CopyPathAction, FocusOpenEditorsView, FocusFilesExplorer, GlobalCompareResourcesAction, SaveAllAction, ShowActiveFileInExplorer, CollapseExplorerView, RefreshExplorerView, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler } from 'vs/workbench/parts/files/electron-browser/fileActions'; import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTION_CONTEXT } from 'vs/workbench/parts/files/electron-browser/saveErrorHandler'; diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts index 7685d1f407e..387ce46c016 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts @@ -7,16 +7,16 @@ import 'vs/css!./media/fileactions'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { isWindows, isLinux } from 'vs/base/common/platform'; import { sequence, ITask, always } from 'vs/base/common/async'; -import * as paths from 'vs/base/common/paths'; -import * as resources from 'vs/base/common/resources'; +import paths = require('vs/base/common/paths'); +import resources = require('vs/base/common/resources'); import URI from 'vs/base/common/uri'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import { toErrorMessage } from 'vs/base/common/errorMessage'; -import * as strings from 'vs/base/common/strings'; -import * as diagnostics from 'vs/base/common/diagnostics'; +import strings = require('vs/base/common/strings'); +import diagnostics = require('vs/base/common/diagnostics'); import { Action, IAction } from 'vs/base/common/actions'; import { MessageType, IInputValidator } from 'vs/base/browser/ui/inputbox/inputBox'; import { ITree, IHighlightEvent } from 'vs/base/parts/tree/browser/tree'; @@ -49,6 +49,7 @@ import { IModelService } from 'vs/editor/common/services/modelService'; import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IListService, ListWidget } from 'vs/platform/list/browser/listService'; import { RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; +import { distinctParents, basenameOrAuthority } from 'vs/base/common/resources'; import { Schemas } from 'vs/base/common/network'; import { IDialogService, IConfirmationResult, IConfirmation, getConfirmMessage } from 'vs/platform/dialogs/common/dialogs'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; @@ -590,7 +591,7 @@ class BaseDeleteFileAction extends BaseFileAction { primaryButton = nls.localize({ key: 'deleteButtonLabel', comment: ['&& denotes a mnemonic'] }, "&&Delete"); } - const distinctElements = resources.distinctParents(this.elements, e => e.resource); + const distinctElements = distinctParents(this.elements, e => e.resource); // Handle dirty let confirmDirtyPromise: TPromise = TPromise.as(true); @@ -992,7 +993,7 @@ export class DuplicateFileAction extends BaseFileAction { } function findValidPasteFileTarget(targetFolder: FileStat, fileToPaste: { resource: URI, isDirectory?: boolean }): URI { - let name = resources.basenameOrAuthority(fileToPaste.resource); + let name = basenameOrAuthority(fileToPaste.resource); let candidate = targetFolder.resource.with({ path: paths.join(targetFolder.resource.path, name) }); while (true) { @@ -1618,7 +1619,7 @@ export const pasteFileHandler = (accessor: ServicesAccessor) => { const clipboardService = accessor.get(IClipboardService); const explorerContext = getContext(listService.lastFocusedList, accessor.get(IViewletService)); - return TPromise.join(resources.distinctParents(clipboardService.readFiles(), r => r).map(toCopy => { + return TPromise.join(distinctParents(clipboardService.readFiles(), r => r).map(toCopy => { const pasteFileAction = instantationService.createInstance(PasteFileAction, listService.lastFocusedList, explorerContext.stat); return pasteFileAction.run(toCopy); })); diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index f19b8205f14..d79788794b5 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -5,8 +5,8 @@ 'use strict'; -import * as nls from 'vs/nls'; -import * as paths from 'vs/base/common/paths'; +import nls = require('vs/nls'); +import paths = require('vs/base/common/paths'); import { TPromise } from 'vs/base/common/winjs.base'; import * as labels from 'vs/base/common/labels'; import URI from 'vs/base/common/uri'; @@ -22,6 +22,7 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { toErrorMessage } from 'vs/base/common/errorMessage'; +import { basename } from 'vs/base/common/paths'; import { IListService } from 'vs/platform/list/browser/listService'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; @@ -248,7 +249,7 @@ CommandsRegistry.registerCommand({ if (resources.length) { return textFileService.revertAll(resources, { force: true }).then(null, error => { - notificationService.error(nls.localize('genericRevertError', "Failed to revert '{0}': {1}", resources.map(r => paths.basename(r.fsPath)).join(', '), toErrorMessage(error, false))); + notificationService.error(nls.localize('genericRevertError', "Failed to revert '{0}': {1}", resources.map(r => basename(r.fsPath)).join(', '), toErrorMessage(error, false))); }); } diff --git a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts index 4c79f57d70e..f225b00e832 100644 --- a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts @@ -7,7 +7,7 @@ import URI from 'vs/base/common/uri'; import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor, ToggleViewletAction } from 'vs/workbench/browser/viewlet'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { Registry } from 'vs/platform/registry/common/platform'; import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry'; diff --git a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts index 8fc8287491a..85305c7d53a 100644 --- a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts +++ b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts @@ -5,10 +5,10 @@ 'use strict'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; -import * as errors from 'vs/base/common/errors'; +import nls = require('vs/nls'); +import errors = require('vs/base/common/errors'); import { toErrorMessage } from 'vs/base/common/errorMessage'; -import * as paths from 'vs/base/common/paths'; +import paths = require('vs/base/common/paths'); import { Action } from 'vs/base/common/actions'; import URI from 'vs/base/common/uri'; import { FileOperationError, FileOperationResult } from 'vs/platform/files/common/files'; diff --git a/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts b/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts index e2253c98749..9cdea4eafd4 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import * as errors from 'vs/base/common/errors'; -import * as env from 'vs/base/common/platform'; -import * as DOM from 'vs/base/browser/dom'; +import env = require('vs/base/common/platform'); +import DOM = require('vs/base/browser/dom'); import { TPromise } from 'vs/base/common/winjs.base'; import { IAction } from 'vs/base/common/actions'; import { Button } from 'vs/base/browser/ui/button/button'; diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts index 7e1ef195114..acac6760d6a 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts @@ -4,15 +4,15 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -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 URI from 'vs/base/common/uri'; import { ThrottledDelayer, Delayer } from 'vs/base/common/async'; -import * as errors from 'vs/base/common/errors'; -import * as paths from 'vs/base/common/paths'; -import * as resources from 'vs/base/common/resources'; -import * as glob from 'vs/base/common/glob'; +import errors = require('vs/base/common/errors'); +import paths = require('vs/base/common/paths'); +import resources = require('vs/base/common/resources'); +import glob = require('vs/base/common/glob'); import { Action, IAction } from 'vs/base/common/actions'; import { memoize } from 'vs/base/common/decorators'; import { IFilesConfiguration, ExplorerFolderContext, FilesExplorerFocusedContext, ExplorerFocusedContext, SortOrderConfiguration, SortOrder, IExplorerView, ExplorerRootContext } from 'vs/workbench/parts/files/common/files'; diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts index 2a16c66d08d..c88142871fb 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -5,19 +5,19 @@ 'use strict'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; -import * as objects from 'vs/base/common/objects'; -import * as DOM from 'vs/base/browser/dom'; +import nls = require('vs/nls'); +import objects = require('vs/base/common/objects'); +import DOM = require('vs/base/browser/dom'); import URI from 'vs/base/common/uri'; import { once } from 'vs/base/common/functional'; -import * as paths from 'vs/base/common/paths'; -import * as resources from 'vs/base/common/resources'; -import * as errors from 'vs/base/common/errors'; +import paths = require('vs/base/common/paths'); +import resources = require('vs/base/common/resources'); +import errors = require('vs/base/common/errors'); import { IAction, ActionRunner as BaseActionRunner, IActionRunner } from 'vs/base/common/actions'; -import * as comparers from 'vs/base/common/comparers'; +import comparers = require('vs/base/common/comparers'); import { InputBox, MessageType } from 'vs/base/browser/ui/inputbox/inputBox'; import { isMacintosh, isLinux } from 'vs/base/common/platform'; -import * as glob from 'vs/base/common/glob'; +import glob = require('vs/base/common/glob'); import { FileLabel, IFileLabelOptions } from 'vs/workbench/browser/labels'; import { IDisposable, dispose, empty as EmptyDisposable } from 'vs/base/common/lifecycle'; import { IFilesConfiguration, SortOrder } from 'vs/workbench/parts/files/common/files'; @@ -50,6 +50,7 @@ import { IWindowService } from 'vs/platform/windows/common/windows'; import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing'; import { extractResources, SimpleFileResourceDragAndDrop, CodeDataTransfers, fillResourceDataTransfers } from 'vs/workbench/browser/dnd'; import { relative } from 'path'; +import { distinctParents } from 'vs/base/common/resources'; import { WorkbenchTree, WorkbenchTreeController } from 'vs/platform/list/browser/listService'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { DataTransfers } from 'vs/base/browser/dnd'; @@ -925,7 +926,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop { } private handleExplorerDrop(tree: ITree, data: IDragAndDropData, target: FileStat | Model, originalEvent: DragMouseEvent): TPromise { - const sources: FileStat[] = resources.distinctParents(data.getData(), s => s.resource); + const sources: FileStat[] = distinctParents(data.getData(), s => s.resource); const isCopy = (originalEvent.ctrlKey && !isMacintosh) || (originalEvent.altKey && isMacintosh); let confirmPromise: TPromise; diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts index d446dcf610f..632c6c2f948 100644 --- a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts +++ b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts @@ -9,8 +9,8 @@ import * as errors from 'vs/base/common/errors'; import URI from 'vs/base/common/uri'; import { TPromise } from 'vs/base/common/winjs.base'; import { Delayer } from 'vs/base/common/async'; -import * as dom from 'vs/base/browser/dom'; -import * as builder from 'vs/base/browser/builder'; +import dom = require('vs/base/browser/dom'); +import builder = require('vs/base/browser/builder'); import { IAction, Action } from 'vs/base/common/actions'; import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts index 29fa7d076cc..2413497882e 100644 --- a/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts +++ b/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts @@ -21,7 +21,7 @@ import { IPartService } from 'vs/workbench/services/part/common/partService'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { CollapseAllAction as TreeCollapseAction } from 'vs/base/parts/tree/browser/treeDefaults'; -import * as Tree from 'vs/base/parts/tree/browser/tree'; +import Tree = require('vs/base/parts/tree/browser/tree'); import { IThemeService } from 'vs/platform/theme/common/themeService'; import { attachInputBoxStyler } from 'vs/platform/theme/common/styler'; import { IMarkersWorkbenchService } from 'vs/workbench/parts/markers/electron-browser/markers'; diff --git a/src/vs/workbench/parts/markers/electron-browser/markersTreeController.ts b/src/vs/workbench/parts/markers/electron-browser/markersTreeController.ts index 4ea6240d32a..236c63abba2 100644 --- a/src/vs/workbench/parts/markers/electron-browser/markersTreeController.ts +++ b/src/vs/workbench/parts/markers/electron-browser/markersTreeController.ts @@ -6,7 +6,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import * as mouse from 'vs/base/browser/mouseEvent'; -import * as tree from 'vs/base/parts/tree/browser/tree'; +import tree = require('vs/base/parts/tree/browser/tree'); import { MarkersModel } from 'vs/workbench/parts/markers/electron-browser/markersModel'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IMenuService, MenuId } from 'vs/platform/actions/common/actions'; diff --git a/src/vs/workbench/parts/markers/electron-browser/messages.ts b/src/vs/workbench/parts/markers/electron-browser/messages.ts index 067591c0773..e52f5691c3e 100644 --- a/src/vs/workbench/parts/markers/electron-browser/messages.ts +++ b/src/vs/workbench/parts/markers/electron-browser/messages.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers'; export default class Messages { diff --git a/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts b/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts index d62b12bb489..6cd96ad298c 100644 --- a/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts +++ b/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as assert from 'assert'; +import assert = require('assert'); import URI from 'vs/base/common/uri'; import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers'; import { MarkersModel, Marker, Resource } from 'vs/workbench/parts/markers/electron-browser/markersModel'; diff --git a/src/vs/workbench/parts/output/browser/outputActions.ts b/src/vs/workbench/parts/output/browser/outputActions.ts index ef5827ccc68..63b185ccca6 100644 --- a/src/vs/workbench/parts/output/browser/outputActions.ts +++ b/src/vs/workbench/parts/output/browser/outputActions.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 { IAction, Action } from 'vs/base/common/actions'; import { IOutputService, OUTPUT_PANEL_ID, IOutputChannelRegistry, Extensions as OutputExt, IOutputChannelIdentifier, COMMAND_OPEN_LOG_VIEWER } from 'vs/workbench/parts/output/common/output'; import { SelectActionItem } from 'vs/base/browser/ui/actionbar/actionbar'; diff --git a/src/vs/workbench/parts/output/browser/outputPanel.ts b/src/vs/workbench/parts/output/browser/outputPanel.ts index 36673ad91e0..49df95b8213 100644 --- a/src/vs/workbench/parts/output/browser/outputPanel.ts +++ b/src/vs/workbench/parts/output/browser/outputPanel.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./media/output'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { TPromise } from 'vs/base/common/winjs.base'; import { Action, IAction } from 'vs/base/common/actions'; import { Builder } from 'vs/base/browser/builder'; diff --git a/src/vs/workbench/parts/output/common/outputLinkComputer.ts b/src/vs/workbench/parts/output/common/outputLinkComputer.ts index 6e5d56cac14..db4ce9514bc 100644 --- a/src/vs/workbench/parts/output/common/outputLinkComputer.ts +++ b/src/vs/workbench/parts/output/common/outputLinkComputer.ts @@ -8,9 +8,9 @@ import { IMirrorModel, IWorkerContext } from 'vs/editor/common/services/editorSi import { ILink } from 'vs/editor/common/modes'; import { TPromise } from 'vs/base/common/winjs.base'; import URI from 'vs/base/common/uri'; -import * as paths from 'vs/base/common/paths'; -import * as strings from 'vs/base/common/strings'; -import * as arrays from 'vs/base/common/arrays'; +import paths = require('vs/base/common/paths'); +import strings = require('vs/base/common/strings'); +import arrays = require('vs/base/common/arrays'); import { Range } from 'vs/editor/common/core/range'; export interface ICreateData { diff --git a/src/vs/workbench/parts/output/electron-browser/output.contribution.ts b/src/vs/workbench/parts/output/electron-browser/output.contribution.ts index d021457b56a..8cd778e2742 100644 --- a/src/vs/workbench/parts/output/electron-browser/output.contribution.ts +++ b/src/vs/workbench/parts/output/electron-browser/output.contribution.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 { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes'; import { ModesRegistry } from 'vs/editor/common/modes/modesRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; diff --git a/src/vs/workbench/parts/preferences/common/preferencesContribution.ts b/src/vs/workbench/parts/preferences/common/preferencesContribution.ts index adf1fc4a589..59264b38885 100644 --- a/src/vs/workbench/parts/preferences/common/preferencesContribution.ts +++ b/src/vs/workbench/parts/preferences/common/preferencesContribution.ts @@ -9,7 +9,7 @@ import { IModeService } from 'vs/editor/common/services/modeService'; import URI from 'vs/base/common/uri'; import { TPromise } from 'vs/base/common/winjs.base'; import { ITextModel } from 'vs/editor/common/model'; -import * as JSONContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; +import JSONContributionRegistry = require('vs/platform/jsonschemas/common/jsonContributionRegistry'); import { Registry } from 'vs/platform/registry/common/platform'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts index 14bdf5c4007..ed70881eb6d 100644 --- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts @@ -6,9 +6,9 @@ 'use strict'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; -import * as arrays from 'vs/base/common/arrays'; -import * as types from 'vs/base/common/types'; +import nls = require('vs/nls'); +import arrays = require('vs/base/common/arrays'); +import types = require('vs/base/common/types'); import { language, LANGUAGE_DEFAULT } from 'vs/base/common/platform'; import { Action } from 'vs/base/common/actions'; import { Mode, IEntryRunContext, IAutoFocus, IModel, IQuickNavigateConfiguration } from 'vs/base/parts/quickopen/common/quickOpen'; diff --git a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts index e3a9986b44d..7f6eff267f2 100644 --- a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts @@ -7,14 +7,14 @@ import 'vs/css!./media/gotoSymbolHandler'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; -import * as errors from 'vs/base/common/errors'; -import * as types from 'vs/base/common/types'; -import * as strings from 'vs/base/common/strings'; +import nls = require('vs/nls'); +import errors = require('vs/base/common/errors'); +import types = require('vs/base/common/types'); +import strings = require('vs/base/common/strings'); import { IEntryRunContext, Mode, IAutoFocus } from 'vs/base/parts/quickopen/common/quickOpen'; import { QuickOpenModel, IHighlight } from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { QuickOpenHandler, EditorQuickOpenEntryGroup, QuickOpenAction } from 'vs/workbench/browser/quickopen'; -import * as filters from 'vs/base/common/filters'; +import filters = require('vs/base/common/filters'); import { IEditor, IDiffEditorModel, IEditorViewState, ScrollType } from 'vs/editor/common/editorCommon'; import { IModelDecorationsChangeAccessor, OverviewRulerLane, IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; diff --git a/src/vs/workbench/parts/quickopen/browser/helpHandler.ts b/src/vs/workbench/parts/quickopen/browser/helpHandler.ts index 51881cef7dd..74f072cd22f 100644 --- a/src/vs/workbench/parts/quickopen/browser/helpHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/helpHandler.ts @@ -5,8 +5,8 @@ 'use strict'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; -import * as types from 'vs/base/common/types'; +import nls = require('vs/nls'); +import types = require('vs/base/common/types'); import { Registry } from 'vs/platform/registry/common/platform'; import { Mode, IEntryRunContext, IAutoFocus } from 'vs/base/parts/quickopen/common/quickOpen'; import { QuickOpenModel, QuickOpenEntryGroup } from 'vs/base/parts/quickopen/browser/quickOpenModel'; diff --git a/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts b/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts index be4d6379082..da5c860d362 100644 --- a/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts +++ b/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts @@ -5,8 +5,8 @@ 'use strict'; -import * as env from 'vs/base/common/platform'; -import * as nls from 'vs/nls'; +import env = require('vs/base/common/platform'); +import nls = require('vs/nls'); import { QuickOpenHandlerDescriptor, IQuickOpenRegistry, Extensions as QuickOpenExtensions } from 'vs/workbench/browser/quickopen'; import { Registry } from 'vs/platform/registry/common/platform'; import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; diff --git a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts index 6c164a8125b..b0a5d7c8035 100644 --- a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts @@ -5,8 +5,8 @@ 'use strict'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; -import * as errors from 'vs/base/common/errors'; +import nls = require('vs/nls'); +import errors = require('vs/base/common/errors'); import { Mode, IEntryRunContext, IAutoFocus, IQuickNavigateConfiguration, IModel } from 'vs/base/parts/quickopen/common/quickOpen'; import { QuickOpenModel, QuickOpenEntryGroup, QuickOpenEntry } from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { QuickOpenHandler, QuickOpenAction } from 'vs/workbench/browser/quickopen'; diff --git a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts index 08990db7e5d..976d3a4a675 100644 --- a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts +++ b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import 'vs/css!./media/dirtydiffDecorator'; import { ThrottledDelayer, always } from 'vs/base/common/async'; @@ -25,6 +25,7 @@ import { ISCMService, ISCMRepository } from 'vs/workbench/services/scm/common/sc import { ModelDecorationOptions } from 'vs/editor/common/model/textModel'; import { registerThemingParticipant, ITheme, ICssStyleCollector, themeColorFromId, IThemeService } from 'vs/platform/theme/common/themeService'; import { registerColor } from 'vs/platform/theme/common/colorRegistry'; +import { localize } from 'vs/nls'; import { Color, RGBA } from 'vs/base/common/color'; import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser'; import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions'; @@ -256,8 +257,8 @@ class DirtyDiffWidget extends PeekViewWidget { private renderTitle(): void { const detail = this.model.changes.length > 1 - ? nls.localize('changes', "{0} of {1} changes", this.index + 1, this.model.changes.length) - : nls.localize('change', "{0} of {1} change", this.index + 1, this.model.changes.length); + ? localize('changes', "{0} of {1} changes", this.index + 1, this.model.changes.length) + : localize('change', "{0} of {1} change", this.index + 1, this.model.changes.length); this.setTitle(this.title, detail); } @@ -771,19 +772,19 @@ export const editorGutterModifiedBackground = registerColor('editorGutter.modifi dark: new Color(new RGBA(12, 125, 157)), light: new Color(new RGBA(102, 175, 224)), hc: new Color(new RGBA(0, 73, 122)) -}, nls.localize('editorGutterModifiedBackground', "Editor gutter background color for lines that are modified.")); +}, localize('editorGutterModifiedBackground', "Editor gutter background color for lines that are modified.")); export const editorGutterAddedBackground = registerColor('editorGutter.addedBackground', { dark: new Color(new RGBA(88, 124, 12)), light: new Color(new RGBA(129, 184, 139)), hc: new Color(new RGBA(27, 82, 37)) -}, nls.localize('editorGutterAddedBackground', "Editor gutter background color for lines that are added.")); +}, localize('editorGutterAddedBackground', "Editor gutter background color for lines that are added.")); export const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackground', { dark: new Color(new RGBA(148, 21, 27)), light: new Color(new RGBA(202, 75, 81)), hc: new Color(new RGBA(141, 14, 20)) -}, nls.localize('editorGutterDeletedBackground', "Editor gutter background color for lines that are deleted.")); +}, localize('editorGutterDeletedBackground', "Editor gutter background color for lines that are deleted.")); const overviewRulerDefault = new Color(new RGBA(0, 122, 204, 0.6)); export const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground', { dark: overviewRulerDefault, light: overviewRulerDefault, hc: overviewRulerDefault }, nls.localize('overviewRulerModifiedForeground', 'Overview ruler marker color for modified content.')); diff --git a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts index 3f0669240a6..66d1bbec1ba 100644 --- a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts +++ b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts @@ -7,9 +7,9 @@ import * as arrays from 'vs/base/common/arrays'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { ThrottledDelayer } from 'vs/base/common/async'; -import * as types from 'vs/base/common/types'; +import types = require('vs/base/common/types'); import { IAutoFocus } from 'vs/base/parts/quickopen/common/quickOpen'; import { QuickOpenEntry, QuickOpenModel, QuickOpenItemAccessor } from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { QuickOpenHandler } from 'vs/workbench/browser/quickopen'; diff --git a/src/vs/workbench/parts/search/browser/openFileHandler.ts b/src/vs/workbench/parts/search/browser/openFileHandler.ts index 7fa00c00bb2..4fd687bbdba 100644 --- a/src/vs/workbench/parts/search/browser/openFileHandler.ts +++ b/src/vs/workbench/parts/search/browser/openFileHandler.ts @@ -5,10 +5,10 @@ 'use strict'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as errors from 'vs/base/common/errors'; -import * as nls from 'vs/nls'; -import * as paths from 'vs/base/common/paths'; -import * as labels from 'vs/base/common/labels'; +import errors = require('vs/base/common/errors'); +import nls = require('vs/nls'); +import paths = require('vs/base/common/paths'); +import labels = require('vs/base/common/labels'); import * as objects from 'vs/base/common/objects'; import { defaultGenerator } from 'vs/base/common/idGenerator'; import URI from 'vs/base/common/uri'; diff --git a/src/vs/workbench/parts/search/browser/openSymbolHandler.ts b/src/vs/workbench/parts/search/browser/openSymbolHandler.ts index a71f2e51e8b..084985f0d68 100644 --- a/src/vs/workbench/parts/search/browser/openSymbolHandler.ts +++ b/src/vs/workbench/parts/search/browser/openSymbolHandler.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import URI from 'vs/base/common/uri'; import { TPromise } from 'vs/base/common/winjs.base'; import { onUnexpectedError } from 'vs/base/common/errors'; @@ -12,11 +12,11 @@ import { ThrottledDelayer } from 'vs/base/common/async'; import { QuickOpenHandler, EditorQuickOpenEntry } from 'vs/workbench/browser/quickopen'; import { QuickOpenModel, QuickOpenEntry, compareEntries } from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { IAutoFocus, Mode, IEntryRunContext } from 'vs/base/parts/quickopen/common/quickOpen'; -import * as filters from 'vs/base/common/filters'; -import * as strings from 'vs/base/common/strings'; +import filters = require('vs/base/common/filters'); +import strings = require('vs/base/common/strings'); import { Range } from 'vs/editor/common/core/range'; import { EditorInput, IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor'; -import * as labels from 'vs/base/common/labels'; +import labels = require('vs/base/common/labels'); import { SymbolInformation, symbolKindToCssClass } from 'vs/editor/common/modes'; import { IResourceInput } from 'vs/platform/editor/common/editor'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; diff --git a/src/vs/workbench/parts/search/browser/patternInputWidget.ts b/src/vs/workbench/parts/search/browser/patternInputWidget.ts index c83d533c470..670cd1b63df 100644 --- a/src/vs/workbench/parts/search/browser/patternInputWidget.ts +++ b/src/vs/workbench/parts/search/browser/patternInputWidget.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 dom from 'vs/base/browser/dom'; import { $ } from 'vs/base/browser/builder'; import { Widget } from 'vs/base/browser/ui/widget'; diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts index f2b1e304fcb..76608dee1a9 100644 --- a/src/vs/workbench/parts/search/browser/searchActions.ts +++ b/src/vs/workbench/parts/search/browser/searchActions.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as nls from 'vs/nls'; -import * as DOM from 'vs/base/browser/dom'; +import nls = require('vs/nls'); +import DOM = require('vs/base/browser/dom'); import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts index 7a1f6428a67..2f76419d992 100644 --- a/src/vs/workbench/parts/search/browser/searchView.ts +++ b/src/vs/workbench/parts/search/browser/searchView.ts @@ -6,17 +6,17 @@ 'use strict'; import 'vs/css!./media/searchview'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { TPromise } from 'vs/base/common/winjs.base'; import { Emitter, debounceEvent } from 'vs/base/common/event'; -import * as errors from 'vs/base/common/errors'; -import * as aria from 'vs/base/browser/ui/aria/aria'; -import * as env from 'vs/base/common/platform'; +import errors = require('vs/base/common/errors'); +import aria = require('vs/base/browser/ui/aria/aria'); +import env = require('vs/base/common/platform'); import { Delayer } from 'vs/base/common/async'; import URI from 'vs/base/common/uri'; -import * as strings from 'vs/base/common/strings'; +import strings = require('vs/base/common/strings'); import * as paths from 'vs/base/common/paths'; -import * as dom from 'vs/base/browser/dom'; +import dom = require('vs/base/browser/dom'); import { IAction } from 'vs/base/common/actions'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { Dimension, Builder, $ } from 'vs/base/browser/builder'; diff --git a/src/vs/workbench/parts/search/common/queryBuilder.ts b/src/vs/workbench/parts/search/common/queryBuilder.ts index d0a998f9117..deef62eeff5 100644 --- a/src/vs/workbench/parts/search/common/queryBuilder.ts +++ b/src/vs/workbench/parts/search/common/queryBuilder.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import * as arrays from 'vs/base/common/arrays'; import * as objects from 'vs/base/common/objects'; import * as collections from 'vs/base/common/collections'; diff --git a/src/vs/workbench/parts/search/common/searchModel.ts b/src/vs/workbench/parts/search/common/searchModel.ts index ac9827a3d67..f3c082d5418 100644 --- a/src/vs/workbench/parts/search/common/searchModel.ts +++ b/src/vs/workbench/parts/search/common/searchModel.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as objects from 'vs/base/common/objects'; -import * as strings from 'vs/base/common/strings'; -import * as errors from 'vs/base/common/errors'; +import objects = require('vs/base/common/objects'); +import strings = require('vs/base/common/strings'); +import errors = require('vs/base/common/errors'); import { RunOnceScheduler } from 'vs/base/common/async'; import { IDisposable, Disposable } from 'vs/base/common/lifecycle'; import { TPromise, PPromise } from 'vs/base/common/winjs.base'; diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts index cadef3fe815..8bbf528a622 100644 --- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts +++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts @@ -10,7 +10,7 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor } from 'vs/workbench/browser/viewlet'; import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry'; -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 objects from 'vs/base/common/objects'; diff --git a/src/vs/workbench/parts/tasks/browser/taskQuickOpen.ts b/src/vs/workbench/parts/tasks/browser/taskQuickOpen.ts index dfeecaf8114..5fbfbfda928 100644 --- a/src/vs/workbench/parts/tasks/browser/taskQuickOpen.ts +++ b/src/vs/workbench/parts/tasks/browser/taskQuickOpen.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { TPromise } from 'vs/base/common/winjs.base'; -import * as QuickOpen from 'vs/base/parts/quickopen/common/quickOpen'; -import * as Model from 'vs/base/parts/quickopen/browser/quickOpenModel'; +import QuickOpen = require('vs/base/parts/quickopen/common/quickOpen'); +import Model = require('vs/base/parts/quickopen/browser/quickOpenModel'); import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { CustomTask, ContributedTask } from 'vs/workbench/parts/tasks/common/tasks'; diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts index 01abcbacd37..2e146f15556 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts @@ -50,7 +50,7 @@ import { IDialogService, IConfirmationResult } from 'vs/platform/dialogs/common/ import { IModelService } from 'vs/editor/common/services/modelService'; -import * as jsonContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; +import jsonContributionRegistry = require('vs/platform/jsonschemas/common/jsonContributionRegistry'); import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { IStatusbarItem, IStatusbarRegistry, Extensions as StatusbarExtensions, StatusbarItemDescriptor, StatusbarAlignment } from 'vs/workbench/browser/parts/statusbar/statusbar'; diff --git a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts index 544a50ee537..467824c5aa6 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as fs from 'fs'; -import * as path from 'path'; +import fs = require('fs'); +import path = require('path'); import * as nls from 'vs/nls'; import * as Objects from 'vs/base/common/objects'; diff --git a/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts b/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts index 8169d1f3c8c..719ba96a196 100644 --- a/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts +++ b/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import * as Objects from 'vs/base/common/objects'; import * as Paths from 'vs/base/common/paths'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as Strings from 'vs/base/common/strings'; -import * as Collections from 'vs/base/common/collections'; +import Strings = require('vs/base/common/strings'); +import Collections = require('vs/base/common/collections'); import { CommandOptions, Source, ErrorData } from 'vs/base/common/processes'; import { LineProcess } from 'vs/base/node/processes'; diff --git a/src/vs/workbench/parts/tasks/node/taskConfiguration.ts b/src/vs/workbench/parts/tasks/node/taskConfiguration.ts index 1e7e48d3ad0..16a3fa04182 100644 --- a/src/vs/workbench/parts/tasks/node/taskConfiguration.ts +++ b/src/vs/workbench/parts/tasks/node/taskConfiguration.ts @@ -6,7 +6,7 @@ import * as crypto from 'crypto'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import * as Objects from 'vs/base/common/objects'; import { IStringDictionary } from 'vs/base/common/collections'; diff --git a/src/vs/workbench/parts/tasks/test/common/problemMatcher.test.ts b/src/vs/workbench/parts/tasks/test/common/problemMatcher.test.ts index bcd4fce0e9a..f38ccaafc6c 100644 --- a/src/vs/workbench/parts/tasks/test/common/problemMatcher.test.ts +++ b/src/vs/workbench/parts/tasks/test/common/problemMatcher.test.ts @@ -6,7 +6,7 @@ import * as matchers from 'vs/workbench/parts/tasks/common/problemMatcher'; -import * as assert from 'assert'; +import assert = require('assert'); import { ValidationState, IProblemReporter, ValidationStatus } from 'vs/base/common/parsers'; class ProblemReporter implements IProblemReporter { diff --git a/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts b/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts index 984073baa7c..1ba6c79b538 100644 --- a/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts +++ b/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { TPromise } from 'vs/base/common/winjs.base'; import { Mode, IEntryRunContext, IAutoFocus, IQuickNavigateConfiguration, IModel } from 'vs/base/parts/quickopen/common/quickOpen'; import { QuickOpenModel, QuickOpenEntry } from 'vs/base/parts/quickopen/browser/quickOpenModel'; diff --git a/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts b/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts index a7a47484d4c..433272699ff 100644 --- a/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts +++ b/src/vs/workbench/parts/themes/test/electron-browser/themes.test.contribution.ts @@ -6,10 +6,10 @@ '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 { IModeService } from 'vs/editor/common/services/modeService'; -import * as pfs from 'vs/base/node/pfs'; +import pfs = require('vs/base/node/pfs'); import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { IWorkbenchThemeService, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService'; diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts index 7c3778b417b..6e56a592cd0 100644 --- a/src/vs/workbench/parts/update/electron-browser/update.ts +++ b/src/vs/workbench/parts/update/electron-browser/update.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import severity from 'vs/base/common/severity'; import { TPromise } from 'vs/base/common/winjs.base'; import { IAction, Action } from 'vs/base/common/actions'; diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts index 6b5220bb581..f0cc4fa7d2d 100644 --- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts +++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts @@ -19,7 +19,7 @@ import { IPartService, Parts } from 'vs/workbench/services/part/common/partServi import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; -import * as DOM from 'vs/base/browser/dom'; +import DOM = require('vs/base/browser/dom'); import { Event, Emitter } from 'vs/base/common/event'; import { WebviewInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput'; import URI from 'vs/base/common/uri'; diff --git a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts b/src/vs/workbench/services/backup/test/node/backupFileService.test.ts index aa59da270d7..6641fec762d 100644 --- a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts +++ b/src/vs/workbench/services/backup/test/node/backupFileService.test.ts @@ -7,11 +7,11 @@ import * as assert from 'assert'; import * as platform from 'vs/base/common/platform'; -import * as crypto from 'crypto'; -import * as os from 'os'; -import * as fs from 'fs'; -import * as path from 'path'; -import * as pfs from 'vs/base/node/pfs'; +import crypto = require('crypto'); +import os = require('os'); +import fs = require('fs'); +import path = require('path'); +import pfs = require('vs/base/node/pfs'); import Uri from 'vs/base/common/uri'; import { BackupFileService, BackupFilesModel } from 'vs/workbench/services/backup/node/backupFileService'; import { FileService } from 'vs/workbench/services/files/node/fileService'; diff --git a/src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts b/src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts index 0712f46945d..0b3f7b976e8 100644 --- a/src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts +++ b/src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts @@ -6,10 +6,10 @@ 'use strict'; import * as sinon from 'sinon'; -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 * as json from 'vs/base/common/json'; import { TPromise } from 'vs/base/common/winjs.base'; import { Registry } from 'vs/platform/registry/common/platform'; @@ -17,9 +17,9 @@ import { ParsedArgs, IEnvironmentService } from 'vs/platform/environment/common/ import { parseArgs } from 'vs/platform/environment/node/argv'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; -import * as extfs from 'vs/base/node/extfs'; +import extfs = require('vs/base/node/extfs'); import { TestTextFileService, TestTextResourceConfigurationService, workbenchInstantiationService, TestLifecycleService, TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices'; -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 { WorkspaceService } from 'vs/workbench/services/configuration/node/configurationService'; import { FileService } from 'vs/workbench/services/files/node/fileService'; diff --git a/src/vs/workbench/services/configuration/test/node/configurationService.test.ts b/src/vs/workbench/services/configuration/test/node/configurationService.test.ts index b099e02c1b3..60162c0285a 100644 --- a/src/vs/workbench/services/configuration/test/node/configurationService.test.ts +++ b/src/vs/workbench/services/configuration/test/node/configurationService.test.ts @@ -16,8 +16,8 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { ParsedArgs, IEnvironmentService } from 'vs/platform/environment/common/environment'; import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; import { parseArgs } from 'vs/platform/environment/node/argv'; -import * as pfs from 'vs/base/node/pfs'; -import * as uuid from 'vs/base/common/uuid'; +import pfs = require('vs/base/node/pfs'); +import uuid = require('vs/base/common/uuid'); import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry'; import { WorkspaceService } from 'vs/workbench/services/configuration/node/configurationService'; import { ConfigurationEditingErrorCode } from 'vs/workbench/services/configuration/node/configurationEditingService'; @@ -34,6 +34,7 @@ import { IJSONEditingService } from 'vs/workbench/services/configuration/common/ import { JSONEditingService } from 'vs/workbench/services/configuration/node/jsonEditingService'; import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; import { IWindowConfiguration } from 'vs/platform/windows/common/windows'; +import { mkdirp } from 'vs/base/node/pfs'; class SettingsTestEnvironmentService extends EnvironmentService { @@ -53,7 +54,7 @@ function setUpFolderWorkspace(folderName: string): TPromise<{ parentDir: string, function setUpFolder(folderName: string, parentDir: string): TPromise { const folderDir = path.join(parentDir, folderName); const workspaceSettingsDir = path.join(folderDir, '.vscode'); - return pfs.mkdirp(workspaceSettingsDir, 493).then(() => folderDir); + return mkdirp(workspaceSettingsDir, 493).then(() => folderDir); } function setUpWorkspace(folders: string[]): TPromise<{ parentDir: string, configPath: string }> { @@ -61,7 +62,7 @@ function setUpWorkspace(folders: string[]): TPromise<{ parentDir: string, config const id = uuid.generateUuid(); const parentDir = path.join(os.tmpdir(), 'vsctests', id); - return pfs.mkdirp(parentDir, 493) + return mkdirp(parentDir, 493) .then(() => { const configPath = path.join(parentDir, 'vsctests.code-workspace'); const workspace = { folders: folders.map(path => ({ path })) }; diff --git a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts index ddbc43f5c6d..fd97b00746e 100644 --- a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts +++ b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts @@ -3,9 +3,9 @@ * 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 uri from 'vs/base/common/uri'; -import * as platform from 'vs/base/common/platform'; +import platform = require('vs/base/common/platform'); import { TPromise } from 'vs/base/common/winjs.base'; import { IConfigurationService, getConfigurationValue, IConfigurationOverrides } from 'vs/platform/configuration/common/configuration'; import { ICommandService } from 'vs/platform/commands/common/commands'; diff --git a/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts b/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts index 5c323ca2409..57252e48c5f 100644 --- a/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts +++ b/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts @@ -8,7 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IAction, IActionRunner, ActionRunner } from 'vs/base/common/actions'; import { Separator } from 'vs/base/browser/ui/actionbar/actionbar'; -import * as dom from 'vs/base/browser/dom'; +import dom = require('vs/base/browser/dom'); import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; diff --git a/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts b/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts index 4778b3aa678..931cad44526 100644 --- a/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts +++ b/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { onUnexpectedError } from 'vs/base/common/errors'; import { assign, deepClone } from 'vs/base/common/objects'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts b/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts index df621fb08e1..633bfa6e462 100644 --- a/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts +++ b/src/vs/workbench/services/dialogs/electron-browser/dialogService.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import product from 'vs/platform/node/product'; import { TPromise } from 'vs/base/common/winjs.base'; import Severity from 'vs/base/common/severity'; diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts index c3e448321af..5ddaced115d 100644 --- a/src/vs/workbench/services/editor/common/editorService.ts +++ b/src/vs/workbench/services/editor/common/editorService.ts @@ -16,7 +16,7 @@ import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorIn import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { getPathLabel } from 'vs/base/common/labels'; import { ResourceMap } from 'vs/base/common/map'; import { once } from 'vs/base/common/event'; diff --git a/src/vs/workbench/services/editor/test/browser/editorService.test.ts b/src/vs/workbench/services/editor/test/browser/editorService.test.ts index eb440a5a1f5..e83cf741b00 100644 --- a/src/vs/workbench/services/editor/test/browser/editorService.test.ts +++ b/src/vs/workbench/services/editor/test/browser/editorService.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import { Promise, TPromise } from 'vs/base/common/winjs.base'; -import * as paths from 'vs/base/common/paths'; +import paths = require('vs/base/common/paths'); import { Position, IEditor, IEditorInput } from 'vs/platform/editor/common/editor'; import URI from 'vs/base/common/uri'; import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; diff --git a/src/vs/workbench/services/files/electron-browser/fileService.ts b/src/vs/workbench/services/files/electron-browser/fileService.ts index fc90d82cce0..792392e656a 100644 --- a/src/vs/workbench/services/files/electron-browser/fileService.ts +++ b/src/vs/workbench/services/files/electron-browser/fileService.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { TPromise } from 'vs/base/common/winjs.base'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; -import * as paths from 'vs/base/common/paths'; -import * as encoding from 'vs/base/node/encoding'; -import * as errors from 'vs/base/common/errors'; +import paths = require('vs/base/common/paths'); +import encoding = require('vs/base/node/encoding'); +import errors = require('vs/base/common/errors'); import uri from 'vs/base/common/uri'; import { FileOperation, FileOperationEvent, IFileService, IFilesConfiguration, IResolveFileOptions, IFileStat, IResolveFileResult, IContent, IStreamContent, IImportResult, IResolveContentOptions, IUpdateContentOptions, FileChangesEvent, ICreateFileOptions, ITextSnapshot } from 'vs/platform/files/common/files'; import { FileService as NodeFileService, IFileServiceOptions, IEncodingOverride } from 'vs/workbench/services/files/node/fileService'; diff --git a/src/vs/workbench/services/files/node/fileService.ts b/src/vs/workbench/services/files/node/fileService.ts index f1940e96c97..aa07cc42f62 100644 --- a/src/vs/workbench/services/files/node/fileService.ts +++ b/src/vs/workbench/services/files/node/fileService.ts @@ -5,30 +5,30 @@ 'use strict'; -import * as paths from 'path'; -import * as fs from 'fs'; -import * as os from 'os'; -import * as crypto from 'crypto'; -import * as assert from 'assert'; +import paths = require('path'); +import fs = require('fs'); +import os = require('os'); +import crypto = require('crypto'); +import assert = require('assert'); import { isParent, FileOperation, FileOperationEvent, IContent, IFileService, IResolveFileOptions, IResolveFileResult, IResolveContentOptions, IFileStat, IStreamContent, FileOperationError, FileOperationResult, IUpdateContentOptions, FileChangeType, IImportResult, FileChangesEvent, ICreateFileOptions, IContentData, ITextSnapshot } from 'vs/platform/files/common/files'; import { MAX_FILE_SIZE, MAX_HEAP_SIZE } from 'vs/platform/files/node/files'; import { isEqualOrParent } from 'vs/base/common/paths'; import { ResourceMap } from 'vs/base/common/map'; -import * as arrays from 'vs/base/common/arrays'; -import * as baseMime from 'vs/base/common/mime'; +import arrays = require('vs/base/common/arrays'); +import baseMime = require('vs/base/common/mime'); import { TPromise } from 'vs/base/common/winjs.base'; -import * as objects from 'vs/base/common/objects'; -import * as extfs from 'vs/base/node/extfs'; +import objects = require('vs/base/common/objects'); +import extfs = require('vs/base/node/extfs'); import { nfcall, ThrottledDelayer } from 'vs/base/common/async'; import uri from 'vs/base/common/uri'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { isWindows, isLinux } from 'vs/base/common/platform'; import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace'; -import * as pfs from 'vs/base/node/pfs'; -import * as encoding from 'vs/base/node/encoding'; +import pfs = require('vs/base/node/pfs'); +import encoding = require('vs/base/node/encoding'); import { detectMimeAndEncodingFromBuffer, IMimeAndEncoding } from 'vs/base/node/mime'; -import * as flow from 'vs/base/node/flow'; +import flow = require('vs/base/node/flow'); import { FileWatcher as UnixWatcherService } from 'vs/workbench/services/files/node/watcher/unix/watcherService'; import { FileWatcher as WindowsWatcherService } from 'vs/workbench/services/files/node/watcher/win32/watcherService'; import { toFileChangesEvent, normalize, IRawFileChange } from 'vs/workbench/services/files/node/watcher/common'; @@ -40,7 +40,9 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment' import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation'; import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { getBaseLabel } from 'vs/base/common/labels'; +import { assign } from 'vs/base/common/objects'; import { Readable } from 'stream'; +import { IWriteFileOptions, IStatAndLink } from 'vs/base/node/extfs'; import { Schemas } from 'vs/base/common/network'; export interface IEncodingOverride { @@ -600,7 +602,7 @@ export class FileService implements IFileService { let writeFilePromise: TPromise; // Configure encoding related options as needed - const writeFileOptions: extfs.IWriteFileOptions = options ? options : Object.create(null); + const writeFileOptions: IWriteFileOptions = options ? options : Object.create(null); if (addBOM || encodingToWrite !== encoding.UTF8) { writeFileOptions.encoding = { charset: encodingToWrite, @@ -652,7 +654,7 @@ export class FileService implements IFileService { // 1.) check file return this.checkFile(absolutePath, options, options.overwriteReadonly /* ignore readonly if we overwrite readonly, this is handled via sudo later */).then(exists => { - const writeOptions: IUpdateContentOptions = objects.assign(Object.create(null), options); + const writeOptions: IUpdateContentOptions = assign(Object.create(null), options); writeOptions.writeElevated = false; writeOptions.encoding = this.getEncoding(resource, options.encoding); @@ -1239,7 +1241,7 @@ export class StatResolver { extfs.statLink(fileResource.fsPath, this); }, - function countChildren(this: any, statAndLink: extfs.IStatAndLink): void { + function countChildren(this: any, statAndLink: IStatAndLink): void { fileStat = statAndLink.stat; isSymbolicLink = statAndLink.isSymbolicLink; diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts b/src/vs/workbench/services/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts index 9989927187b..7bd7841010c 100644 --- a/src/vs/workbench/services/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts +++ b/src/vs/workbench/services/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts @@ -5,8 +5,8 @@ 'use strict'; -import * as assert from 'assert'; -import * as platform from 'vs/base/common/platform'; +import assert = require('assert'); +import platform = require('vs/base/common/platform'); import { NsfwWatcherService } from 'vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService'; import { IWatcherRequest } from 'vs/workbench/services/files/node/watcher/nsfw/watcher'; diff --git a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts index 191689d3615..80265380b4c 100644 --- a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts +++ b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts @@ -5,19 +5,19 @@ 'use strict'; -import * as chokidar from 'vscode-chokidar'; -import * as fs from 'fs'; +import chokidar = require('vscode-chokidar'); +import fs = require('fs'); -import * as gracefulFs from 'graceful-fs'; +import gracefulFs = require('graceful-fs'); gracefulFs.gracefulify(fs); import { TPromise } from 'vs/base/common/winjs.base'; import { FileChangeType } from 'vs/platform/files/common/files'; import { ThrottledDelayer } from 'vs/base/common/async'; -import * as strings from 'vs/base/common/strings'; +import strings = require('vs/base/common/strings'); import { realcaseSync } from 'vs/base/node/extfs'; import { isMacintosh } from 'vs/base/common/platform'; -import * as watcher from 'vs/workbench/services/files/node/watcher/common'; +import watcher = require('vs/workbench/services/files/node/watcher/common'); import { IWatcherRequest, IWatcherService } from 'vs/workbench/services/files/node/watcher/unix/watcher'; export class ChokidarWatcherService implements IWatcherService { diff --git a/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts b/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts index 949c3d1b36f..c86b93d43b7 100644 --- a/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts +++ b/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts @@ -5,11 +5,11 @@ 'use strict'; -import * as cp from 'child_process'; +import cp = require('child_process'); import { FileChangeType } from 'vs/platform/files/common/files'; -import * as decoder from 'vs/base/node/decoder'; -import * as glob from 'vs/base/common/glob'; +import decoder = require('vs/base/node/decoder'); +import glob = require('vs/base/common/glob'); import uri from 'vs/base/common/uri'; import { IRawFileChange } from 'vs/workbench/services/files/node/watcher/common'; diff --git a/src/vs/workbench/services/files/test/node/fileService.test.ts b/src/vs/workbench/services/files/test/node/fileService.test.ts index e526018a866..7e237246eca 100644 --- a/src/vs/workbench/services/files/test/node/fileService.test.ts +++ b/src/vs/workbench/services/files/test/node/fileService.test.ts @@ -5,19 +5,19 @@ 'use strict'; -import * as fs from 'fs'; -import * as path from 'path'; -import * as os from 'os'; -import * as assert from 'assert'; +import fs = require('fs'); +import path = require('path'); +import os = require('os'); +import assert = require('assert'); import { TPromise } from 'vs/base/common/winjs.base'; import { FileService, IEncodingOverride } from 'vs/workbench/services/files/node/fileService'; import { FileOperation, FileOperationEvent, FileChangesEvent, FileOperationResult, FileOperationError } from 'vs/platform/files/common/files'; import uri from 'vs/base/common/uri'; -import * as uuid from 'vs/base/common/uuid'; -import * as pfs from 'vs/base/node/pfs'; -import * as encodingLib from 'vs/base/node/encoding'; -import * as utils from 'vs/workbench/services/files/test/node/utils'; +import uuid = require('vs/base/common/uuid'); +import pfs = require('vs/base/node/pfs'); +import encodingLib = require('vs/base/node/encoding'); +import utils = require('vs/workbench/services/files/test/node/utils'); import { TestEnvironmentService, TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService } from 'vs/workbench/test/workbenchTestServices'; import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; diff --git a/src/vs/workbench/services/files/test/node/resolver.test.ts b/src/vs/workbench/services/files/test/node/resolver.test.ts index 230d31d4e0f..2d410fd0edc 100644 --- a/src/vs/workbench/services/files/test/node/resolver.test.ts +++ b/src/vs/workbench/services/files/test/node/resolver.test.ts @@ -5,14 +5,14 @@ 'use strict'; -import * as fs from 'fs'; -import * as path from 'path'; -import * as assert from 'assert'; +import fs = require('fs'); +import path = require('path'); +import assert = require('assert'); import { StatResolver } from 'vs/workbench/services/files/node/fileService'; import uri from 'vs/base/common/uri'; import { isLinux } from 'vs/base/common/platform'; -import * as utils from 'vs/workbench/services/files/test/node/utils'; +import utils = require('vs/workbench/services/files/test/node/utils'); function create(relativePath: string): StatResolver { let basePath = require.toUrl('./fixtures/resolver'); diff --git a/src/vs/workbench/services/files/test/node/watcher.test.ts b/src/vs/workbench/services/files/test/node/watcher.test.ts index 175a45b4f40..f22676bd17d 100644 --- a/src/vs/workbench/services/files/test/node/watcher.test.ts +++ b/src/vs/workbench/services/files/test/node/watcher.test.ts @@ -5,9 +5,9 @@ 'use strict'; -import * as assert from 'assert'; +import assert = require('assert'); -import * as platform from 'vs/base/common/platform'; +import platform = require('vs/base/common/platform'); import { FileChangeType, FileChangesEvent } from 'vs/platform/files/common/files'; import uri from 'vs/base/common/uri'; import { IRawFileChange, toFileChangesEvent, normalize } from 'vs/workbench/services/files/node/watcher/common'; diff --git a/src/vs/workbench/services/history/electron-browser/history.ts b/src/vs/workbench/services/history/electron-browser/history.ts index e78bfbc28ca..09012bee37b 100644 --- a/src/vs/workbench/services/history/electron-browser/history.ts +++ b/src/vs/workbench/services/history/electron-browser/history.ts @@ -6,7 +6,7 @@ 'use strict'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import URI from 'vs/base/common/uri'; import { IEditor } from 'vs/editor/common/editorCommon'; import { IEditor as IBaseEditor, IEditorInput, ITextEditorOptions, IResourceInput, ITextEditorSelection, Position as GroupPosition } from 'vs/platform/editor/common/editor'; diff --git a/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.ts b/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.ts index c83c1915ba5..99cf91dfc52 100644 --- a/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.ts +++ b/src/vs/workbench/services/jsonschemas/common/jsonValidationExtensionPoint.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry'; import URI from 'vs/base/common/uri'; -import * as strings from 'vs/base/common/strings'; -import * as paths from 'vs/base/common/paths'; +import strings = require('vs/base/common/strings'); +import paths = require('vs/base/common/paths'); interface IJSONValidationExtensionPoint { fileMatch: string; diff --git a/src/vs/workbench/services/keybinding/test/node/keybindingEditing.test.ts b/src/vs/workbench/services/keybinding/test/node/keybindingEditing.test.ts index 9e7e5d447f1..2279103e197 100644 --- a/src/vs/workbench/services/keybinding/test/node/keybindingEditing.test.ts +++ b/src/vs/workbench/services/keybinding/test/node/keybindingEditing.test.ts @@ -5,20 +5,20 @@ '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 * as json from 'vs/base/common/json'; import { OS } from 'vs/base/common/platform'; import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding'; import { TPromise } from 'vs/base/common/winjs.base'; import { KeyCode, SimpleKeybinding, ChordKeybinding } from 'vs/base/common/keyCodes'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; -import * as extfs from 'vs/base/node/extfs'; +import extfs = require('vs/base/node/extfs'); import { TestTextFileService, TestEditorGroupService, TestLifecycleService, TestBackupFileService, TestContextService, TestTextResourceConfigurationService, TestHashService, TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices'; import { IWorkspaceContextService, Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace'; -import * as uuid from 'vs/base/common/uuid'; +import uuid = require('vs/base/common/uuid'); import { ConfigurationService } from 'vs/platform/configuration/node/configurationService'; import { FileService } from 'vs/workbench/services/files/node/fileService'; import { IFileService } from 'vs/platform/files/common/files'; diff --git a/src/vs/workbench/services/mode/common/workbenchModeService.ts b/src/vs/workbench/services/mode/common/workbenchModeService.ts index e164b951ec1..fef64cb8acc 100644 --- a/src/vs/workbench/services/mode/common/workbenchModeService.ts +++ b/src/vs/workbench/services/mode/common/workbenchModeService.ts @@ -8,7 +8,7 @@ import * as nls from 'vs/nls'; import { onUnexpectedError } from 'vs/base/common/errors'; import * as paths from 'vs/base/common/paths'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as mime from 'vs/base/common/mime'; +import mime = require('vs/base/common/mime'); import { IFilesConfiguration, FILES_ASSOCIATIONS_CONFIG } from 'vs/platform/files/common/files'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; import { IExtensionPointUser, ExtensionMessageCollector, IExtensionPoint, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry'; diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts index f34a176cfe3..9a94a0d8908 100644 --- a/src/vs/workbench/services/progress/browser/progressService.ts +++ b/src/vs/workbench/services/progress/browser/progressService.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as lifecycle from 'vs/base/common/lifecycle'; +import lifecycle = require('vs/base/common/lifecycle'); import { TPromise } from 'vs/base/common/winjs.base'; -import * as types from 'vs/base/common/types'; +import types = require('vs/base/common/types'); import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts index b8efdf24433..6917c8da877 100644 --- a/src/vs/workbench/services/search/node/fileSearch.ts +++ b/src/vs/workbench/services/search/node/fileSearch.ts @@ -8,22 +8,22 @@ import * as childProcess from 'child_process'; import { StringDecoder, NodeStringDecoder } from 'string_decoder'; import { toErrorMessage } from 'vs/base/common/errorMessage'; -import * as fs from 'fs'; -import * as path from 'path'; +import fs = require('fs'); +import path = require('path'); import { isEqualOrParent } from 'vs/base/common/paths'; import { Readable } from 'stream'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as objects from 'vs/base/common/objects'; -import * as arrays from 'vs/base/common/arrays'; -import * as platform from 'vs/base/common/platform'; -import * as strings from 'vs/base/common/strings'; -import * as types from 'vs/base/common/types'; -import * as glob from 'vs/base/common/glob'; +import objects = require('vs/base/common/objects'); +import arrays = require('vs/base/common/arrays'); +import platform = require('vs/base/common/platform'); +import strings = require('vs/base/common/strings'); +import types = require('vs/base/common/types'); +import glob = require('vs/base/common/glob'); import { IProgress, IUncachedSearchStats } from 'vs/platform/search/common/search'; -import * as extfs from 'vs/base/node/extfs'; -import * as flow from 'vs/base/node/flow'; +import extfs = require('vs/base/node/extfs'); +import flow = require('vs/base/node/flow'); import { IRawFileMatch, ISerializedSearchComplete, IRawSearch, ISearchEngine, IFolderSearch } from './search'; import { spawnRipgrepCmd } from './ripgrepFileSearch'; import { rgErrorMsgForDisplay } from './ripgrepTextSearch'; diff --git a/src/vs/workbench/services/search/node/rawSearchService.ts b/src/vs/workbench/services/search/node/rawSearchService.ts index 67548960729..ec7ce943928 100644 --- a/src/vs/workbench/services/search/node/rawSearchService.ts +++ b/src/vs/workbench/services/search/node/rawSearchService.ts @@ -5,15 +5,15 @@ 'use strict'; -import * as fs from 'fs'; +import fs = require('fs'); import { isAbsolute, sep } from 'path'; -import * as gracefulFs from 'graceful-fs'; +import gracefulFs = require('graceful-fs'); gracefulFs.gracefulify(fs); -import * as arrays from 'vs/base/common/arrays'; -import * as objects from 'vs/base/common/objects'; -import * as strings from 'vs/base/common/strings'; +import arrays = require('vs/base/common/arrays'); +import objects = require('vs/base/common/objects'); +import strings = require('vs/base/common/strings'); import { PPromise, TPromise } from 'vs/base/common/winjs.base'; import { FileWalker, Engine as FileSearchEngine } from 'vs/workbench/services/search/node/fileSearch'; import { MAX_FILE_SIZE } from 'vs/platform/files/node/files'; @@ -22,6 +22,7 @@ import { Engine as TextSearchEngine } from 'vs/workbench/services/search/node/te import { TextSearchWorkerProvider } from 'vs/workbench/services/search/node/textSearchWorkerProvider'; import { IRawSearchService, IRawSearch, IRawFileMatch, ISerializedFileMatch, ISerializedSearchProgressItem, ISerializedSearchComplete, ISearchEngine, IFileSearchProgressItem, ITelemetryEvent } from './search'; import { ICachedSearchStats, IProgress } from 'vs/platform/search/common/search'; +import { fuzzyContains } from 'vs/base/common/strings'; import { compareItemsByScore, IItemAccessor, ScorerCache, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer'; export class SearchService implements IRawSearchService { @@ -310,7 +311,7 @@ export class SearchService implements IRawSearchService { let entry = cachedEntries[i]; // Check if this entry is a match for the search value - if (!strings.fuzzyContains(entry.relativePath, normalizedSearchValueLowercase)) { + if (!fuzzyContains(entry.relativePath, normalizedSearchValueLowercase)) { continue; } diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts index 57cb8d2bc06..3351afcca3c 100644 --- a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts +++ b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts @@ -11,8 +11,8 @@ import { StringDecoder, NodeStringDecoder } from 'string_decoder'; import * as cp from 'child_process'; import { rgPath } from 'vscode-ripgrep'; -import * as objects from 'vs/base/common/objects'; -import * as platform from 'vs/base/common/platform'; +import objects = require('vs/base/common/objects'); +import platform = require('vs/base/common/platform'); import * as strings from 'vs/base/common/strings'; import * as paths from 'vs/base/common/paths'; import * as extfs from 'vs/base/node/extfs'; diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts index 3a02d5149fb..8e852c4f266 100644 --- a/src/vs/workbench/services/search/node/searchService.ts +++ b/src/vs/workbench/services/search/node/searchService.ts @@ -6,8 +6,8 @@ import { PPromise, TPromise } from 'vs/base/common/winjs.base'; import uri from 'vs/base/common/uri'; -import * as objects from 'vs/base/common/objects'; -import * as strings from 'vs/base/common/strings'; +import objects = require('vs/base/common/objects'); +import strings = require('vs/base/common/strings'); import { getNextTickChannel } from 'vs/base/parts/ipc/common/ipc'; import { Client, IIPCOptions } from 'vs/base/parts/ipc/node/ipc.cp'; import { IProgress, LineMatch, FileMatch, ISearchComplete, ISearchProgressItem, QueryType, IFileMatch, ISearchQuery, IFolderQuery, ISearchConfiguration, ISearchService, pathIncludedInQuery, ISearchResultProvider } from 'vs/platform/search/common/search'; diff --git a/src/vs/workbench/services/search/node/worker/searchWorker.ts b/src/vs/workbench/services/search/node/worker/searchWorker.ts index a9490a8e459..132dc0be0da 100644 --- a/src/vs/workbench/services/search/node/worker/searchWorker.ts +++ b/src/vs/workbench/services/search/node/worker/searchWorker.ts @@ -6,7 +6,7 @@ 'use strict'; import * as fs from 'fs'; -import * as gracefulFs from 'graceful-fs'; +import gracefulFs = require('graceful-fs'); gracefulFs.gracefulify(fs); import { onUnexpectedError } from 'vs/base/common/errors'; diff --git a/src/vs/workbench/services/search/test/node/ripgrepTextSearch.test.ts b/src/vs/workbench/services/search/test/node/ripgrepTextSearch.test.ts index d13ac108da5..21d189d80c5 100644 --- a/src/vs/workbench/services/search/test/node/ripgrepTextSearch.test.ts +++ b/src/vs/workbench/services/search/test/node/ripgrepTextSearch.test.ts @@ -5,11 +5,11 @@ 'use strict'; -import * as path from 'path'; -import * as assert from 'assert'; +import path = require('path'); +import assert = require('assert'); import * as arrays from 'vs/base/common/arrays'; -import * as platform from 'vs/base/common/platform'; +import platform = require('vs/base/common/platform'); import { RipgrepParser, getAbsoluteGlob, fixDriveC } from 'vs/workbench/services/search/node/ripgrepTextSearch'; import { ISerializedFileMatch } from 'vs/workbench/services/search/node/search'; diff --git a/src/vs/workbench/services/search/test/node/search.test.ts b/src/vs/workbench/services/search/test/node/search.test.ts index c4a69c77005..9aa0a17f54e 100644 --- a/src/vs/workbench/services/search/test/node/search.test.ts +++ b/src/vs/workbench/services/search/test/node/search.test.ts @@ -5,8 +5,8 @@ 'use strict'; -import * as path from 'path'; -import * as assert from 'assert'; +import path = require('path'); +import assert = require('assert'); import { join, normalize } from 'vs/base/common/paths'; import * as platform from 'vs/base/common/platform'; diff --git a/src/vs/workbench/services/search/test/node/searchService.test.ts b/src/vs/workbench/services/search/test/node/searchService.test.ts index c687527d3b3..772f4e1e7bb 100644 --- a/src/vs/workbench/services/search/test/node/searchService.test.ts +++ b/src/vs/workbench/services/search/test/node/searchService.test.ts @@ -6,7 +6,8 @@ 'use strict'; import * as assert from 'assert'; -import * as path from 'path'; +import { normalize } from 'path'; +import path = require('path'); import { IProgress, IUncachedSearchStats } from 'vs/platform/search/common/search'; import { ISearchEngine, IRawSearch, IRawFileMatch, ISerializedFileMatch, ISerializedSearchComplete, IFolderSearch } from 'vs/workbench/services/search/node/search'; @@ -14,7 +15,7 @@ import { SearchService as RawSearchService } from 'vs/workbench/services/search/ import { DiskSearch } from 'vs/workbench/services/search/node/searchService'; const TEST_FOLDER_QUERIES = [ - { folder: path.normalize('/some/where') } + { folder: normalize('/some/where') } ]; const TEST_FIXTURES = path.normalize(require.toUrl('./fixtures')); @@ -84,14 +85,14 @@ suite('SearchService', () => { }; const rawMatch: IRawFileMatch = { - base: path.normalize('/some'), + base: normalize('/some'), relativePath: 'where', basename: 'where', size: 123 }; const match: ISerializedFileMatch = { - path: path.normalize('/some/where') + path: normalize('/some/where') }; test('Individual results', function () { @@ -197,7 +198,7 @@ suite('SearchService', () => { this.timeout(testTimeout); const paths = ['bab', 'bbc', 'abb']; const matches: IRawFileMatch[] = paths.map(relativePath => ({ - base: path.normalize('/some/where'), + base: normalize('/some/where'), relativePath, basename: relativePath, size: 3 @@ -213,7 +214,7 @@ suite('SearchService', () => { maxResults: 2 }, 1).then(() => { assert.notStrictEqual(typeof TestSearchEngine.last.config.maxResults, 'number'); - assert.deepStrictEqual(results, [path.normalize('/some/where/bbc'), path.normalize('/some/where/bab')]); + assert.deepStrictEqual(results, [normalize('/some/where/bbc'), normalize('/some/where/bab')]); }, null, value => { if (Array.isArray(value)) { results.push(...value.map(v => v.path)); @@ -254,7 +255,7 @@ suite('SearchService', () => { this.timeout(testTimeout); const paths = ['bcb', 'bbc', 'aab']; const matches: IRawFileMatch[] = paths.map(relativePath => ({ - base: path.normalize('/some/where'), + base: normalize('/some/where'), relativePath, basename: relativePath, size: 3 @@ -270,7 +271,7 @@ suite('SearchService', () => { cacheKey: 'x' }, -1).then(complete => { assert.strictEqual(complete.stats.fromCache, false); - assert.deepStrictEqual(results, [path.normalize('/some/where/bcb'), path.normalize('/some/where/bbc'), path.normalize('/some/where/aab')]); + assert.deepStrictEqual(results, [normalize('/some/where/bcb'), normalize('/some/where/bbc'), normalize('/some/where/aab')]); }, null, value => { if (Array.isArray(value)) { results.push(...value.map(v => v.path)); @@ -286,7 +287,7 @@ suite('SearchService', () => { cacheKey: 'x' }, -1).then(complete => { assert.ok(complete.stats.fromCache); - assert.deepStrictEqual(results, [path.normalize('/some/where/bcb'), path.normalize('/some/where/bbc')]); + assert.deepStrictEqual(results, [normalize('/some/where/bcb'), normalize('/some/where/bbc')]); }, null, value => { if (Array.isArray(value)) { results.push(...value.map(v => v.path)); @@ -298,7 +299,7 @@ suite('SearchService', () => { return service.clearCache('x'); }).then(() => { matches.push({ - base: path.normalize('/some/where'), + base: normalize('/some/where'), relativePath: 'bc', basename: 'bc', size: 3 @@ -311,7 +312,7 @@ suite('SearchService', () => { cacheKey: 'x' }, -1).then(complete => { assert.strictEqual(complete.stats.fromCache, false); - assert.deepStrictEqual(results, [path.normalize('/some/where/bc')]); + assert.deepStrictEqual(results, [normalize('/some/where/bc')]); }, null, value => { if (Array.isArray(value)) { results.push(...value.map(v => v.path)); diff --git a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts index 7caba25b95e..c50c1e9e158 100644 --- a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts +++ b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts @@ -5,8 +5,8 @@ 'use strict'; -import * as path from 'path'; -import * as assert from 'assert'; +import path = require('path'); +import assert = require('assert'); import * as glob from 'vs/base/common/glob'; import { TPromise } from 'vs/base/common/winjs.base'; diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts index 2dc9ec326c5..3a0fa1c1d20 100644 --- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts +++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts @@ -5,7 +5,7 @@ 'use strict'; import * as path from 'vs/base/common/paths'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { Event, Emitter } from 'vs/base/common/event'; import { TPromise, TValueCallback, ErrorCallback } from 'vs/base/common/winjs.base'; import { onUnexpectedError } from 'vs/base/common/errors'; @@ -13,8 +13,9 @@ import { guessMimeTypes } from 'vs/base/common/mime'; import { toErrorMessage } from 'vs/base/common/errorMessage'; import URI from 'vs/base/common/uri'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; -import * as diagnostics from 'vs/base/common/diagnostics'; -import * as types from 'vs/base/common/types'; +import paths = require('vs/base/common/paths'); +import diagnostics = require('vs/base/common/diagnostics'); +import types = require('vs/base/common/types'); import { IMode } from 'vs/editor/common/modes'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; @@ -292,7 +293,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil if (!!backup) { const content: IRawTextContent = { resource: this.resource, - name: path.basename(this.resource.fsPath), + name: paths.basename(this.resource.fsPath), mtime: Date.now(), etag: void 0, value: createTextBufferFactory(''), /* will be filled later from backup */ @@ -372,7 +373,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil "path": { "classification": "SystemMetaData", "purpose": "FeatureInsight" } } */ - this.telemetryService.publicLog('fileGet', { mimeType: guessMimeTypes(this.resource.fsPath).join(', '), ext: path.extname(this.resource.fsPath), path: this.hashService.createSHA1(this.resource.fsPath) }); + this.telemetryService.publicLog('fileGet', { mimeType: guessMimeTypes(this.resource.fsPath).join(', '), ext: paths.extname(this.resource.fsPath), path: this.hashService.createSHA1(this.resource.fsPath) }); } return model; @@ -724,7 +725,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil "ext": { "classification": "SystemMetaData", "purpose": "FeatureInsight" } } */ - this.telemetryService.publicLog('filePUT', { mimeType: guessMimeTypes(this.resource.fsPath).join(', '), ext: path.extname(this.lastResolvedDiskStat.resource.fsPath) }); + this.telemetryService.publicLog('filePUT', { mimeType: guessMimeTypes(this.resource.fsPath).join(', '), ext: paths.extname(this.lastResolvedDiskStat.resource.fsPath) }); } // Update dirty state unless model has changed meanwhile @@ -772,7 +773,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil // Check for workspace settings file return this.contextService.getWorkspace().folders.some(folder => { - return path.isEqualOrParent(this.resource.fsPath, path.join(folder.uri.fsPath, '.vscode')); + return paths.isEqualOrParent(this.resource.fsPath, path.join(folder.uri.fsPath, '.vscode')); }); } @@ -1084,7 +1085,7 @@ class DefaultSaveErrorHandler implements ISaveErrorHandler { constructor(@INotificationService private notificationService: INotificationService) { } public onSaveError(error: any, model: TextFileEditorModel): void { - this.notificationService.error(nls.localize('genericSaveError', "Failed to save '{0}': {1}", path.basename(model.getResource().fsPath), toErrorMessage(error, false))); + this.notificationService.error(nls.localize('genericSaveError', "Failed to save '{0}': {1}", paths.basename(model.getResource().fsPath), toErrorMessage(error, false))); } } diff --git a/src/vs/workbench/services/textfile/common/textFileService.ts b/src/vs/workbench/services/textfile/common/textFileService.ts index 1e11a0a4a0b..a33ab55fb6e 100644 --- a/src/vs/workbench/services/textfile/common/textFileService.ts +++ b/src/vs/workbench/services/textfile/common/textFileService.ts @@ -7,11 +7,11 @@ import * as nls from 'vs/nls'; import { TPromise } from 'vs/base/common/winjs.base'; import URI from 'vs/base/common/uri'; -import * as paths from 'vs/base/common/paths'; -import * as errors from 'vs/base/common/errors'; -import * as objects from 'vs/base/common/objects'; +import paths = require('vs/base/common/paths'); +import errors = require('vs/base/common/errors'); +import objects = require('vs/base/common/objects'); import { Event, Emitter } from 'vs/base/common/event'; -import * as platform from 'vs/base/common/platform'; +import platform = require('vs/base/common/platform'); import { IWindowsService } from 'vs/platform/windows/common/windows'; import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { IResult, ITextFileOperationResult, ITextFileService, IRawTextContent, IAutoSaveConfiguration, AutoSaveMode, SaveReason, ITextFileEditorModelManager, ITextFileEditorModel, ModelState, ISaveOptions, AutoSaveContext } from 'vs/workbench/services/textfile/common/textfiles'; diff --git a/src/vs/workbench/services/textfile/electron-browser/textFileService.ts b/src/vs/workbench/services/textfile/electron-browser/textFileService.ts index 102689704fd..b3dff4ebecc 100644 --- a/src/vs/workbench/services/textfile/electron-browser/textFileService.ts +++ b/src/vs/workbench/services/textfile/electron-browser/textFileService.ts @@ -5,10 +5,10 @@ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { TPromise } from 'vs/base/common/winjs.base'; -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 { isWindows } from 'vs/base/common/platform'; import URI from 'vs/base/common/uri'; import { ConfirmResult } from 'vs/workbench/common/editor'; diff --git a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts index dcb3faa86c3..7c9c4ada5f3 100644 --- a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts +++ b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts @@ -13,7 +13,7 @@ import { IDisposable, toDisposable, IReference, ReferenceCollection, ImmortalRef import { IModelService } from 'vs/editor/common/services/modelService'; import { ResourceEditorModel } from 'vs/workbench/common/editor/resourceEditorModel'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; -import * as network from 'vs/base/common/network'; +import network = require('vs/base/common/network'); import { ITextModelService, ITextModelContentProvider, ITextEditorModel } from 'vs/editor/common/services/resolverService'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel'; diff --git a/src/vs/workbench/services/themes/common/colorExtensionPoint.ts b/src/vs/workbench/services/themes/common/colorExtensionPoint.ts index b8fcdda5f39..d999d6c8180 100644 --- a/src/vs/workbench/services/themes/common/colorExtensionPoint.ts +++ b/src/vs/workbench/services/themes/common/colorExtensionPoint.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry'; import { registerColor, getColorRegistry } from 'vs/platform/theme/common/colorRegistry'; import { Color } from 'vs/base/common/color'; diff --git a/src/vs/workbench/services/themes/common/colorThemeSchema.ts b/src/vs/workbench/services/themes/common/colorThemeSchema.ts index c39aec9fbb2..0ff9cfd22ae 100644 --- a/src/vs/workbench/services/themes/common/colorThemeSchema.ts +++ b/src/vs/workbench/services/themes/common/colorThemeSchema.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 nls from 'vs/nls'; +import nls = require('vs/nls'); import { Registry } from 'vs/platform/registry/common/platform'; import { Extensions as JSONExtensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; diff --git a/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts b/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts index 85820dd343f..df7d9e378e9 100644 --- a/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts +++ b/src/vs/workbench/services/themes/common/fileIconThemeSchema.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 nls from 'vs/nls'; +import nls = require('vs/nls'); import { Registry } from 'vs/platform/registry/common/platform'; import { Extensions as JSONExtensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; diff --git a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts index 1f02ae9b915..f5048990677 100644 --- a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts +++ b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts @@ -4,17 +4,17 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as Paths from 'vs/base/common/paths'; -import * as Json from 'vs/base/common/json'; +import Paths = require('vs/base/common/paths'); +import Json = require('vs/base/common/json'); import { Color } from 'vs/base/common/color'; import { ExtensionData, ITokenColorCustomizations, ITokenColorizationRule, IColorTheme, IColorMap, IThemeExtensionPoint, VS_LIGHT_THEME, VS_HC_THEME } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { convertSettings } from 'vs/workbench/services/themes/electron-browser/themeCompatibility'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import * as types from 'vs/base/common/types'; import * as objects from 'vs/base/common/objects'; -import * as pfs from 'vs/base/node/pfs'; +import pfs = require('vs/base/node/pfs'); import { Extensions, IColorRegistry, ColorIdentifier, editorBackground, editorForeground } from 'vs/platform/theme/common/colorRegistry'; import { ThemeType } from 'vs/platform/theme/common/themeService'; diff --git a/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts b/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts index 200f7673d9c..2d133ba10e6 100644 --- a/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts +++ b/src/vs/workbench/services/themes/electron-browser/colorThemeStore.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import * as types from 'vs/base/common/types'; import * as Paths from 'path'; diff --git a/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts b/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts index 677762df115..513e42fe9dc 100644 --- a/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts +++ b/src/vs/workbench/services/themes/electron-browser/fileIconThemeData.ts @@ -5,12 +5,12 @@ 'use strict'; import URI from 'vs/base/common/uri'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import * as Paths from 'path'; -import * as Json from 'vs/base/common/json'; +import Json = require('vs/base/common/json'); import { ExtensionData, IThemeExtensionPoint, IFileIconTheme } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as pfs from 'vs/base/node/pfs'; +import pfs = require('vs/base/node/pfs'); import { WorkbenchThemeService } from 'vs/workbench/services/themes/electron-browser/workbenchThemeService'; import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages'; diff --git a/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts b/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts index 319a0e2ed41..5c66b90d62e 100644 --- a/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts +++ b/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import * as types from 'vs/base/common/types'; import * as Paths from 'path'; diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts index 238a245d3ce..35052cb41ad 100644 --- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts +++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts @@ -5,14 +5,14 @@ 'use strict'; import { TPromise, Promise } from 'vs/base/common/winjs.base'; -import * as nls from 'vs/nls'; +import nls = require('vs/nls'); import * as types from 'vs/base/common/types'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; import { IWorkbenchThemeService, IColorTheme, ITokenColorCustomizations, IFileIconTheme, ExtensionData, VS_LIGHT_THEME, VS_DARK_THEME, VS_HC_THEME, COLOR_THEME_SETTING, ICON_THEME_SETTING, CUSTOM_WORKBENCH_COLORS_SETTING, CUSTOM_EDITOR_COLORS_SETTING, CUSTOM_EDITOR_SCOPE_COLORS_SETTING, DETECT_HC_SETTING, HC_THEME_ID } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { Registry } from 'vs/platform/registry/common/platform'; -import * as errors from 'vs/base/common/errors'; +import errors = require('vs/base/common/errors'); import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; import { IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigurationPropertySchema, IConfigurationNode } from 'vs/platform/configuration/common/configurationRegistry'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -24,8 +24,8 @@ import { Color } from 'vs/base/common/color'; import { $ } from 'vs/base/browser/builder'; import { Event, Emitter } from 'vs/base/common/event'; -import * as colorThemeSchema from 'vs/workbench/services/themes/common/colorThemeSchema'; -import * as fileIconThemeSchema from 'vs/workbench/services/themes/common/fileIconThemeSchema'; +import colorThemeSchema = require('vs/workbench/services/themes/common/colorThemeSchema'); +import fileIconThemeSchema = require('vs/workbench/services/themes/common/fileIconThemeSchema'); import { IDisposable } from 'vs/base/common/lifecycle'; import { IBroadcastService } from 'vs/platform/broadcast/electron-browser/broadcastService'; import { ColorThemeStore } from 'vs/workbench/services/themes/electron-browser/colorThemeStore'; diff --git a/src/vs/workbench/services/untitled/common/untitledEditorService.ts b/src/vs/workbench/services/untitled/common/untitledEditorService.ts index fdccdb3a9e9..921ab942bca 100644 --- a/src/vs/workbench/services/untitled/common/untitledEditorService.ts +++ b/src/vs/workbench/services/untitled/common/untitledEditorService.ts @@ -6,7 +6,7 @@ import URI from 'vs/base/common/uri'; import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import * as arrays from 'vs/base/common/arrays'; +import arrays = require('vs/base/common/arrays'); import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; import { IFilesConfiguration } from 'vs/platform/files/common/files'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts b/src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts index 57c5403cc6d..b5b71b701d2 100644 --- a/src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts +++ b/src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts @@ -10,7 +10,7 @@ import { TestEditorService, workbenchInstantiationService } from 'vs/workbench/t import { IModelService } from 'vs/editor/common/services/modelService'; import { IModeService } from 'vs/editor/common/services/modeService'; import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl'; -import * as WorkbenchEditorService from 'vs/workbench/services/editor/common/editorService'; +import WorkbenchEditorService = require('vs/workbench/services/editor/common/editorService'); import { RangeHighlightDecorations } from 'vs/workbench/browser/parts/editor/rangeDecorations'; import { TextModel } from 'vs/editor/common/model/textModel'; import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';