@codingame/monaco-vscode-api 30.0.1 → 31.0.0

package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js

@@ -37,7 +37,7 @@ class AccessibleViewNextAction extends Action2 {
                 when: ( ContextKeyExpr.and(accessibleViewIsShown, accessibleViewSupportsNavigation))
             }],
             icon: Codicon.arrowDown,
-            title: ( localize(4522, "Show Next in Accessible View"))
+            title: ( localize(4525, "Show Next in Accessible View"))
         });
     }
     run(accessor) {
@@ -62,7 +62,7 @@ class AccessibleViewNextCodeBlockAction extends Action2 {
                 ...accessibleViewMenu,
                 when: ( ContextKeyExpr.and(accessibleViewIsShown, accessibleViewContainsCodeBlocks))
             },
-            title: ( localize(4523, "Accessible View: Next Code Block"))
+            title: ( localize(4526, "Accessible View: Next Code Block"))
         });
     }
     run(accessor) {
@@ -87,7 +87,7 @@ class AccessibleViewPreviousCodeBlockAction extends Action2 {
                 ...accessibleViewMenu,
                 when: ( ContextKeyExpr.and(accessibleViewIsShown, accessibleViewContainsCodeBlocks))
             },
-            title: ( localize(4524, "Accessible View: Previous Code Block"))
+            title: ( localize(4527, "Accessible View: Previous Code Block"))
         });
     }
     run(accessor) {
@@ -109,7 +109,7 @@ class AccessibleViewPreviousAction extends Action2 {
                 ...accessibleViewMenu,
                 when: ( ContextKeyExpr.and(accessibleViewIsShown, accessibleViewSupportsNavigation))
             }],
-            title: ( localize(4525, "Show Previous in Accessible View"))
+            title: ( localize(4528, "Show Previous in Accessible View"))
         });
     }
     run(accessor) {
@@ -132,7 +132,7 @@ class AccessibleViewGoToSymbolAction extends Action2 {
                 ...accessibleViewMenu,
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.or(accessibleViewIsShown, accessibilityHelpIsShown)), accessibleViewGoToSymbolSupported))
             }],
-            title: ( localize(4526, "Go To Symbol in Accessible View"))
+            title: ( localize(4529, "Go To Symbol in Accessible View"))
         });
     }
     run(accessor) {
@@ -159,7 +159,7 @@ const AccessibilityHelpAction = registerCommand(( new MultiCommand({
     menuOpts: [{
         menuId: MenuId.CommandPalette,
         group: "",
-        title: ( localize(4527, "Open Accessibility Help")),
+        title: ( localize(4530, "Open Accessibility Help")),
         order: 1
     }]
 })));
@@ -177,7 +177,7 @@ const AccessibleViewAction = registerCommand(( new MultiCommand({
     menuOpts: [{
         menuId: MenuId.CommandPalette,
         group: "",
-        title: ( localize(4528, "Open Accessible View")),
+        title: ( localize(4531, "Open Accessible View")),
         order: 1
     }]
 })));
@@ -196,7 +196,7 @@ class AccessibleViewDisableHintAction extends Action2 {
                 group: "navigation",
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.or(accessibleViewIsShown, accessibilityHelpIsShown)), accessibleViewVerbosityEnabled))
             }],
-            title: ( localize(4529, "Disable Accessible View Hint"))
+            title: ( localize(4532, "Disable Accessible View Hint"))
         });
     }
     run(accessor) {
@@ -220,7 +220,7 @@ class AccessibilityHelpConfigureKeybindingsAction extends Action2 {
                 order: 3,
                 when: accessibleViewHasUnassignedKeybindings
             }],
-            title: ( localize(4530, "Accessibility Help Configure Unassigned Keybindings"))
+            title: ( localize(4533, "Accessibility Help Configure Unassigned Keybindings"))
         });
     }
     async run(accessor) {
@@ -244,7 +244,7 @@ class AccessibilityHelpConfigureAssignedKeybindingsAction extends Action2 {
                 order: 4,
                 when: accessibleViewHasAssignedKeybindings
             }],
