Merge pull request #1997 from NativeScript/raikov/improve-livesync-message

Improved: The live sync successfull message appears twice in the code

Author: tzraikov

lib/commands/debug.ts

@@ -21,8 +21,6 @@
 				return (() => {
 					let projectData: IProjectData = this.$injector.resolve("projectData");
 
-					this.$logger.info(`Successfully synced application ${deviceAppData.appIdentifier} on device ${deviceAppData.device.deviceInfo.identifier}.`);
-
 					this.debugService.debugStop().wait();
 
 					let applicationId = deviceAppData.appIdentifier;

lib/services/livesync/android-platform-livesync-service.ts

@@ -41,10 +41,12 @@ class AndroidPlatformLiveSyncService extends PlatformLiveSyncServiceBase {
 					}
 
 					if (postAction) {
+						this.finishLivesync(deviceAppData).wait();
 						return postAction(deviceAppData, localToDevicePaths).wait();
 					}
 
-					return afterSyncAction().wait();
+					afterSyncAction().wait();
+					this.finishLivesync(deviceAppData).wait();
 				}).future<void>()();
 			};
 			this.$devicesService.execute(action, canExecute).wait();

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

@@ -37,10 +37,12 @@ class IOSPlatformLiveSyncService extends PlatformLiveSyncServiceBase {
 					}
 
 					if (postAction) {
+						this.finishLivesync(deviceAppData).wait();
 						return postAction(deviceAppData, localToDevicePaths).wait();
 					}
 
-					return afterSyncAction().wait();
+					afterSyncAction().wait();
+					this.finishLivesync(deviceAppData).wait();
 				}).future<void>()();
 			};
 			this.$devicesService.execute(action, canExecute).wait();

lib/services/livesync/livesync-service.ts

@@ -110,12 +110,7 @@ class LiveSyncService implements ILiveSyncService {
 			let watchForChangeActions: ((event: string, filePath: string, dispatcher: IFutureDispatcher) => void)[] = [];
 			_.each(liveSyncData, (dataItem) => {
 				let service = this.resolvePlatformLiveSyncBaseService(dataItem.platform, dataItem);
-
 				watchForChangeActions.push((event: string, filePath: string, dispatcher: IFutureDispatcher) => {
-					if (!applicationReloadAction) {
-						applicationReloadAction = (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => service.refreshApplication(deviceAppData, localToDevicePaths);
-					}
-
 					service.partialSync(event, filePath, dispatcher, applicationReloadAction);
 				});
 				service.fullSync(applicationReloadAction).wait();

lib/services/livesync/platform-livesync-service-base.ts

@@ -96,6 +96,12 @@ export abstract class PlatformLiveSyncServiceBase implements IPlatformLiveSyncSe
 			let deviceLiveSyncService = this.resolveDeviceSpecificLiveSyncService(deviceAppData.device.deviceInfo.platform, deviceAppData.device);
 			this.$logger.info("Applying changes...");
 			deviceLiveSyncService.refreshApplication(deviceAppData, localToDevicePaths, this.liveSyncData.forceExecuteFullSync).wait();
+		}).future<void>()();
+	}
+
+	protected finishLivesync(deviceAppData: Mobile.IDeviceAppData): IFuture<void> {
+		return (() => {
+			// This message is important because it signals Visual Studio Code that livesync has finished and debugger can be attached.
 			this.$logger.info(`Successfully synced application ${deviceAppData.appIdentifier} on device ${deviceAppData.device.deviceInfo.identifier}.`);
 		}).future<void>()();
 	}
@@ -187,7 +193,13 @@ export abstract class PlatformLiveSyncServiceBase implements IPlatformLiveSyncSe
 				let localToDevicePaths = this.$projectFilesManager.createLocalToDevicePaths(deviceAppData, this.liveSyncData.projectFilesPath, filesToSync, this.liveSyncData.excludedProjectDirsAndFiles);
 
 				fileSyncAction(deviceAppData, localToDevicePaths).wait();
-				afterFileSyncAction(deviceAppData, localToDevicePaths).wait();
+				if (!afterFileSyncAction) {
+					this.refreshApplication(deviceAppData, localToDevicePaths).wait();
+				}
+				this.finishLivesync(deviceAppData).wait();
+				if (afterFileSyncAction) {
+					afterFileSyncAction(deviceAppData, localToDevicePaths).wait();
+				}
 			}).future<void>()();
 		};