Show hint when the diff algorithm quits early

alexdima · alexdima · commit 0a55dcfccbb1 · 2019-10-16T11:29:20.000+02:00
diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts
@@ -632,6 +632,9 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 
 		if (typeof newOptions.maximumComputationTime !== 'undefined') {
 			this._maximumComputationTime = newOptions.maximumComputationTime;
+			if (this._isVisible) {
+				this._beginUpdateDecorationsSoon();
+			}
 		}
 
 		let beginUpdateDecorations = false;
diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts
@@ -465,7 +465,7 @@ const editorConfiguration: IConfigurationNode = {
 		'diffEditor.maximumComputationTime': {
 			type: 'number',
 			default: 5000,
-			description: nls.localize('maximumComputationTime', "Timeout in milliseconds after which diff computation is cancelled.")
+			description: nls.localize('maximumComputationTime', "Timeout in milliseconds after which diff computation is cancelled. Use 0 for no timeout.")
 		},
 		'diffEditor.renderSideBySide': {
 			type: 'boolean',
diff --git a/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts b/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts
@@ -15,7 +15,8 @@ import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configur
 
 const enum WidgetState {
 	Hidden,
-	HintWhitespace
+	HintWhitespace,
+	HintTimeout
 }
 
 class DiffEditorHelperContribution extends Disposable implements IEditorContribution {
@@ -47,6 +48,9 @@ class DiffEditorHelperContribution extends Disposable implements IEditorContribu
 		if (this._diffEditor.ignoreTrimWhitespace && diffComputationResult.changes.length === 0 && !diffComputationResult.identical) {
 			return WidgetState.HintWhitespace;
 		}
+		if (diffComputationResult.quitEarly) {
+			return WidgetState.HintTimeout;
+		}
 		return WidgetState.Hidden;
 	}
 
@@ -71,12 +75,21 @@ class DiffEditorHelperContribution extends Disposable implements IEditorContribu
 			this._helperWidgetListener = this._helperWidget.onClick(() => this._onDidClickHelperWidget());
 			this._helperWidget.render();
 		}
+
+		if (this._state === WidgetState.HintTimeout) {
+			this._helperWidget = this._instantiationService.createInstance(FloatingClickWidget, this._diffEditor.getModifiedEditor(), nls.localize('hintTimeout', "Remove diff computation timeout"), null);
+			this._helperWidgetListener = this._helperWidget.onClick(() => this._onDidClickHelperWidget());
+			this._helperWidget.render();
+		}
 	}
 
 	private _onDidClickHelperWidget(): void {
 		if (this._state === WidgetState.HintWhitespace) {
 			this._configurationService.updateValue('diffEditor.ignoreTrimWhitespace', false, ConfigurationTarget.USER);
 		}
+		if (this._state === WidgetState.HintTimeout) {
+			this._configurationService.updateValue('diffEditor.maximumComputationTime', 0, ConfigurationTarget.USER);
+		}
 	}
 
 	dispose(): void {

Original file line number	Diff line number	Diff line change
`@@ -632,6 +632,9 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE`
`632`	`632`
`633`	`633`	`if (typeof newOptions.maximumComputationTime !== 'undefined') {`
`634`	`634`	`this._maximumComputationTime = newOptions.maximumComputationTime;`
	`635`	`+ if (this._isVisible) {`
	`636`	`+ this._beginUpdateDecorationsSoon();`
	`637`	`+ }`
`635`	`638`	`}`
`636`	`639`
`637`	`640`	`let beginUpdateDecorations = false;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configur`
`15`	`15`
`16`	`16`	`const enum WidgetState {`
`17`	`17`	`Hidden,`
`18`		`- HintWhitespace`
	`18`	`+ HintWhitespace,`
	`19`	`+ HintTimeout`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`class DiffEditorHelperContribution extends Disposable implements IEditorContribution {`
`@@ -47,6 +48,9 @@ class DiffEditorHelperContribution extends Disposable implements IEditorContribu`
`47`	`48`	`if (this._diffEditor.ignoreTrimWhitespace && diffComputationResult.changes.length === 0 && !diffComputationResult.identical) {`
`48`	`49`	`return WidgetState.HintWhitespace;`
`49`	`50`	`}`
	`51`	`+ if (diffComputationResult.quitEarly) {`
	`52`	`+ return WidgetState.HintTimeout;`
	`53`	`+ }`
`50`	`54`	`return WidgetState.Hidden;`
`51`	`55`	`}`
`52`	`56`
`@@ -71,12 +75,21 @@ class DiffEditorHelperContribution extends Disposable implements IEditorContribu`
`71`	`75`	`this._helperWidgetListener = this._helperWidget.onClick(() => this._onDidClickHelperWidget());`
`72`	`76`	`this._helperWidget.render();`
`73`	`77`	`}`
	`78`	`+`
	`79`	`+ if (this._state === WidgetState.HintTimeout) {`
	`80`	`+ this._helperWidget = this._instantiationService.createInstance(FloatingClickWidget, this._diffEditor.getModifiedEditor(), nls.localize('hintTimeout', "Remove diff computation timeout"), null);`
	`81`	`+ this._helperWidgetListener = this._helperWidget.onClick(() => this._onDidClickHelperWidget());`
	`82`	`+ this._helperWidget.render();`
	`83`	`+ }`
`74`	`84`	`}`
`75`	`85`
`76`	`86`	`private _onDidClickHelperWidget(): void {`
`77`	`87`	`if (this._state === WidgetState.HintWhitespace) {`
`78`	`88`	`this._configurationService.updateValue('diffEditor.ignoreTrimWhitespace', false, ConfigurationTarget.USER);`
`79`	`89`	`}`
	`90`	`+ if (this._state === WidgetState.HintTimeout) {`
	`91`	`+ this._configurationService.updateValue('diffEditor.maximumComputationTime', 0, ConfigurationTarget.USER);`
	`92`	`+ }`
`80`	`93`	`}`
`81`	`94`
`82`	`95`	`dispose(): void {`