Merge remote-tracking branch 'origin/master' into tyriar/snap

src/vs/code/electron-main/app.ts

@@ -59,7 +59,7 @@ import { touch } from 'vs/base/node/pfs';
 
 export class CodeApplication {
 
-	private static APP_ICON_REFRESH_KEY = 'macOSAppIconRefresh';
+	private static APP_ICON_REFRESH_KEY = 'macOSAppIconRefresh2';
 
 	private toDispose: IDisposable[];
 	private windowsMainService: IWindowsMainService;

src/vs/workbench/parts/debug/electron-browser/debugService.ts

@@ -246,7 +246,7 @@ export class DebugService implements debug.IDebugService {
 
 	private tryToAutoFocusStackFrame(thread: debug.IThread): TPromise<any> {
 		const callStack = thread.getCallStack();
-		if (!callStack.length || (this.viewModel.focusedStackFrame && this.viewModel.focusedStackFrame.thread.threadId === thread.threadId)) {
+		if (!callStack.length || (this.viewModel.focusedStackFrame && this.viewModel.focusedStackFrame.thread.getId() === thread.getId())) {
 			return TPromise.as(null);
 		}
 

src/vs/workbench/services/files/electron-browser/remoteFileService.ts

@@ -198,8 +198,8 @@ export class RemoteFileService extends FileService {
 					result[idx] = { stat: undefined, success: false };
 				});
 			});
-			return TPromise.join(promises).then(() => result, () => result);
-		}, err => ([{ stat: undefined, success: false }]));
+			return TPromise.join(promises).then(() => result);
+		});
 	}
 
 	// --- resolve