Merge pull request #8853 from kisstkondoros/fixforzoomininlinediff

Fixes mousewheel zoom in case of inline diff view

src/vs/editor/browser/widget/diffEditorWidget.ts

@@ -121,7 +121,9 @@ class VisualEditorState {
 		this._decorations = editor.deltaDecorations(this._decorations, newDecorations.decorations);
 
 		// overview ruler
-		overviewRuler.setZones(newDecorations.overviewZones);
+		if (overviewRuler) {
+			overviewRuler.setZones(newDecorations.overviewZones);
+		}
 	}
 }
 
@@ -205,6 +207,8 @@ export class DiffEditorWidget extends EventEmitter implements editorBrowser.IDif
 	private _editorWorkerService: IEditorWorkerService;
 	private _keybindingService: IKeybindingService;
 
+	private _lastUsedFontInfo:editorCommon.FontInfo;
+
 	constructor(
 		domElement:HTMLElement,
 		options:editorCommon.IDiffEditorOptions,
@@ -766,6 +770,10 @@ export class DiffEditorWidget extends EventEmitter implements editorBrowser.IDif
 					// oh no, you didn't!
 					this.modifiedEditor.updateOptions({ wrappingColumn: -1 });
 				}
+				if (this._lastUsedFontInfo !== this.modifiedEditor.getConfiguration().fontInfo) {
+					this._lastUsedFontInfo = this.modifiedEditor.getConfiguration().fontInfo;
+					this._onViewZonesChanged();
+				}
 			}
 		}
 		this._recomputeIfNecessary(events);