Merge branch 'master' into feature-ts-plugins

Author: felixfbecker

src/test/fs.test.ts

@@ -1,11 +1,11 @@
 import * as chai from 'chai';
+import chaiAsPromised = require('chai-as-promised');
 import * as fs from 'mz/fs';
 import * as path from 'path';
 import * as rimraf from 'rimraf';
 import * as temp from 'temp';
 import { LocalFileSystem } from '../fs';
 import { path2uri } from '../util';
-import chaiAsPromised = require('chai-as-promised');
 chai.use(chaiAsPromised);
 const assert = chai.assert;
 

src/test/memfs.test.ts

@@ -1,9 +1,9 @@
 import * as chai from 'chai';
+import chaiAsPromised = require('chai-as-promised');
 import iterate from 'iterare';
+import * as sinon from 'sinon';
 import { InMemoryFileSystem, typeScriptLibraries } from '../memfs';
 import { uri2path } from '../util';
-import chaiAsPromised = require('chai-as-promised');
-import * as sinon from 'sinon';
 chai.use(chaiAsPromised);
 const assert = chai.assert;
 

src/test/tracing.test.ts

@@ -1,10 +1,10 @@
 
+import { Observable } from '@reactivex/rxjs';
 import * as chai from 'chai';
-import { traceObservable, tracePromise, traceSync } from '../tracing';
 import chaiAsPromised = require('chai-as-promised');
-import { Observable } from '@reactivex/rxjs';
 import { Span } from 'opentracing';
 import * as sinon from 'sinon';
+import { traceObservable, tracePromise, traceSync } from '../tracing';
 chai.use(chaiAsPromised);
 const assert = chai.assert;
 

src/test/typescript-service-helpers.ts

@@ -1,4 +1,8 @@
+import { Observable } from '@reactivex/rxjs';
 import * as chai from 'chai';
+import chaiAsPromised = require('chai-as-promised');
+import { applyReducer, Operation } from 'fast-json-patch';
+import { IBeforeAndAfterContext, ISuiteCallbackContext, ITestCallbackContext } from 'mocha';
 import * as sinon from 'sinon';
 import * as ts from 'typescript';
 import { CompletionItemKind, CompletionList, DiagnosticSeverity, InsertTextFormat, TextDocumentIdentifier, TextDocumentItem, WorkspaceEdit } from 'vscode-languageserver';
@@ -8,10 +12,6 @@ import { DependencyReference, PackageInformation, ReferenceInformation, TextDocu
 import { ClientCapabilities, SymbolLocationInformation } from '../request-type';
 import { TypeScriptService, TypeScriptServiceFactory } from '../typescript-service';
 import { observableFromIterable, toUnixPath, uri2path } from '../util';
-import chaiAsPromised = require('chai-as-promised');
-import { Observable } from '@reactivex/rxjs';
-import { applyReducer, Operation } from 'fast-json-patch';
-import { IBeforeAndAfterContext, ISuiteCallbackContext, ITestCallbackContext } from 'mocha';
 
 chai.use(chaiAsPromised);
 const assert = chai.assert;

src/typescript-service.ts

@@ -2,8 +2,11 @@ import { Observable } from '@reactivex/rxjs';
 import { Operation } from 'fast-json-patch';
 import iterate from 'iterare';
 import { toPairs } from 'lodash';
+import { castArray, merge, omit } from 'lodash';
+import hashObject = require('object-hash');
 import { Span } from 'opentracing';
 import * as ts from 'typescript';
+import * as url from 'url';
 import {
 	CodeActionParams,
 	Command,
@@ -38,6 +41,7 @@ import { FileSystem, FileSystemUpdater, LocalFileSystem, RemoteFileSystem } from
 import { LanguageClient } from './lang-handler';
 import { Logger, LSPLogger } from './logging';
 import { InMemoryFileSystem, isTypeScriptLibrary } from './memfs';
+import { extractDefinitelyTypedPackageName, extractNodeModulesPackageName, PackageJson, PackageManager } from './packages';
 import { ProjectConfiguration, ProjectManager } from './project-manager';
 import {
 	DependencyReference,
@@ -51,20 +55,6 @@ import {
 	WorkspaceReferenceParams,
 	WorkspaceSymbolParams
 } from './request-type';
-import {
-	getMatchingPropertyCount,
-	getPropertyCount,
-	JSONPTR,
-	normalizeUri,
-	observableFromIterable,
-	path2uri,
-	toUnixPath,
-	uri2path
-} from './util';
-import hashObject = require('object-hash');
-import { castArray, merge, omit } from 'lodash';
-import * as url from 'url';
-import { extractDefinitelyTypedPackageName, extractNodeModulesPackageName, PackageJson, PackageManager } from './packages';
 import {
 	definitionInfoToSymbolDescriptor,
 	locationUri,
@@ -75,6 +65,16 @@ import {
 	walkNavigationTree
 } from './symbols';
 import { traceObservable } from './tracing';
+import {
+	getMatchingPropertyCount,
+	getPropertyCount,
+	JSONPTR,
+	normalizeUri,
+	observableFromIterable,
+	path2uri,
+	toUnixPath,
+	uri2path
+} from './util';
 
 export interface TypeScriptServiceOptions {
 	traceModuleResolution?: boolean;