From dbcf54ccb45fccb2a9bbc6df56b3d26da1198f5c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 22 May 2018 09:10:43 +0200
Subject: [PATCH] grid - enable smoke and integration tests again

---
 build/tfs/continuous-build.yml                | 48 +++++++++----------
 .../api/electron-browser/mainThreadEditors.ts |  1 +
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/build/tfs/continuous-build.yml b/build/tfs/continuous-build.yml
index 0c2d443d0d1..6a2f594ad30 100644
--- a/build/tfs/continuous-build.yml
+++ b/build/tfs/continuous-build.yml
@@ -29,18 +29,18 @@ phases:
   - powershell: |
       .\scripts\test.bat --tfs
     displayName: Run Unit Tests
-  # - powershell: |
-  #     .\scripts\test-integration.bat
-  #   displayName: Run Integration Tests
-  # - powershell: |
-  #     yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)\artifacts" --log "$(Build.ArtifactStagingDirectory)\artifacts\smoketest.log"
-  #   displayName: Run Smoke Tests
-  # - task: PublishBuildArtifacts@1
-  #   inputs:
-  #     PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
-  #     ArtifactName: build-artifacts-win32
-  #     publishLocation: Container
-  #   condition: succeededOrFailed()
+  - powershell: |
+      .\scripts\test-integration.bat
+    displayName: Run Integration Tests
+  - powershell: |
+      yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)\artifacts" --log "$(Build.ArtifactStagingDirectory)\artifacts\smoketest.log"
+    displayName: Run Smoke Tests
+  - task: PublishBuildArtifacts@1
+    inputs:
+      PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
+      ArtifactName: build-artifacts-win32
+      publishLocation: Container
+    condition: succeededOrFailed()
 
 - phase: Linux
   queue: Hosted Linux Preview
@@ -113,15 +113,15 @@ phases:
   - script: |
       ./scripts/test.sh --tfs
     displayName: Run Unit Tests
-  # - script: |
-  #     ./scripts/test-integration.sh
-  #   displayName: Run Integration Tests
-  # - script: |
-  #     yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)/artifacts" --log "$(Build.ArtifactStagingDirectory)/artifacts/smoketest.log"
-  #   displayName: Run Smoke Tests
-  # - task: PublishBuildArtifacts@1
-  #   inputs:
-  #     PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
-  #     ArtifactName: build-artifacts-darwin
-  #     publishLocation: Container
-  #   condition: succeededOrFailed()
\ No newline at end of file
+  - script: |
+      ./scripts/test-integration.sh
+    displayName: Run Integration Tests
+  - script: |
+      yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)/artifacts" --log "$(Build.ArtifactStagingDirectory)/artifacts/smoketest.log"
+    displayName: Run Smoke Tests
+  - task: PublishBuildArtifacts@1
+    inputs:
+      PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
+      ArtifactName: build-artifacts-darwin
+      publishLocation: Container
+    condition: succeededOrFailed()
\ No newline at end of file
diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
index 6be709c2443..8f4153fb8e6 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
@@ -54,6 +54,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		this._toDispose.push(documentsAndEditors.onTextEditorRemove(editors => editors.forEach(this._onTextEditorRemove, this)));
 
 		this._toDispose.push(this._editorService.onDidVisibleEditorsChange(() => this._updateActiveAndVisibleTextEditors()));
+		this._toDispose.push(this._editorGroupService.onDidRemoveGroup(() => this._updateActiveAndVisibleTextEditors()));
 
 		this._registeredDecorationTypes = Object.create(null);
 	}