ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-25 06:10:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Initial VS Code 1.19 source merge (#571)

Browse Source 
* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula
This commit is contained in:
Karl Burtram
2018-01-28 23:37:17 -08:00
committed by GitHub
parent 9a1ac20710
commit 251ae01c3e
8009 changed files with 93378 additions and 35634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/parts/html/browser/html.contribution.ts
View File

@@ -17,7 +17,6 @@ import { Registry } from 'vs/platform/registry/common/platform';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
import { MenuRegistry } from 'vs/platform/actions/common/actions';
import { WebviewElement } from 'vs/workbench/parts/html/browser/webview';
import { IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
@@ -118,7 +117,7 @@ CommandsRegistry.registerCommand('_webview.openDevTools', function () {
const elements = document.querySelectorAll('webview.ready');
for (let i = 0; i < elements.length; i++) {
try {
(elements.item(i) as WebviewElement).openDevTools();
(elements.item(i) as Electron.WebviewTag).openDevTools();
} catch (e) {
console.error(e);
}

54
src/vs/workbench/parts/html/browser/webview-pre.js
View File

@@ -95,8 +95,8 @@
initData.baseUrl = value;
});
ipcRenderer.on('styles', function (event, value, activeTheme) {
initData.styles = value;
ipcRenderer.on('styles', function (event, variables, activeTheme) {
initData.styles = variables;
initData.activeTheme = activeTheme;
// webview
@@ -108,10 +108,9 @@
styleBody(body[0]);
// iframe
var defaultStyles = target.contentDocument.getElementById('_defaultStyles');
if (defaultStyles) {
defaultStyles.innerHTML = initData.styles;
}
Object.keys(variables).forEach(function(variable) {
target.contentDocument.documentElement.style.setProperty(`--${variable}`,variables[variable]);
});
});
// propagate focus
@@ -138,7 +137,48 @@
// apply default styles
const defaultStyles = newDocument.createElement('style');
defaultStyles.id = '_defaultStyles';
defaultStyles.innerHTML = initData.styles;
const vars = Object.keys(initData.styles).map(function(variable) {
return `--${variable}: ${initData.styles[variable]};`;
});
defaultStyles.innerHTML = `
:root { ${vars.join(' ')} }
body {
background-color: var(--background-color);
color: var(--color);
font-family: var(--font-family);
font-weight: var(--font-weight);
font-size: var(--font-size);
margin: 0;
padding: 0 20px;
}
img {
max-width: 100%;
max-height: 100%;
}
a:focus,
input:focus,
select:focus,
textarea:focus {
outline: 1px solid -webkit-focus-ring-color;
outline-offset: -1px;
}
::-webkit-scrollbar {
width: 10px;
height: 10px;
}
::-webkit-scrollbar-thumb {
background-color: var(--scrollbar-thumb);
}
::-webkit-scrollbar-thumb:hover {
background-color: var(--scrollbar-thumb-hover);
}
::-webkit-scrollbar-thumb:active {
background-color: var(--scrollbar-thumb-active);
}
`;
if (newDocument.head.hasChildNodes()) {
newDocument.head.insertBefore(defaultStyles, newDocument.head.firstChild);
} else {

124
src/vs/workbench/parts/html/browser/webview.ts
View File

@@ -16,22 +16,6 @@ import { WebviewFindWidget } from './webviewFindWidget';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
export declare interface WebviewElement extends HTMLElement {
src: string;
preload: string;
send(channel: string, ...args: any[]);
openDevTools(): any;
getWebContents(): any;
findInPage(value: string, options?: WebviewElementFindInPageOptions);
stopFindInPage(action: string);
}
export class StopFindInPageActions {
static clearSelection = 'clearSelection';
static keepSelection = 'keepSelection';
static activateSelection = 'activateSelection';
}
export interface WebviewElementFindInPageOptions {
forward?: boolean;
findNext?: boolean;
@@ -58,7 +42,7 @@ export interface WebviewOptions {
export default class Webview {
private static index: number = 0;
private _webview: WebviewElement;
private readonly _webview: Electron.WebviewTag;
private _ready: TPromise<this>;
private _disposables: IDisposable[] = [];
private _onDidClickLink = new Emitter<URI>();
@@ -70,14 +54,14 @@ export default class Webview {
private _findStarted: boolean = false;
constructor(
private parent: HTMLElement,
private _styleElement: Element,
@IContextViewService private _contextViewService: IContextViewService,
private _contextKey: IContextKey<boolean>,
private _findInputContextKey: IContextKey<boolean>,
private readonly parent: HTMLElement,
private readonly _styleElement: Element,
@IContextViewService private readonly _contextViewService: IContextViewService,
private readonly _contextKey: IContextKey<boolean>,
private readonly _findInputContextKey: IContextKey<boolean>,
private _options: WebviewOptions = {},
) {
this._webview = <any>document.createElement('webview');
this._webview = document.createElement('webview');
this._webview.setAttribute('partition', this._options.allowSvgs ? 'webview' : `webview${Webview.index++}`);
// disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick)
@@ -119,7 +103,7 @@ export default class Webview {
return;
}
contents.session.webRequest.onBeforeRequest((details, callback) => {
(contents.session.webRequest as any).onBeforeRequest((details, callback) => {
if (details.url.indexOf('.svg') > 0) {
const uri = URI.parse(details.url);
if (uri && !uri.scheme.match(/file/i) && (uri.path as any).endsWith('.svg') && !this.isAllowedSvg(uri)) {
@@ -130,7 +114,7 @@ export default class Webview {
return callback({});
});
contents.session.webRequest.onHeadersReceived((details, callback) => {
(contents.session.webRequest as any).onHeadersReceived((details, callback) => {
const contentType: string[] = (details.responseHeaders['content-type'] || details.responseHeaders['Content-Type']) as any;
if (contentType && Array.isArray(contentType) && contentType.some(x => x.toLowerCase().indexOf('image/svg') >= 0)) {
const uri = URI.parse(details.url);
@@ -276,87 +260,33 @@ export default class Webview {
style(theme: ITheme): void {
const { fontFamily, fontWeight, fontSize } = window.getComputedStyle(this._styleElement); // TODO@theme avoid styleElement
let value = `
:root {
--background-color: ${theme.getColor(editorBackground)};
--color: ${theme.getColor(editorForeground)};
--font-family: ${fontFamily};
--font-weight: ${fontWeight};
--font-size: ${fontSize};
}
body {
background-color: var(--background-color);
color: var(--color);
font-family: var(--font-family);
font-weight: var(--font-weight);
font-size: var(--font-size);
margin: 0;
padding: 0 20px;
}
img {
max-width: 100%;
max-height: 100%;
}
a:focus,
input:focus,
select:focus,
textarea:focus {
outline: 1px solid -webkit-focus-ring-color;
outline-offset: -1px;
}
::-webkit-scrollbar {
width: 10px;
height: 10px;
}`;
const styles = {
'background-color': theme.getColor(editorBackground).toString(),
'color': theme.getColor(editorForeground).toString(),
'font-family': fontFamily,
'font-weight': fontWeight,
'font-size': fontSize,
};
let activeTheme: ApiThemeClassName;
if (theme.type === LIGHT) {
value += `
::-webkit-scrollbar-thumb {
background-color: rgba(100, 100, 100, 0.4);
}
::-webkit-scrollbar-thumb:hover {
background-color: rgba(100, 100, 100, 0.7);
}
::-webkit-scrollbar-thumb:active {
background-color: rgba(0, 0, 0, 0.6);
}`;
styles['scrollbar-thumb'] = 'rgba(100, 100, 100, 0.4)';
styles['scrollbar-thumb-hover'] = 'rgba(100, 100, 100, 0.7)';
styles['scrollbar-thumb-active'] = 'rgba(0, 0, 0, 0.6)';
activeTheme = 'vscode-light';
} else if (theme.type === DARK) {
value += `
::-webkit-scrollbar-thumb {
background-color: rgba(121, 121, 121, 0.4);
}
::-webkit-scrollbar-thumb:hover {
background-color: rgba(100, 100, 100, 0.7);
}
::-webkit-scrollbar-thumb:active {
background-color: rgba(85, 85, 85, 0.8);
}`;
styles['scrollbar-thumb'] = 'rgba(121, 121, 121, 0.4)';
styles['scrollbar-thumb-hover'] = 'rgba(100, 100, 100, 0.7)';
styles['scrollbar-thumb-active'] = 'rgba(85, 85, 85, 0.8)';
activeTheme = 'vscode-dark';
} else {
value += `
::-webkit-scrollbar-thumb {
background-color: rgba(111, 195, 223, 0.3);
}
::-webkit-scrollbar-thumb:hover {
background-color: rgba(111, 195, 223, 0.8);
}
::-webkit-scrollbar-thumb:active {
background-color: rgba(111, 195, 223, 0.8);
}`;
styles['scrollbar-thumb'] = 'rgba(111, 195, 223, 0.3)';
styles['scrollbar-thumb-hover'] = 'rgba(111, 195, 223, 0.8)';
styles['scrollbar-thumb-active'] = 'rgba(111, 195, 223, 0.8)';
activeTheme = 'vscode-high-contrast';
}
this._send('styles', value, activeTheme);
this._send('styles', styles, activeTheme);
this._webviewFindWidget.updateTheme(theme);
}
@@ -445,7 +375,7 @@ export default class Webview {
public stopFind(keepSelection?: boolean): void {
this._findStarted = false;
this._webview.stopFindInPage(keepSelection ? StopFindInPageActions.keepSelection : StopFindInPageActions.clearSelection);
this._webview.stopFindInPage(keepSelection ? 'keepSelection' : 'clearSelection');
}
public showFind() {

2
src/vs/workbench/parts/html/browser/webviewEditor.ts
View File

@@ -9,7 +9,7 @@ import { BaseWebviewEditor } from 'vs/workbench/browser/parts/editor/webviewEdit
import { IStorageService } from 'vs/platform/storage/common/storage';
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { Command, ICommandOptions } from 'vs/editor/common/editorCommonExtensions';
import { Command, ICommandOptions } from 'vs/editor/browser/editorExtensions';
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
import { ContextKeyExpr, IContextKey, RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';

4
src/vs/workbench/parts/html/browser/webviewFindWidget.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { SimpleFindWidget } from 'vs/editor/contrib/find/browser/simpleFindWidget';
import { SimpleFindWidget } from 'vs/editor/contrib/find/simpleFindWidget';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import Webview from './webview';
@@ -25,7 +25,7 @@ export class WebviewFindWidget extends SimpleFindWidget {
if (this.webview !== null && val) {
this.webview.find(val, { findNext: true, forward: !previous });
}
};
}
public hide() {
super.hide();