Code improvements (microsoft#187625)

Author: hediet

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

@@ -80,7 +80,8 @@ export const diffDeleteDecorationEmpty = ModelDecorationOptions.register({
 
 export const arrowRevertChange = ModelDecorationOptions.register({
 	description: 'diff-editor-arrow-revert-change',
-	glyphMarginHoverMessage: new MarkdownString(undefined, { isTrusted: true, supportThemeIcons: true }).appendMarkdown(localize('revertChangeHoverMessage', 'Click to revert change')),
+	glyphMarginHoverMessage: new MarkdownString(undefined, { isTrusted: true, supportThemeIcons: true })
+		.appendMarkdown(localize('revertChangeHoverMessage', 'Click to revert change')),
 	glyphMarginClassName: 'arrow-revert-change ' + ThemeIcon.asClassName(Codicon.arrowRight),
 	zIndex: 10001,
 });

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

@@ -129,13 +129,14 @@ export class DiffEditorEditors extends Disposable {
 		};
 		clonedOptions.inDiffEditor = true;
 		clonedOptions.automaticLayout = false;
+
 		// Clone scrollbar options before changing them
 		clonedOptions.scrollbar = { ...(clonedOptions.scrollbar || {}) };
 		clonedOptions.scrollbar.vertical = 'visible';
 		clonedOptions.folding = false;
 		clonedOptions.codeLens = this._options.diffCodeLens.get();
 		clonedOptions.fixedOverflowWidgets = true;
-		// clonedOptions.lineDecorationsWidth = '2ch';
+
 		// Clone minimap options before changing them
 		clonedOptions.minimap = { ...(clonedOptions.minimap || {}) };
 		clonedOptions.minimap.enabled = false;

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

@@ -94,8 +94,10 @@ export class InlineDiffDeletedCodeMargin extends Disposable {
 						actions.push(new Action(
 							'diff.clipboard.copyDeletedLineContent',
 							isDeletion
-								? localize('diff.clipboard.copyDeletedLineContent.label', "Copy deleted line ({0})", _diff.originalRange.startLineNumber + currentLineNumberOffset)
-								: localize('diff.clipboard.copyChangedLineContent.label', "Copy changed line ({0})", _diff.originalRange.startLineNumber + currentLineNumberOffset),
+								? localize('diff.clipboard.copyDeletedLineContent.label', "Copy deleted line ({0})",
+									_diff.originalRange.startLineNumber + currentLineNumberOffset)
+								: localize('diff.clipboard.copyChangedLineContent.label', "Copy changed line ({0})",
+									_diff.originalRange.startLineNumber + currentLineNumberOffset),
 							undefined,
 							true,
 							async () => {
@@ -111,9 +113,15 @@ export class InlineDiffDeletedCodeMargin extends Disposable {
 					}
 					const readOnly = _modifiedEditor.getOption(EditorOption.readOnly);
 					if (!readOnly) {
-						actions.push(new Action('diff.inline.revertChange', localize('diff.inline.revertChange.label', "Revert this change"), undefined, true, async () => {
-							this._editor.revert(this._diff);
-						}));
+						actions.push(new Action(
+							'diff.inline.revertChange',
+							localize('diff.inline.revertChange.label', "Revert this change"),
+							undefined,
+							true,
+							async () => {
+								this._editor.revert(this._diff);
+							})
+						);
 					}
 					return actions;
 				},

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

@@ -68,8 +68,8 @@ export class ViewZoneManager extends Disposable {
 			state.set(state.get() + 1, undefined);
 		}, 0));
 
-		this._register(this._editors.original.onDidChangeViewZones((args) => { if (!isChangingViewZones && !this._canIgnoreViewZoneUpdateEvent()) { updateImmediately.schedule(); } }));
-		this._register(this._editors.modified.onDidChangeViewZones((args) => { if (!isChangingViewZones && !this._canIgnoreViewZoneUpdateEvent()) { updateImmediately.schedule(); } }));
+		this._register(this._editors.original.onDidChangeViewZones((_args) => { if (!isChangingViewZones && !this._canIgnoreViewZoneUpdateEvent()) { updateImmediately.schedule(); } }));
+		this._register(this._editors.modified.onDidChangeViewZones((_args) => { if (!isChangingViewZones && !this._canIgnoreViewZoneUpdateEvent()) { updateImmediately.schedule(); } }));
 		this._register(this._editors.original.onDidChangeConfiguration((args) => { if (args.hasChanged(EditorOption.wrappingInfo)) { updateImmediately.schedule(); } }));
 		this._register(this._editors.modified.onDidChangeConfiguration((args) => { if (args.hasChanged(EditorOption.wrappingInfo)) { updateImmediately.schedule(); } }));
 

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

@@ -51,7 +51,6 @@ export class OverviewRulerPart extends Disposable {
 		const scrollTopObservable = observableFromEvent(this._editors.modified.onDidScrollChange, () => this._editors.modified.getScrollTop());
 		const scrollHeightObservable = observableFromEvent(this._editors.modified.onDidScrollChange, () => this._editors.modified.getScrollHeight());
 
-		// overview ruler
 		this._register(autorunWithStore2('create diff editor overview ruler if enabled', (reader, store) => {
 			if (!this._options.renderOverviewRuler.read(reader)) {
 				return;

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

@@ -44,26 +44,12 @@ export function renderLines(source: LineSource, options: RenderOptions, decorati
 					source.mightContainNonBasicASCII,
 					source.mightContainRTL,
 					options,
-					sb,
-					//marginDomNode
+					sb
 				));
 				renderedLineCount++;
 				lastBreakOffset = breakOffset;
 			}
 			viewLineCounts.push(lineBreakData.breakOffsets.length);
-
-
-			/*
-			const marginDomNode2 = document.createElement('div');
-			marginDomNode2.className = 'gutter-delete';
-			result.original.push({
-				afterLineNumber: lineNumber,
-				afterColumn: 0,
-				heightInLines: lineBreakData.breakOffsets.length - 1,
-				domNode: createFakeLinesDiv(),
-				marginDomNode: marginDomNode2
-			});
-			*/
 		} else {
 			viewLineCounts.push(1);
 			maxCharsPerLine = Math.max(maxCharsPerLine, renderOriginalLine(
@@ -197,4 +183,3 @@ function renderOriginalLine(
 
 	return output.characterMapping.getHorizontalOffset(output.characterMapping.length);
 }
-