Added support for debug with livesync

Author: Tsvetan Raikov

lib/commands/debug.ts

@@ -5,7 +5,7 @@
 		protected $options: IOptions) { }
 
 	execute(args: string[]): IFuture<void> {
-		return this.debugService.debug();
+		return this.debugService.debug(true, false);
 	}
 
 	allowedParameters: ICommandParameter[] = [];

lib/definitions/debug.d.ts

@@ -1,5 +1,5 @@
 interface IDebugService {
-	debug(): IFuture<void>;
-	debugStart(): IFuture<void>;
+	debug(shouldBuild: boolean, shouldBreak: boolean): IFuture<void>;
+	debugStart(shouldBuild: boolean): IFuture<void>;
 	platform: string;
 }

lib/services/ios-debug-service.ts

@@ -35,7 +35,7 @@ class IOSDebugService implements IDebugService {
 		return "ios";
 	}
 
-	public debug(): IFuture<void> {
+	public debug(shouldBuild: boolean): IFuture<void> {
 		if (this.$options.debugBrk && this.$options.start) {
 			this.$errors.failWithoutHelp("Expected exactly one of the --debug-brk or --start options.");
 		}
@@ -46,37 +46,38 @@ class IOSDebugService implements IDebugService {
 
 		if (this.$options.emulator) {
 			if (this.$options.debugBrk) {
-				return this.emulatorDebugBrk(true);
+				return this.emulatorDebugBrk(shouldBuild, true);
 			} else if (this.$options.start) {
 				return this.emulatorStart();
 			} else {
-				return this.emulatorDebugBrk();
+				return this.emulatorDebugBrk(shouldBuild, false);
 			}
 		} else {
 			if (this.$options.debugBrk) {
-				return this.deviceDebugBrk(true);
+				return this.deviceDebugBrk(shouldBuild, true);
 			} else if (this.$options.start) {
 				return this.deviceStart();
 			} else {
 				let deploy = this.$platformService.deployOnDevice(this.platform);
 				deploy.wait();
-
 				return this.deviceStart();
 			}
 		}
 	}
 
-	public debugStart(): IFuture<void> {
+	public debugStart(shouldBuild: boolean): IFuture<void> {
 		return (() => {
 			this.$devicesService.initialize({ platform: this.platform, deviceId: this.$options.device }).wait();
-			this.$devicesService.execute((device: Mobile.IiOSDevice) => device.isEmulator ? this.emulatorDebugBrk() : this.debugBrkCore(device)).wait();
+			this.$devicesService.execute((device: Mobile.IiOSDevice) => device.isEmulator ? this.emulatorDebugBrk(shouldBuild, false) : this.debugBrkCore(device)).wait();
 		}).future<void>()();
 	}
 
-	private emulatorDebugBrk(shouldBreak?: boolean): IFuture<void> {
+	private emulatorDebugBrk(shouldBuild: boolean, shouldBreak: boolean): IFuture<void> {
 		return (() => {
 			let platformData = this.$platformsData.getPlatformData(this.platform);
-			this.$platformService.buildPlatform(this.platform).wait();
+			if (shouldBuild) {
+				this.$platformService.buildPlatform(this.platform).wait();
+			}
 			let emulatorPackage = this.$platformService.getLatestApplicationPackageForEmulator(platformData).wait();
 
 			let args = shouldBreak ? "--nativescript-debug-brk" : "--nativescript-debug-start";
@@ -112,12 +113,12 @@ class IOSDebugService implements IDebugService {
 		}).future<void>()();
 	}
 
-	private deviceDebugBrk(shouldBreak?: boolean): IFuture<void> {
+	private deviceDebugBrk(shouldBuild: boolean, shouldBreak: boolean): IFuture<void> {
 		return (() => {
 			this.$devicesService.initialize({ platform: this.platform, deviceId: this.$options.device }).wait();
 			this.$devicesService.execute((device: iOSDevice.IOSDevice) => (() => {
 				if (device.isEmulator) {
-					return this.emulatorDebugBrk(shouldBreak).wait();
+					return this.emulatorDebugBrk(shouldBuild, shouldBreak).wait();
 				}
 				// we intentionally do not wait on this here, because if we did, we'd miss the AppLaunching notification
 				let deploy = this.$platformService.deployOnDevice(this.platform);

lib/services/livesync/ios-livesync-service.ts

@@ -15,6 +15,7 @@ class IOSLiveSyncService extends liveSyncServiceBaseLib.LiveSyncServiceBase<Mobi
 		private $injector: IInjector,
 		private $logger: ILogger,
 		private $options: IOptions,
+		private $iOSDebugService: IDebugService,
 		$liveSyncProvider: ILiveSyncProvider) {
 		super(_device, $liveSyncProvider);
 	}
@@ -32,8 +33,12 @@ class IOSLiveSyncService extends liveSyncServiceBaseLib.LiveSyncServiceBase<Mobi
 	}
 
 	protected restartApplication(deviceAppData: Mobile.IDeviceAppData): IFuture<void> {
-		let projectData: IProjectData = this.$injector.resolve("projectData");
-		return this.device.applicationManager.restartApplication(deviceAppData.appIdentifier, projectData.projectName);
+		if (this.$options.debug) {
+			return this.$iOSDebugService.debug(false, false);
+		} else {
+			let projectData: IProjectData = this.$injector.resolve("projectData");
+			return this.device.applicationManager.restartApplication(deviceAppData.appIdentifier, projectData.projectName);
+		}
 	}
 
 	protected reloadPage(deviceAppData: Mobile.IDeviceAppData): IFuture<void> {

lib/services/test-execution-service.ts

@@ -69,7 +69,7 @@ class TestExecutionService implements ITestExecutionService {
 						if (this.$options.debugBrk) {
 							this.$logger.info('Starting debugger...');
 							let debugService: IDebugService = this.$injector.resolve(`${platform}DebugService`);
-							debugService.debugStart().wait();
+							debugService.debugStart(true).wait();
 						}
 						blockingOperationFuture.return();
 					} catch(err) {
@@ -124,7 +124,7 @@ class TestExecutionService implements ITestExecutionService {
 				}
 
 				if(this.$options.debugBrk) {
-					this.getDebugService(platform).debug().wait();
+					this.getDebugService(platform).debug(true, false).wait();
 				} else {
 					this.liveSyncProject(platform).wait();
 				}