Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)

* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues

src/vs/editor/browser/viewParts/minimap/minimapCharRenderer.ts

@@ -32,6 +32,7 @@ export class MinimapCharRenderer {
 		chCode: number,
 		color: RGBA8,
 		backgroundColor: RGBA8,
+		fontScale: number,
 		useLighterFont: boolean
 	): void {
 		const charWidth = Constants.BASE_CHAR_WIDTH * this.scale;
@@ -42,7 +43,7 @@ export class MinimapCharRenderer {
 		}
 
 		const charData = useLighterFont ? this.charDataLight : this.charDataNormal;
-		const charIndex = getCharIndex(chCode);
+		const charIndex = getCharIndex(chCode, fontScale);
 
 		const destWidth = target.width * Constants.RGBA_CHANNELS_CNT;