ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-12 02:58:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Vscode merge (#4582)

Browse Source 
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd

* fix issues with merges

* bump node version in azpipe

* replace license headers

* remove duplicate launch task

* fix build errors

* fix build errors

* fix tslint issues

* working through package and linux build issues

* more work

* wip

* fix packaged builds

* working through linux build errors

* wip

* wip

* wip

* fix mac and linux file limits

* iterate linux pipeline

* disable editor typing

* revert series to parallel

* remove optimize vscode from linux

* fix linting issues

* revert testing change

* add work round for new node

* readd packaging for extensions

* fix issue with angular not resolving decorator dependencies
This commit is contained in:
Anthony Dresser
2019-03-19 17:44:35 -07:00
committed by GitHub
parent 833d197412
commit 87765e8673
1879 changed files with 54505 additions and 38058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/editor/browser/config/charWidthReader.ts
View File

@@ -62,12 +62,12 @@ class DomCharWidthReader {
}
private _createDomElements(): void {
let container = document.createElement('div');
const container = document.createElement('div');
container.style.position = 'absolute';
container.style.top = '-50000px';
container.style.width = '50000px';
let regularDomNode = document.createElement('div');
const regularDomNode = document.createElement('div');
regularDomNode.style.fontFamily = this._bareFontInfo.getMassagedFontFamily();
regularDomNode.style.fontWeight = this._bareFontInfo.fontWeight;
regularDomNode.style.fontSize = this._bareFontInfo.fontSize + 'px';
@@ -75,7 +75,7 @@ class DomCharWidthReader {
regularDomNode.style.letterSpacing = this._bareFontInfo.letterSpacing + 'px';
container.appendChild(regularDomNode);
let boldDomNode = document.createElement('div');
const boldDomNode = document.createElement('div');
boldDomNode.style.fontFamily = this._bareFontInfo.getMassagedFontFamily();
boldDomNode.style.fontWeight = 'bold';
boldDomNode.style.fontSize = this._bareFontInfo.fontSize + 'px';
@@ -83,7 +83,7 @@ class DomCharWidthReader {
boldDomNode.style.letterSpacing = this._bareFontInfo.letterSpacing + 'px';
container.appendChild(boldDomNode);
let italicDomNode = document.createElement('div');
const italicDomNode = document.createElement('div');
italicDomNode.style.fontFamily = this._bareFontInfo.getMassagedFontFamily();
italicDomNode.style.fontWeight = this._bareFontInfo.fontWeight;
italicDomNode.style.fontSize = this._bareFontInfo.fontSize + 'px';
@@ -92,7 +92,7 @@ class DomCharWidthReader {
italicDomNode.style.fontStyle = 'italic';
container.appendChild(italicDomNode);
let testElements: HTMLSpanElement[] = [];
const testElements: HTMLSpanElement[] = [];
for (let i = 0, len = this._requests.length; i < len; i++) {
const request = this._requests[i];
@@ -109,7 +109,7 @@ class DomCharWidthReader {
parent!.appendChild(document.createElement('br'));
let testElement = document.createElement('span');
const testElement = document.createElement('span');
DomCharWidthReader._render(testElement, request);
parent!.appendChild(testElement);
@@ -149,6 +149,6 @@ class DomCharWidthReader {
}
export function readCharWidths(bareFontInfo: BareFontInfo, requests: CharWidthRequest[]): void {
let reader = new DomCharWidthReader(bareFontInfo, requests);
const reader = new DomCharWidthReader(bareFontInfo, requests);
reader.read();
}