ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-10 18:22:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a4177f50c475fc0fa278a78235e3bee9ffdec781 (#8649)

Browse Source 
* Merge from vscode a4177f50c475fc0fa278a78235e3bee9ffdec781

* distro

* fix tests
This commit is contained in:
Anthony Dresser
2019-12-11 22:42:23 -08:00
committed by GitHub
parent 82974a2135
commit 4ba6a979ba
280 changed files with 10898 additions and 14231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/contrib/codeEditor/browser/inspectTMScopes/inspectTMScopes.ts
View File

@@ -266,10 +266,10 @@ class InspectTMScopesWidget extends Disposable implements IContentWidget {
result += `<tr><td class="tm-metadata-key">font style</td><td class="tm-metadata-value">${this._fontStyleToString(metadata.fontStyle)}</td></tr>`;
result += `<tr><td class="tm-metadata-key">foreground</td><td class="tm-metadata-value">${Color.Format.CSS.formatHexA(metadata.foreground)}</td></tr>`;
result += `<tr><td class="tm-metadata-key">background</td><td class="tm-metadata-value">${Color.Format.CSS.formatHexA(metadata.background)}</td></tr>`;
if (metadata.background.isOpaque() && metadata.foreground.isOpaque()) {
result += `<tr><td class="tm-metadata-key">contrast ratio</td><td class="tm-metadata-value">${metadata.background.getContrastRatio(metadata.foreground).toFixed(2)}</td></tr>`;
if (metadata.background.isOpaque()) {
result += `<tr><td class="tm-metadata-key">contrast ratio</td><td class="tm-metadata-value">${metadata.background.getContrastRatio(metadata.foreground.makeOpaque(metadata.background)).toFixed(2)}</td></tr>`;
} else {
result += '<tr><td class="tm-metadata-key">Contrast ratio cannot be precise for colors that use transparency</td><td class="tm-metadata-value"></td></tr>';
result += '<tr><td class="tm-metadata-key">Contrast ratio cannot be precise for background colors that use transparency</td><td class="tm-metadata-value"></td></tr>';
}
result += `</tbody></table>`;

2
src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.ts
View File

@@ -48,6 +48,8 @@ class MultiCursorModifierContextKeyController implements IWorkbenchContribution
@IContextKeyService contextKeyService: IContextKeyService
) {
this._multiCursorModifier = multiCursorModifier.bindTo(contextKeyService);
this._update();
configurationService.onDidChangeConfiguration((e) => {
if (e.affectsConfiguration('editor.multiCursorModifier')) {
this._update();