ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-06 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

VS Code merge to df8fe74bd55313de0dd2303bc47a4aab0ca56b0e (#17979)

Browse Source 
* Merge from vscode 504f934659740e9d41501cad9f162b54d7745ad9

* delete unused folders

* distro

* Bump build node version

* update chokidar

* FIx hygiene errors

* distro

* Fix extension lint issues

* Remove strict-vscode

* Add copyright header exemptions

* Bump vscode-extension-telemetry to fix webpacking issue with zone.js

* distro

* Fix failing tests (revert marked.js back to current one until we decide to update)

* Skip searchmodel test

* Fix mac build

* temp debug script loading

* Try disabling coverage

* log error too

* Revert "log error too"

This reverts commit af0183e5d4ab458fdf44b88fbfab9908d090526f.

* Revert "temp debug script loading"

This reverts commit 3d687d541c76db2c5b55626c78ae448d3c25089c.

* Add comments explaining coverage disabling

* Fix ansi_up loading issue

* Merge latest from ads

* Use newer option

* Fix compile

* add debug logging warn

* Always log stack

* log more

* undo debug

* Update to use correct base path (+cleanup)

* distro

* fix compile errors

* Remove strict-vscode

* Fix sql editors not showing

* Show db dropdown input & fix styling

* Fix more info in gallery

* Fix gallery asset requests

* Delete unused workflow

* Fix tapable resolutions for smoke test compile error

* Fix smoke compile

* Disable crash reporting

* Disable interactive

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2022-01-06 09:06:56 -08:00
committed by GitHub
parent fd2736b6a6
commit 2bc6a0cd01
2099 changed files with 79520 additions and 43813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/vs/platform/webview/electron-main/webviewMainService.ts
View File

@@ -3,10 +3,10 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { session, WebContents, webContents } from 'electron';
import { WebContents, webContents, WebFrameMain } from 'electron';
import { Emitter } from 'vs/base/common/event';
import { Disposable } from 'vs/base/common/lifecycle';
import { ITunnelService } from 'vs/platform/remote/common/tunnel';
import { IWebviewManagerService, webviewPartitionId, WebviewWebContentsId, WebviewWindowId } from 'vs/platform/webview/common/webviewManagerService';
import { FindInFrameOptions, FoundInFrameResult, IWebviewManagerService, WebviewWebContentsId, WebviewWindowId } from 'vs/platform/webview/common/webviewManagerService';
import { WebviewProtocolProvider } from 'vs/platform/webview/electron-main/webviewProtocolProvider';
import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
@@ -14,25 +14,14 @@ export class WebviewMainService extends Disposable implements IWebviewManagerSer
declare readonly _serviceBrand: undefined;
private readonly _onFoundInFrame = this._register(new Emitter<FoundInFrameResult>());
public onFoundInFrame = this._onFoundInFrame.event;
constructor(
@ITunnelService tunnelService: ITunnelService,
@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
) {
super();
this._register(new WebviewProtocolProvider());
const sess = session.fromPartition(webviewPartitionId);
sess.setPermissionRequestHandler((_webContents, permission, callback) => {
if (permission === 'clipboard-read') {
return callback(true);
}
return callback(false);
});
sess.setPermissionCheckHandler((_webContents, permission /* 'media' */) => {
return permission === 'clipboard-read';
});
}
public async setIgnoreMenuShortcuts(id: WebviewWebContentsId | WebviewWindowId, enabled: boolean): Promise<void> {
@@ -57,4 +46,53 @@ export class WebviewMainService extends Disposable implements IWebviewManagerSer
contents.setIgnoreMenuShortcuts(enabled);
}
}
public async findInFrame(windowId: WebviewWindowId, frameName: string, text: string, options: { findNext?: boolean, forward?: boolean }): Promise<void> {
const initialFrame = this.getFrameByName(windowId, frameName);
type WebFrameMainWithFindSupport = typeof WebFrameMain & {
findInFrame?(text: string, findOptions: FindInFrameOptions): void;
};
const frame = initialFrame as unknown as WebFrameMainWithFindSupport;
if (typeof frame.findInFrame === 'function') {
frame.findInFrame(text, {
findNext: options.findNext,
forward: options.forward,
});
const foundInFrameHandler = (_: unknown, result: FoundInFrameResult) => {
if (result.finalUpdate) {
this._onFoundInFrame.fire(result);
initialFrame.removeListener('found-in-frame', foundInFrameHandler);
}
};
initialFrame.on('found-in-frame', foundInFrameHandler);
}
}
public async stopFindInFrame(windowId: WebviewWindowId, frameName: string, options: { keepSelection?: boolean }): Promise<void> {
const initialFrame = this.getFrameByName(windowId, frameName);
type WebFrameMainWithFindSupport = typeof WebFrameMain & {
stopFindInFrame?(stopOption: 'keepSelection' | 'clearSelection'): void;
};
const frame = initialFrame as unknown as WebFrameMainWithFindSupport;
if (typeof frame.stopFindInFrame === 'function') {
frame.stopFindInFrame(options.keepSelection ? 'keepSelection' : 'clearSelection');
}
}
private getFrameByName(windowId: WebviewWindowId, frameName: string): WebFrameMain {
const window = this.windowsMainService.getWindowById(windowId.windowId);
if (!window?.win) {
throw new Error(`Invalid windowId: ${windowId}`);
}
const frame = window.win.webContents.mainFrame.framesInSubtree.find(frame => {
return frame.name === frameName;
});
if (!frame) {
throw new Error(`Unknown frame: ${frameName}`);
}
return frame;
}
}