Fixes microsoft#184910 (microsoft#186211)

Author: hediet

src/vs/editor/browser/widget/diffEditorWidget2/diffEditorDecorations.ts

@@ -61,10 +61,11 @@ export class DiffEditorDecorations extends Disposable {
 					continue;
 				}
 
-				if (i.originalRange.startLineNumber < m.lineRangeMapping.originalRange.endLineNumberExclusive) {
+				// Don't show empty markers outside the line range
+				if (m.lineRangeMapping.originalRange.contains(i.originalRange.startLineNumber)) {
 					originalDecorations.push({ range: i.originalRange, options: (i.originalRange.isEmpty() && showEmptyDecorations) ? diffDeleteDecorationEmpty : diffDeleteDecoration });
 				}
-				if (i.modifiedRange.startLineNumber < m.lineRangeMapping.modifiedRange.endLineNumberExclusive) {
+				if (m.lineRangeMapping.modifiedRange.contains(i.modifiedRange.startLineNumber)) {
 					modifiedDecorations.push({ range: i.modifiedRange, options: (i.modifiedRange.isEmpty() && showEmptyDecorations) ? diffAddDecorationEmpty : diffAddDecoration });
 				}
 			}

src/vs/editor/browser/widget/diffEditorWidget2/diffEditorViewModel.ts

@@ -293,7 +293,7 @@ export class UnchangedRegion {
 					length -= minContext;
 				}
 				result.push(new UnchangedRegion(origStart, modStart, length, 0, 0));
-			} else if (origStart + length === originalLineCount + 1 && length > minContext + minHiddenLineCount) {
+			} else if (origStart + length === originalLineCount + 1 && modStart + length === modifiedLineCount + 1 && length > minContext + minHiddenLineCount) {
 				origStart += minContext;
 				modStart += minContext;
 				length -= minContext;