Merge from vscode 2b0b9136329c181a9e381463a1f7dc3a2d105a34 (#4880)

src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts

@@ -263,6 +263,11 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize('terminal.integrated.windowsEnableConpty', "Whether to use ConPTY for Windows terminal process communication (requires Windows 10 build number 18309+). Winpty will be used if this is false."),
 			type: 'boolean',
 			default: true
+		},
+		'terminal.integrated.experimentalRefreshOnResume': {
+			description: nls.localize('terminal.integrated.experimentalRefreshOnResume', "An experimental setting that will refresh the terminal renderer when the system is resumed."),
+			type: 'boolean',
+			default: false
 		}
 	}
 });

src/vs/workbench/contrib/terminal/browser/terminalInstance.ts

@@ -765,6 +765,14 @@ export class TerminalInstance implements ITerminalInstance {
 	}
 
 	public forceRedraw(): void {
+		if (this._configHelper.config.experimentalRefreshOnResume) {
+			if (this._xterm.getOption('rendererType') !== 'dom') {
+				this._xterm.setOption('rendererType', 'dom');
+				// Do this asynchronously to clear our the texture atlas as all terminals will not
+				// be using canvas
+				setTimeout(() => this._xterm.setOption('rendererType', 'canvas'), 0);
+			}
+		}
 		this._xterm.refresh(0, this._xterm.rows - 1);
 	}
 

src/vs/workbench/contrib/terminal/common/terminal.ts

@@ -101,6 +101,7 @@ export interface ITerminalConfiguration {
 	experimentalBufferImpl: 'JsArray' | 'TypedArray';
 	splitCwd: 'workspaceRoot' | 'initial' | 'inherited';
 	windowsEnableConpty: boolean;
+	experimentalRefreshOnResume: boolean;
 }
 
 export interface ITerminalConfigHelper {