-            title: ( localize(4531, "Accessibility Help Configure Assigned Keybindings"))
+            title: ( localize(4534, "Accessibility Help Configure Assigned Keybindings"))
         });
     }
     async run(accessor) {
@@ -261,7 +261,7 @@ class AccessibilityHelpOpenHelpLinkAction extends Action2 {
                 primary: KeyMod$1.Alt | KeyCode.KeyH,
                 weight: KeybindingWeight.WorkbenchContrib
             },
-            title: ( localize(4532, "Accessibility Help Open Help Link"))
+            title: ( localize(4535, "Accessibility Help Open Help Link"))
         });
     }
     run(accessor) {
@@ -294,7 +294,7 @@ class AccessibleViewAcceptInlineCompletionAction extends Action2 {
                     AccessibleViewProviderId.InlineCompletions
                 ))))
             }],
-            title: ( localize(4533, "Accept Inline Completion"))
+            title: ( localize(4536, "Accept Inline Completion"))
         });
     }
     async run(accessor) {

package/vscode/src/vs/workbench/contrib/browserView/common/browserEditorInput.d.ts

@@ -0,0 +1,61 @@
+import { ThemeIcon } from "../../../../base/common/themables.js";
+import { URI } from "../../../../base/common/uri.js";
+import { IBrowserEditorViewState, IBrowserViewModel } from "./browserView.js";
+import { IBrowserViewWorkbenchService } from "./browserView.service.js";
+import { EditorInputCapabilities, IEditorSerializer, IUntypedEditorInput, Verbosity } from "../../../common/editor.js";
+import { EditorInput } from "../../../common/editor/editorInput.js";
+import { IThemeService } from "../../../../platform/theme/common/themeService.service.js";
+import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
+import { ILifecycleService } from "../../../services/lifecycle/common/lifecycle.service.js";
+import { ITelemetryService } from "../../../../platform/telemetry/common/telemetry.service.js";
+/**
+ * JSON-serializable type used during browser state serialization/deserialization
+ */
+export interface IBrowserEditorInputData extends IBrowserEditorViewState {
+    readonly id: string;
+}
+export declare class BrowserEditorInput extends EditorInput {
+    private readonly themeService;
+    private readonly browserViewWorkbenchService;
+    private readonly lifecycleService;
+    private readonly instantiationService;
+    private readonly telemetryService;
+    static readonly ID = "workbench.editorinputs.browser";
+    static readonly EDITOR_ID = "workbench.editor.browser";
+    static readonly DEFAULT_LABEL: string;
+    private readonly _id;
+    private _initialData;
+    private _model;
+    private _modelPromise;
+    constructor(options: IBrowserEditorInputData, themeService: IThemeService, browserViewWorkbenchService: IBrowserViewWorkbenchService, lifecycleService: ILifecycleService, instantiationService: IInstantiationService, telemetryService: ITelemetryService);
+    get id(): string;
+    get url(): string | undefined;
+    get title(): string | undefined;
+    get favicon(): string | undefined;
+    navigate(url: string): void;
+    resolve(): Promise<IBrowserViewModel>;
+    get typeId(): string;
+    get editorId(): string;
+    get capabilities(): EditorInputCapabilities;
+    get resource(): URI;
+    getIcon(): ThemeIcon | URI | undefined;
+    getName(): string;
+    getTitle(verbosity?: Verbosity): string;
+    getDescription(verbosity?: Verbosity): string | undefined;
+    private readonly getURLTitles;
+    canReopen(): boolean;
+    matches(otherInput: EditorInput | IUntypedEditorInput): boolean;
+    /**
+     * Creates a copy of this browser editor input with a new unique ID, creating an independent browser view with no linked state.
+     * This is used during Copy into New Window.
+     */
+    copy(): EditorInput;
+    toUntyped(): IUntypedEditorInput;
+    dispose(): void;
+    serialize(): IBrowserEditorInputData;
+}
+export declare class BrowserEditorSerializer implements IEditorSerializer {
+    canSerialize(editorInput: EditorInput): editorInput is BrowserEditorInput;
+    serialize(editorInput: EditorInput): string | undefined;
+    deserialize(instantiationService: IInstantiationService, serializedEditor: string): EditorInput | undefined;
+}

package/vscode/src/vs/workbench/contrib/browserView/common/browserEditorInput.js

@@ -0,0 +1,267 @@
+
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { truncate } from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { BrowserViewUri } from '../../../../platform/browserView/common/browserViewUri.js';
+import { IBrowserViewWorkbenchService } from './browserView.service.js';
+import { Verbosity, EditorInputCapabilities } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
+import { TAB_ACTIVE_FOREGROUND } from '../../../common/theme.js';
+import { localize } from '../../../../nls.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { hasKey } from '../../../../base/common/types.js';
+import { ShutdownReason } from '../../../services/lifecycle/common/lifecycle.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.service.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
+import { logBrowserOpen } from '../../../../platform/browserView/common/browserViewTelemetry.js';
+import { LRUCachedFunction } from '../../../../base/common/cache.js';
+
+var BrowserEditorInput_1;
+const LOADING_SPINNER_SVG = color => `
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16">
+        <path d="M8 1a7 7 0 1 0 0 14 7 7 0 0 0 0-14zm0 1.5a5.5 5.5 0 1 1 0 11 5.5 5.5 0 0 1 0-11z" fill="${color}" opacity="0.3"/>
+        <path d="M8 1a7 7 0 0 1 7 7h-1.5A5.5 5.5 0 0 0 8 2.5V1z" fill="${color}">
+            <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" values="0 8 8;360 8 8"/>
+        </path>
+    </svg>
+`;
+const MAX_TITLE_LENGTH = 30;
+let BrowserEditorInput = class BrowserEditorInput extends EditorInput {
+    static {
+        BrowserEditorInput_1 = this;
+    }
+    static {
+        this.ID = "workbench.editorinputs.browser";
+    }
+    static {
+        this.EDITOR_ID = "workbench.editor.browser";
+    }
+    static {
+        this.DEFAULT_LABEL = ( localize(4620, "Browser"));
+    }
+    constructor(
+        options,
+        themeService,
+        browserViewWorkbenchService,
+        lifecycleService,
+        instantiationService,
+        telemetryService
+    ) {
+        super();
+        this.themeService = themeService;
+        this.browserViewWorkbenchService = browserViewWorkbenchService;
+        this.lifecycleService = lifecycleService;
+        this.instantiationService = instantiationService;
+        this.telemetryService = telemetryService;
+        this.getURLTitles = ( new LRUCachedFunction(url => {
+            let _parsed = undefined;
+            let _short = undefined;
+            let _medium = undefined;
+            let _long = undefined;
+            function getParsed() {
+                if (!_parsed) {
+                    _parsed = ( URI.parse(url));
+                }
+                return _parsed;
+            }
+            return {
+                get [Verbosity.SHORT]() {
+                    if (!_short) {
+                        _short = getParsed().authority;
+                    }
+                    return _short;
+                },
+                get [Verbosity.MEDIUM]() {
+                    if (!_medium) {
+                        _medium = ( getParsed().with({
+                            query: "",
+                            fragment: ""
+                        }).toString());
+                    }
+                    return _medium;
+                },
+                get [Verbosity.LONG]() {
+                    if (!_long) {
+                        _long = ( getParsed().with({
+                            fragment: ""
+                        }).toString());
+                    }
+                    return _long;
+                }
+            };
+        }));
+        this._id = options.id;
+        this._initialData = options;
+        this._register(this.lifecycleService.onWillShutdown(e => {
+            if (this._model) {
+                if (e.reason === ShutdownReason.RELOAD) {
+                    void this._model.setVisible(false);
+                } else {
+                    this._model.dispose();
+                    this._model = undefined;
+                }
+            }
+        }));
+    }
+    get id() {
+        return this._id;
+    }
+    get url() {
+        return this._model ? this._model.url : this._initialData.url;
+    }
+    get title() {
+        return this._model ? this._model.title : this._initialData.title;
+    }
+    get favicon() {
+        return this._model ? this._model.favicon : this._initialData.favicon;
+    }
+    navigate(url) {
+        if (this._model) {
+            void this._model.loadURL(url);
+        } else {
+            this._initialData = {
+                id: this._id,
+                url
+            };
+            this._onDidChangeLabel.fire();
+        }
+    }
+    async resolve() {
+        if (!this._model && !this._modelPromise) {
+            this._modelPromise = (async () => {
+                this._model = await this.browserViewWorkbenchService.getOrCreateBrowserViewModel(this._id);
+                this._modelPromise = undefined;
+                this._register(this._model.onWillDispose(() => {
+                    this._model = undefined;
+                }));
+                this._register(this._model.onDidClose(() => {
+                    this.dispose();
+                }));
+                this._register(this._model.onDidChangeTitle(() => this._onDidChangeLabel.fire()));
+                this._register(this._model.onDidChangeFavicon(() => this._onDidChangeLabel.fire()));
+                this._register(this._model.onDidChangeLoadingState(() => this._onDidChangeLabel.fire()));
+                this._register(this._model.onDidNavigate(() => this._onDidChangeLabel.fire()));
+                if (this._initialData.url) {
+                    this._model.setInitialURL(this._initialData.url, this._initialData.title, this._initialData.favicon);
+                }
+                this._onDidChangeLabel.fire();
+                return this._model;
+            })();
+        }
+        return this._model || this._modelPromise;
+    }
+    get typeId() {
+        return BrowserEditorInput_1.ID;
+    }
+    get editorId() {
+        return BrowserEditorInput_1.EDITOR_ID;
+    }
+    get capabilities() {
+        return EditorInputCapabilities.ForceReveal | EditorInputCapabilities.Readonly;
+    }
+    get resource() {
+        return BrowserViewUri.forId(this._id);
+    }
+    getIcon() {
+        if (this._model) {
+            if (this._model.loading) {
+                const color = this.themeService.getColorTheme().getColor(TAB_ACTIVE_FOREGROUND);
+                return ( URI.parse(
+                    "data:image/svg+xml;utf8," + encodeURIComponent(LOADING_SPINNER_SVG(color?.toString()))
+                ));
+            }
+            if (this._model.favicon) {
+                return ( URI.parse(this._model.favicon));
+            }
+            return Codicon.globe;
+        }
+        if (this._initialData.favicon) {
+            return ( URI.parse(this._initialData.favicon));
+        }
+        return Codicon.globe;
+    }
+    getName() {
+        const hasTitle = this._model ? !!this._model.title : !!this._initialData.title;
+        const name = hasTitle ? this.title : this.getDescription(Verbosity.SHORT) || BrowserEditorInput_1.DEFAULT_LABEL;
+        return truncate(name, MAX_TITLE_LENGTH);
+    }
+    getTitle(verbosity = Verbosity.MEDIUM) {
+        const hasTitle = this._model ? !!this._model.title : !!this._initialData.title;
+        const description = this.getDescription(verbosity);
+        const title = hasTitle ? `${this.title} (${description})` : description;
+        return title || BrowserEditorInput_1.DEFAULT_LABEL;
+    }
+    getDescription(verbosity = Verbosity.MEDIUM) {
+        return this.url && this.getURLTitles.get(this.url)[verbosity];
+    }
+    canReopen() {
+        return true;
+    }
+    matches(otherInput) {
+        if (super.matches(otherInput)) {
+            return true;
+        }
+        if (otherInput instanceof BrowserEditorInput_1) {
+            return this._id === otherInput._id;
+        }
+        if (hasKey(otherInput, {
+            resource: true
+        }) && otherInput.resource?.scheme === BrowserViewUri.scheme) {
+            const parsed = BrowserViewUri.parse(otherInput.resource);
+            if (parsed) {
+                return this._id === parsed.id;
+            }
+        }
+        return false;
+    }
+    copy() {
+        logBrowserOpen(this.telemetryService, "copyToNewWindow");
+        return this.instantiationService.createInstance(BrowserEditorInput_1, {
+            id: generateUuid(),
+            url: this.url,
+            title: this.title,
+            favicon: this.favicon
+        });
+    }
+    toUntyped() {
+        const viewState = {
+            url: this.url,
+            title: this.title,
+            favicon: this.favicon
+        };
+        return {
+            resource: this.resource,
+            options: {
+                override: BrowserEditorInput_1.EDITOR_ID,
+                viewState
+            }
+        };
+    }
+    dispose() {
+        super.dispose();
+        if (this._model) {
+            this._initialData = {
+                id: this._id,
+                url: this._model.url,
+                title: this._model.title,
+                favicon: this._model.favicon
+            };
+            this._model.dispose();
+            this._model = undefined;
+        }
+    }
+    serialize() {
+        return {
+            id: this._id,
+            url: this.url,
+            title: this.title,
+            favicon: this.favicon
+        };
+    }
+};
+BrowserEditorInput = BrowserEditorInput_1 = ( __decorate([( __param(1, IThemeService)), ( __param(2, IBrowserViewWorkbenchService)), ( __param(3, ILifecycleService)), ( __param(4, IInstantiationService)), ( __param(5, ITelemetryService))], BrowserEditorInput));
+
+export { BrowserEditorInput };

package/vscode/src/vs/workbench/contrib/browserView/common/browserView.d.ts

@@ -4,13 +4,13 @@ import { VSBuffer } from "../../../../base/common/buffer.js";
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { IDialogService } from "../../../../platform/dialogs/common/dialogs.service.js";
 import { IStorageService } from "../../../../platform/storage/common/storage.service.js";
-import { IElementData } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/platform/browserElements/common/browserElements";
 import { IPlaywrightService } from "../../../../platform/browserView/common/playwrightService.service.js";
-import { IBrowserViewBounds, IBrowserViewNavigationEvent, IBrowserViewLoadingEvent, IBrowserViewLoadError, IBrowserViewFocusEvent, IBrowserViewKeyDownEvent, IBrowserViewTitleChangeEvent, IBrowserViewFaviconChangeEvent, IBrowserViewNewPageRequest, IBrowserViewDevToolsStateEvent, IBrowserViewService, BrowserViewStorageScope, IBrowserViewCaptureScreenshotOptions, IBrowserViewFindInPageOptions, IBrowserViewFindInPageResult, IBrowserViewVisibilityEvent, IBrowserViewCertificateError } from "../../../../platform/browserView/common/browserView.js";
+import { IBrowserViewBounds, IBrowserViewNavigationEvent, IBrowserViewLoadingEvent, IBrowserViewLoadError, IBrowserViewFocusEvent, IBrowserViewKeyDownEvent, IBrowserViewTitleChangeEvent, IBrowserViewFaviconChangeEvent, IBrowserViewNewPageRequest, IBrowserViewDevToolsStateEvent, IBrowserViewService, BrowserViewStorageScope, IBrowserViewCaptureScreenshotOptions, IBrowserViewFindInPageOptions, IBrowserViewFindInPageResult, IBrowserViewVisibilityEvent, IBrowserViewCertificateError, IElementData } from "../../../../platform/browserView/common/browserView.js";
 import { IWorkspaceContextService } from "../../../../platform/workspace/common/workspace.service.js";
 import { ITelemetryService } from "../../../../platform/telemetry/common/telemetry.service.js";
 import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 import { IWorkspaceTrustManagementService } from "../../../../platform/workspace/common/workspaceTrust.service.js";
+import { IAgentNetworkFilterService } from "../../../../platform/networkFilter/common/networkFilterService.service.js";
 import { IBrowserZoomService } from "./browserZoomService.service.js";
 /**
  * View state stored in editor options when opening a browser view.
@@ -58,6 +58,7 @@ export interface IBrowserViewModel extends IDisposable {
     readonly onDidClose: Event<void>;
     readonly onWillDispose: Event<void>;
     initialize(create: boolean): Promise<void>;
+    setInitialURL(url: string, title?: string, favicon?: string): void;
     layout(bounds: IBrowserViewBounds): Promise<void>;
     setVisible(visible: boolean): Promise<void>;
     loadURL(url: string): Promise<void>;
@@ -66,7 +67,7 @@ export interface IBrowserViewModel extends IDisposable {
     reload(hard?: boolean): Promise<void>;
     toggleDevTools(): Promise<void>;
     captureScreenshot(options?: IBrowserViewCaptureScreenshotOptions): Promise<VSBuffer>;
-    focus(): Promise<void>;
+    focus(force?: boolean): Promise<void>;
     findInPage(text: string, options?: IBrowserViewFindInPageOptions): Promise<void>;
     stopFindInPage(keepSelection?: boolean): Promise<void>;
     getSelectedText(): Promise<string>;
@@ -92,6 +93,7 @@ export declare class BrowserViewModel extends Disposable implements IBrowserView
     private readonly dialogService;
     private readonly storageService;
     private readonly zoomService;
+    private readonly agentNetworkFilterService;
     private _url;
     private _title;
     private _favicon;
@@ -115,7 +117,7 @@ export declare class BrowserViewModel extends Disposable implements IBrowserView
     readonly onDidChangeZoom: Event<void>;
     private readonly _onWillDispose;
     readonly onWillDispose: Event<void>;
-    constructor(id: string, browserViewService: IBrowserViewService, workspaceContextService: IWorkspaceContextService, workspaceTrustManagementService: IWorkspaceTrustManagementService, telemetryService: ITelemetryService, configurationService: IConfigurationService, playwrightService: IPlaywrightService, dialogService: IDialogService, storageService: IStorageService, zoomService: IBrowserZoomService);
+    constructor(id: string, browserViewService: IBrowserViewService, workspaceContextService: IWorkspaceContextService, workspaceTrustManagementService: IWorkspaceTrustManagementService, telemetryService: ITelemetryService, configurationService: IConfigurationService, playwrightService: IPlaywrightService, dialogService: IDialogService, storageService: IStorageService, zoomService: IBrowserZoomService, agentNetworkFilterService: IAgentNetworkFilterService);
     get url(): string;
     get title(): string;
     get favicon(): string | undefined;
@@ -150,6 +152,7 @@ export declare class BrowserViewModel extends Disposable implements IBrowserView
      * @throws If the browser view doesn't exist and `create` is false, or if initialization fails
      */
     initialize(create: boolean): Promise<void>;
+    setInitialURL(url: string, title?: string, favicon?: string): void;
     layout(bounds: IBrowserViewBounds): Promise<void>;
     setVisible(visible: boolean): Promise<void>;
     loadURL(url: string): Promise<void>;
@@ -158,7 +161,7 @@ export declare class BrowserViewModel extends Disposable implements IBrowserView
     reload(hard?: boolean): Promise<void>;
     toggleDevTools(): Promise<void>;
     captureScreenshot(options?: IBrowserViewCaptureScreenshotOptions): Promise<VSBuffer>;
-    focus(): Promise<void>;
+    focus(force?: boolean): Promise<void>;
     findInPage(text: string, options?: IBrowserViewFindInPageOptions): Promise<void>;
     stopFindInPage(keepSelection?: boolean): Promise<void>;
     getSelectedText(): Promise<string>;