Move all services to root level.

Author: ivanbuhov

src/services/analytics/AnalyticsBaseInfo.ts renamed to src/analytics/AnalyticsBaseInfo.ts

@@ -1,11 +1,11 @@
 import * as os from 'os';
 import * as vscode from 'vscode';
-import { Version } from '../version';
+import { Version } from '../common/version';
 import { GUAService } from './GUAService';
 import { TelerikAnalyticsService } from './TelerikAnalyticsService';
 import { AnalyticsBaseInfo, OperatingSystem } from './AnalyticsBaseInfo';
-import { ExtensionVersionService } from '../ExtensionVersionService';
-import * as ns from '../NsCliService';
+import { ExtensionVersionService } from '../common/ExtensionVersionService';
+import * as ns from '../project/NsCliService';
 
 export class AnalyticsService {
     private _baseInfo: AnalyticsBaseInfo;

src/services/analytics/AnalyticsService.ts renamed to src/analytics/AnalyticsService.ts

@@ -3,7 +3,7 @@
  *--------------------------------------------------------*/
 
 import * as utils from '../utilities';
-import {DebugAdapterServices as Services} from '../../services/services/debugAdapterServices';
+import {DebugAdapterServices as Services} from '../../services/debugAdapterServices';
 import {DebugProtocol} from 'vscode-debugprotocol';
 
 export type EventHandler = (event: DebugProtocol.Event) => void;

src/services/analytics/EqatecMonitor.min.js renamed to src/analytics/EqatecMonitor.min.js

@@ -3,9 +3,8 @@
  *--------------------------------------------------------*/
 
 import * as utils from '../utilities';
-import {DebugAdapterServices as Services} from '../../services/services/debugAdapterServices';
+import {DebugAdapterServices as Services} from '../../services/debugAdapterServices';
 import {DebugProtocol} from 'vscode-debugprotocol';
-import * as path from 'path';
 
 interface IPendingBreakpoint {
     resolve: () => void;

src/services/analytics/GUAService.ts renamed to src/analytics/GUAService.ts

@@ -6,7 +6,7 @@
 
 import * as Path from 'path';
 import * as URL from 'url';
-import {DebugAdapterServices as Services} from '../../../services/services/debugAdapterServices';
+import {DebugAdapterServices as Services} from '../../../services/debugAdapterServices';
 import * as utils from '../../utilities';
 
 export function getPathRoot(p: string) {

src/services/analytics/TelerikAnalyticsService.ts renamed to src/analytics/TelerikAnalyticsService.ts

@@ -4,7 +4,7 @@
 
 import * as path from 'path';
 import * as fs from 'fs';
-import {DebugAdapterServices as Services} from '../../../services/services/debugAdapterServices';
+import {DebugAdapterServices as Services} from '../../../services/debugAdapterServices';
 import {DebugProtocol} from 'vscode-debugprotocol';
 import {ISourceMaps, SourceMaps} from './sourceMaps';
 import * as utils from '../../utilities';

src/services/Logger.ts renamed to src/common/Logger.ts

@@ -10,7 +10,7 @@ import * as FS from 'fs';
 import {SourceMapConsumer} from 'source-map';
 import * as PathUtils from './pathUtilities';
 import * as utils from '../../utilities';
-import {DebugAdapterServices as Services} from '../../../services/services/debugAdapterServices';
+import {DebugAdapterServices as Services} from '../../../services/debugAdapterServices';
 
 
 export interface MappingResult {

src/services/extensionVersionService.ts renamed to src/common/extensionVersionService.ts

@@ -1,6 +1,6 @@
 import * as http from 'http';
 import {EventEmitter} from 'events';
-import {DebugAdapterServices as Services} from '../../services/services/debugAdapterServices';
+import {DebugAdapterServices as Services} from '../../services/debugAdapterServices';
 import * as Net from 'net';
 import { INSDebugConnection } from './INSDebugConnection';
 

src/services/version.ts renamed to src/common/version.ts

@@ -7,7 +7,7 @@ import * as stream from 'stream';
 import {EventEmitter} from 'events';
 import {INSDebugConnection} from './INSDebugConnection';
 import * as utils from '../utilities';
-import {DebugAdapterServices as Services} from '../../services/services/debugAdapterServices';
+import {DebugAdapterServices as Services} from '../../services/debugAdapterServices';
 
 interface IMessageWithId {
     id: number;

src/debug-adapter/adapter/adapterProxy.ts

@@ -4,18 +4,18 @@
 
 import * as os from 'os';
 import * as fs from 'fs';
-import {spawn, ChildProcess} from 'child_process';
 import * as path from 'path';
+import {spawn, ChildProcess} from 'child_process';
 import {Handles, StoppedEvent, InitializedEvent, TerminatedEvent, OutputEvent} from 'vscode-debugadapter';
 import {DebugProtocol} from 'vscode-debugprotocol';
 import {INSDebugConnection} from './connection/INSDebugConnection';
 import {IosConnection} from './connection/iosConnection';
 import {AndroidConnection} from './connection/androidConnection';
 import * as utils from './utilities';
 import {formatConsoleMessage} from './consoleHelper';
-import * as ns from '../services/NsCliService';
-import {DebugAdapterServices as Services} from '../services/services/debugAdapterServices';
-import {LoggerHandler, Handlers, Tags} from '../services/Logger';
+import * as ns from '../project/NsCliService';
+import {DebugAdapterServices as Services} from '../services/debugAdapterServices';
+import {LoggerHandler, Handlers, Tags} from '../common/Logger';
 import {DebugConfiguration} from './debugConfiguration';
 
 interface IScopeVarHandle {

src/debug-adapter/adapter/pathTransformer.ts

@@ -2,8 +2,8 @@ import {OutputEvent, DebugSession, ErrorDestination} from 'vscode-debugadapter';
 import {DebugProtocol} from 'vscode-debugprotocol';
 
 import {WebKitDebugAdapter} from './webKitDebugAdapter';
-import {Handlers} from '../services/Logger';
-import {DebugAdapterServices as Services} from '../services/services/debugAdapterServices';
+import {Handlers} from '../common/Logger';
+import {DebugAdapterServices as Services} from '../services/debugAdapterServices';
 
 import {AdapterProxy} from './adapter/adapterProxy';
 import {LineNumberTransformer} from './adapter/lineNumberTransformer';

src/debug-adapter/adapter/sourceMaps/pathUtilities.ts

@@ -1,10 +1,7 @@
 import * as vscode from 'vscode';
 import * as child from 'child_process';
-import * as ns from './services/NsCliService';
-import {ExtensionVersionService} from './services/ExtensionVersionService';
-import {AnalyticsService} from './services/analytics/AnalyticsService';
-import {ExtensionServer} from './services/ipc/ExtensionServer';
-import {ExtensionHostServices as Services} from './services/services/extensionHostServices';
+import * as ns from './project/NsCliService';
+import {ExtensionHostServices as Services} from './services/extensionHostServices';
 
 // this method is called when the extension is activated
 export function activate(context: vscode.ExtensionContext) {

src/debug-adapter/adapter/sourceMaps/sourceMapTransformer.ts

@@ -3,10 +3,9 @@ import * as fs from 'fs';
 import {EventEmitter} from 'events';
 import * as path from 'path';
 import * as https from 'https';
-import {Version} from './version';
-import {Logger, Handlers, Tags} from '../services/Logger';
-import {Services} from '../services/services/services';
-import {ExtensionVersionService} from './ExtensionVersionService';
+import {Version} from '../common/version';
+import {Handlers, Tags} from '../common/Logger';
+import {Services} from '../services/services';
 import {DebugProtocol} from 'vscode-debugprotocol';
 
 export enum CliVersionState {

src/debug-adapter/adapter/sourceMaps/sourceMaps.ts

@@ -1,6 +1,6 @@
 import {Services} from './services';
 import {ExtensionClient} from '../ipc/extensionClient';
-import {Logger} from '../Logger';
+import {Logger} from '../common/Logger';
 
 export class DebugAdapterServices extends Services {
     private static _appRoot: string;

src/debug-adapter/connection/androidConnection.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import {Services} from './services';
-import {ExtensionVersionService} from '../extensionVersionService';
+import {ExtensionVersionService} from '../common/extensionVersionService';
 import {ExtensionServer} from '../ipc/extensionServer';
 import {AnalyticsService} from '../analytics/analyticsService';
 

src/debug-adapter/connection/iosConnection.ts

@@ -1,4 +1,4 @@
-import {Logger} from '../logger';
+import {Logger} from '../common/logger';
 
 export class Services {
     private static _logger: Logger;

src/debug-adapter/webKitDebugAdapter.ts

@@ -20,6 +20,6 @@
         "./debug-adapter/webKitDebug.ts",
         "./main.ts",
         "./tests/adapter.test.ts",
-        "./services/analytics/EqatecMonitor.min.js"
+        "./analytics/EqatecMonitor.min.js"
     ]
 }