ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-31 17:20:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 966b87dd4013be1a9c06e2b8334522ec61905cc2 (#4696)

Browse Source
This commit is contained in:
Anthony Dresser
2019-03-26 11:43:38 -07:00
committed by GitHub
parent b1393ae615
commit 0d8ef9583b
268 changed files with 5947 additions and 3422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts
View File

@@ -19,6 +19,8 @@ import { DARK, ITheme, IThemeService, LIGHT } from 'vs/platform/theme/common/the
import { registerFileProtocol, WebviewProtocol } from 'vs/workbench/contrib/webview/electron-browser/webviewProtocols';
import { areWebviewInputOptionsEqual } from './webviewEditorService';
import { WebviewFindWidget } from './webviewFindWidget';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
export interface WebviewPortMapping {
readonly port: number;
@@ -32,7 +34,10 @@ export interface WebviewPortMapping {
export interface WebviewOptions {
readonly allowSvgs?: boolean;
readonly extensionLocation?: URI;
readonly extension?: {
readonly location: URI;
readonly id?: ExtensionIdentifier;
};
readonly enableFindWidget?: boolean;
}
@@ -145,10 +150,14 @@ class WebviewPortMappingProvider extends Disposable {
constructor(
session: WebviewSession,
mappings: () => ReadonlyArray<WebviewPortMapping>
mappings: () => ReadonlyArray<WebviewPortMapping>,
extensionId: ExtensionIdentifier | undefined,
@ITelemetryService telemetryService: ITelemetryService,
) {
super();
let hasLogged = false;
session.onBeforeRequest(async (details) => {
const uri = URI.parse(details.url);
if (uri.scheme !== 'http' && uri.scheme !== 'https') {
@@ -157,6 +166,17 @@ class WebviewPortMappingProvider extends Disposable {
const localhostMatch = /^localhost:(\d+)$/.exec(uri.authority);
if (localhostMatch) {
if (!hasLogged && extensionId) {
hasLogged = true;
/* __GDPR__
"webview.accessLocalhost" : {
"extension" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
telemetryService.publicLog('webview.accessLocalhost', { extension: extensionId.value });
}
const port = +localhostMatch[1];
for (const mapping of mappings()) {
if (mapping.port === port && mapping.port !== mapping.resolvedPort) {
@@ -317,6 +337,7 @@ export class WebviewElement extends Disposable {
@IThemeService themeService: IThemeService,
@IEnvironmentService environmentService: IEnvironmentService,
@IFileService fileService: IFileService,
@ITelemetryService telemetryService: ITelemetryService,
) {
super();
this._webview = document.createElement('webview');
@@ -348,15 +369,16 @@ export class WebviewElement extends Disposable {
this._register(new WebviewProtocolProvider(
this._webview,
this._options.extensionLocation,
this._options.extension ? this._options.extension.location : undefined,
() => (this._contentOptions.localResourceRoots || []),
environmentService,
fileService));
this._register(new WebviewPortMappingProvider(
session,
() => (this._contentOptions.portMappings || [])
));
() => (this._contentOptions.portMappings || []),
_options.extension ? _options.extension.id : undefined,
telemetryService));
if (!this._options.allowSvgs) {
@@ -556,7 +578,7 @@ export class WebviewElement extends Disposable {
colors['vscode-' + entry.id.replace('.', '-')] = color.toString();
}
return colors;
}, {});
}, {} as { [key: string]: string });
const styles = {