@codingame/monaco-vscode-views-service-override 1.85.1 → 1.85.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-views-service-override",
-  "version": "1.85.1",
+  "version": "1.85.3",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,14 +18,16 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.3",
     "monaco-editor": "0.45.0",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "1.85.1",
-    "@codingame/monaco-vscode-layout-service-override": "1.85.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "1.85.1",
-    "@codingame/monaco-vscode-keybindings-service-override": "1.85.1",
-    "@codingame/monaco-vscode-environment-service-override": "1.85.1",
-    "@codingame/monaco-vscode-extensions-service-override": "1.85.1",
-    "@codingame/monaco-vscode-files-service-override": "1.85.1"
+    "@codingame/monaco-vscode-bulk-edit-service-override": "1.85.3",
+    "@codingame/monaco-vscode-layout-service-override": "1.85.3",
+    "@codingame/monaco-vscode-quickaccess-service-override": "1.85.3",
+    "@codingame/monaco-vscode-keybindings-service-override": "1.85.3",
+    "@codingame/monaco-vscode-files-service-override": "1.85.3",
+    "@codingame/monaco-vscode-extensions-service-override": "1.85.3",
+    "@codingame/monaco-vscode-environment-service-override": "1.85.3",
+    "@codingame/monaco-vscode-host-service-override": "1.85.3",
+    "@codingame/monaco-vscode-base-service-override": "1.85.3"
   }
 }

package/tools/editor.js

@@ -344,7 +344,7 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
             return this.delegate.getLayout();
         };
         this.getGroups = (order) => {
-            return [...this.additionalGroups, ...this.delegate.getGroups(order)];
+            return [...this.delegate.getGroups(order), ...this.additionalGroups];
         };
         this.getGroup = (identifier) => {
             return this.delegate.getGroup(identifier) ?? this.additionalGroups.find(group => group.id === identifier);

package/views.js

@@ -26,10 +26,8 @@ import './vscode/src/vs/workbench/contrib/files/browser/fileCommands.js';
 import './vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.js';
 import './vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.js';
 import './vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.js';
-import './vscode/src/vs/workbench/contrib/outline/browser/outline.contribution.js';
 import './vscode/src/vs/workbench/browser/actions/listCommands.js';
-import './vscode/src/vs/workbench/browser/parts/views/media/views.css.js';
+import 'vscode/vscode/vs/workbench/browser/parts/views/media/views.css';
 import './vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js';
 import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.contribution';
 import 'vscode/vscode/vs/workbench/browser/workbench.contribution';
@@ -65,8 +63,6 @@ import { registerAction2, Action2, MenuId } from 'monaco-editor/esm/vs/platform/
 import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
 import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { BaseActionViewItem } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionViewItems.js';
-import { IOutlineService } from 'vscode/vscode/vs/workbench/services/outline/browser/outline';
-import { OutlineService } from './vscode/src/vs/workbench/services/outline/browser/outlineService.js';
 import { ICustomEditorService } from 'vscode/vscode/vs/workbench/contrib/customEditor/common/customEditor';
 import { CustomEditorService } from './vscode/src/vs/workbench/contrib/customEditor/browser/customEditors.js';
 import { WebviewService } from './vscode/src/vs/workbench/contrib/webview/browser/webviewService.js';
@@ -790,7 +786,6 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains,
         [( IContextViewService.toString())]: new SyncDescriptor(ContextViewService, [], true),
         [( IUntitledTextEditorService.toString())]: new SyncDescriptor(UntitledTextEditorService, [], true),
         [( IHistoryService.toString())]: new SyncDescriptor(HistoryService, [], false),
-        [( IOutlineService.toString())]: new SyncDescriptor(OutlineService, [], true),
         [( ICustomEditorService.toString())]: new SyncDescriptor(CustomEditorService, [], true),
         [( IWebviewService.toString())]: new SyncDescriptor(WebviewService, [], true),
         [( IWebviewViewService.toString())]: new SyncDescriptor(WebviewViewService, [], true),

package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js

@@ -9,7 +9,7 @@ import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiati
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 import { Extensions as Extensions$2 } from 'vscode/vscode/vs/workbench/browser/panecomposite';
-import { RawCustomTreeViewContextKey, TreeViewPane, CustomTreeView } from '../../browser/parts/views/treeView.js';
+import { RawCustomTreeViewContextKey, TreeViewPane, CustomTreeView } from 'vscode/vscode/vs/workbench/browser/parts/views/treeView';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Extensions as Extensions$1, ResolvableTreeItem } from 'vscode/vscode/vs/workbench/common/views';

package/vscode/src/vs/workbench/services/history/browser/historyService.js

@@ -3,6 +3,7 @@ import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { isEditorPaneWithSelection, isEditorInput, EditorResourceAccessor, EditorCloseContext, SideBySideEditor, isSideBySideEditorInput, isResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history';
 import { FILES_EXCLUDE_CONFIG, FileChangesEvent, FileOperationEvent, IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
 import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
 import { Disposable, DisposableStore, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
@@ -15,6 +16,7 @@ import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiati
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { RawContextKey, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { coalesce, remove } from 'monaco-editor/esm/vs/base/common/arrays.js';
+import { registerSingleton } from 'monaco-editor/esm/vs/platform/instantiation/common/extensions.js';
 import { WindowIdleValue, EventHelper, addDisposableListener, EventType } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { IWorkspacesService } from 'vscode/vscode/vs/platform/workspaces/common/workspaces';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
@@ -816,6 +818,7 @@ HistoryService = HistoryService_1 = ( __decorate([
     ( __param(8, IWorkbenchLayoutService)),
     ( __param(9, IContextKeyService))
 ], HistoryService));
+( registerSingleton(IHistoryService, HistoryService, 0 ));
 class EditorSelectionState {
     constructor(editorIdentifier, selection, reason) {
         this.editorIdentifier = editorIdentifier;

package/vscode/src/vs/base/browser/ui/tree/treeDefaults.js

@@ -1,16 +0,0 @@
-import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-
-class CollapseAllAction extends Action {
-    constructor(viewer, enabled) {
-        super('vs.tree.collapse', ( nls.localizeWithPath('vs/base/browser/ui/tree/treeDefaults', 'collapse all', "Collapse All")), 'collapse-all', enabled);
-        this.viewer = viewer;
-    }
-    async run() {
-        this.viewer.collapseAll();
-        this.viewer.setSelection([]);
-        this.viewer.setFocus([]);
-    }
-}
-
-export { CollapseAllAction };

package/vscode/src/vs/workbench/browser/parts/views/checkbox.js

@@ -1,107 +0,0 @@
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { setupCustomHover } from 'monaco-editor/esm/vs/base/browser/ui/iconLabel/iconLabelHover.js';
-import { Toggle } from 'monaco-editor/esm/vs/base/browser/ui/toggle/toggle.js';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { defaultToggleStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
-
-class CheckboxStateHandler extends Disposable {
-    constructor() {
-        super(...arguments);
-        this._onDidChangeCheckboxState = this._register(( new Emitter()));
-        this.onDidChangeCheckboxState = this._onDidChangeCheckboxState.event;
-    }
-    setCheckboxState(node) {
-        this._onDidChangeCheckboxState.fire([node]);
-    }
-}
-class TreeItemCheckbox extends Disposable {
-    static { this.checkboxClass = 'custom-view-tree-node-item-checkbox'; }
-    constructor(container, checkboxStateHandler, hoverDelegate) {
-        super();
-        this.checkboxStateHandler = checkboxStateHandler;
-        this.hoverDelegate = hoverDelegate;
-        this.isDisposed = false;
-        this._onDidChangeState = ( new Emitter());
-        this.onDidChangeState = this._onDidChangeState.event;
-        this.checkboxContainer = container;
-    }
-    render(node) {
-        if (node.checkbox) {
-            if (!this.toggle) {
-                this.createCheckbox(node);
-            }
-            else {
-                this.toggle.checked = node.checkbox.isChecked;
-                this.toggle.setIcon(this.toggle.checked ? Codicon.check : undefined);
-            }
-        }
-    }
-    createCheckbox(node) {
-        if (node.checkbox) {
-            this.toggle = ( new Toggle({
-                isChecked: node.checkbox.isChecked,
-                title: '',
-                icon: node.checkbox.isChecked ? Codicon.check : undefined,
-                ...defaultToggleStyles
-            }));
-            this.setHover(node.checkbox);
-            this.setAccessibilityInformation(node.checkbox);
-            this.toggle.domNode.classList.add(TreeItemCheckbox.checkboxClass);
-            this.toggle.domNode.tabIndex = 1;
-            dom.append(this.checkboxContainer, this.toggle.domNode);
-            this.registerListener(node);
-        }
-    }
-    registerListener(node) {
-        if (this.toggle) {
-            this._register({ dispose: () => this.removeCheckbox() });
-            this._register(this.toggle);
-            this._register(this.toggle.onChange(() => {
-                this.setCheckbox(node);
-            }));
-        }
-    }
-    setHover(checkbox) {
-        if (this.toggle) {
-            if (!this.hover) {
-                this.hover = setupCustomHover(this.hoverDelegate, this.toggle.domNode, this.checkboxHoverContent(checkbox));
-                this._register(this.hover);
-            }
-            else {
-                this.hover.update(checkbox.tooltip);
-            }
-        }
-    }
-    setCheckbox(node) {
-        if (this.toggle && node.checkbox) {
-            node.checkbox.isChecked = this.toggle.checked;
-            this.toggle.setIcon(this.toggle.checked ? Codicon.check : undefined);
-            this.setHover(node.checkbox);
-            this.setAccessibilityInformation(node.checkbox);
-            this.checkboxStateHandler.setCheckboxState(node);
-        }
-    }
-    checkboxHoverContent(checkbox) {
-        return checkbox.tooltip ? checkbox.tooltip :
-            checkbox.isChecked ? ( localizeWithPath('vs/workbench/browser/parts/views/checkbox', 'checked', 'Checked')) : ( localizeWithPath('vs/workbench/browser/parts/views/checkbox', 'unchecked', 'Unchecked'));
-    }
-    setAccessibilityInformation(checkbox) {
-        if (this.toggle && checkbox.accessibilityInformation) {
-            this.toggle.domNode.ariaLabel = checkbox.accessibilityInformation.label;
-            if (checkbox.accessibilityInformation.role) {
-                this.toggle.domNode.role = checkbox.accessibilityInformation.role;
-            }
-        }
-    }
-    removeCheckbox() {
-        const children = this.checkboxContainer.children;
-        for (const child of children) {
-            this.checkboxContainer.removeChild(child);
-        }
-    }
-}
-
-export { CheckboxStateHandler, TreeItemCheckbox };

package/vscode/src/vs/workbench/browser/parts/views/media/views.css.js

@@ -1,6 +0,0 @@
-import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-
-var css = ".file-icon-themable-tree .align-icon-with-twisty .monaco-tl-twistie:not(.force-twistie):not(.collapsible),.file-icon-themable-tree .monaco-tl-twistie.force-no-twistie,.file-icon-themable-tree.align-icons-and-twisties .monaco-tl-twistie:not(.force-twistie):not(.collapsible),.file-icon-themable-tree.hide-arrows .monaco-tl-twistie:not(.force-twistie){background-image:none!important;padding-right:0!important;visibility:hidden;width:0!important}.file-icon-themable-tree .monaco-list-row .content .monaco-highlighted-label .highlight,.monaco-tl-contents .monaco-highlighted-label .highlight{background-color:var(--vscode-list-filterMatchBackground);color:unset!important;outline:1px dotted var(--vscode-list-filterMatchBorder);outline-offset:-1px}.monaco-workbench .tree-explorer-viewlet-tree-view{height:100%}.monaco-workbench .tree-explorer-viewlet-tree-view .message{display:flex;padding:4px 12px 4px 18px;user-select:text;-webkit-user-select:text}.monaco-workbench .tree-explorer-viewlet-tree-view .message p{margin-bottom:0;margin-top:0;padding-bottom:4px}.monaco-workbench .tree-explorer-viewlet-tree-view .message ul{padding-left:24px}.monaco-workbench .tree-explorer-viewlet-tree-view .message a{color:var(--vscode-textLink-foreground)}.monaco-workbench .tree-explorer-viewlet-tree-view .message.hide{display:none}.monaco-workbench .tree-explorer-viewlet-tree-view .customview-tree{height:100%}.monaco-workbench .tree-explorer-viewlet-tree-view .customview-tree.hide{display:none}.monaco-workbench .pane>.pane-body>.welcome-view{box-sizing:border-box;display:flex;flex-direction:column;height:100%;width:100%}.monaco-workbench .pane>.pane-body.welcome>:not(.welcome-view),.monaco-workbench .pane>.pane-body:not(.welcome)>.welcome-view{display:none}.monaco-workbench .pane>.pane-body .welcome-view-content{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;padding:0 20px 1em}.monaco-workbench .pane>.pane-body .welcome-view-content>.button-container{max-width:300px;width:100%}.monaco-workbench:not(.reduce-motion) .pane>.pane-body .welcome-view-content>.button-container{transition:max-width .2s ease-out}.monaco-workbench .pane>.pane-body .welcome-view-content.wide>.button-container{max-width:100%}.monaco-workbench .pane>.pane-body .welcome-view-content>.button-container>.monaco-button{max-width:300px}.monaco-workbench .pane>.pane-body .welcome-view-content>p{width:100%}.monaco-workbench .pane>.pane-body .welcome-view-content>*{margin-block-end:0;margin-block-start:1em;margin-inline-end:0;margin-inline-start:0}.customview-tree .monaco-list-row .monaco-tl-contents.align-icon-with-twisty:before{display:none}.customview-tree .monaco-list-row .monaco-tl-contents:not(.align-icon-with-twisty):before{display:inline-block}.customview-tree .monaco-list .monaco-list-row{padding-left:0;padding-right:12px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item{display:flex;flex:1;flex-wrap:nowrap;height:22px;line-height:22px;overflow:hidden;padding-left:3px;text-overflow:ellipsis}.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .custom-view-tree-node-item-checkbox{background-color:var(--vscode-checkbox-selectBackground);border:1px solid var(--vscode-checkbox-selectBorder)}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-checkbox{background-color:var(--vscode-checkbox-background);border:1px solid var(--vscode-checkbox-border);height:16px;margin:3px 6px 3px 0;opacity:1;padding:0;width:16px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-checkbox.codicon{font-size:13px;line-height:15px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .monaco-inputbox{flex:1;line-height:normal}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel{flex:1;overflow:hidden;text-overflow:ellipsis}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .monaco-icon-label-container:after{content:\"\";display:block}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon,.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-icon{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;align-items:center;background-position:0;background-repeat:no-repeat;background-size:16px;display:flex;height:22px;justify-content:center;padding-right:6px;width:16px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.disabled{opacity:.6}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.codicon.codicon-modifier-spin{margin-left:-6px;padding-left:6px}.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.codicon{color:currentColor!important}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel .monaco-icon-label-container>.monaco-icon-name-container{flex:1}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel:after{margin-right:4px;padding-right:0}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .actions{display:none}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .actions .action-label{padding:2px}.customview-tree .monaco-list .monaco-list-row.focused .custom-view-tree-node-item .actions,.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .actions,.customview-tree .monaco-list .monaco-list-row:hover .custom-view-tree-node-item .actions{display:block}.viewpane-filter-container{cursor:default;display:flex}.viewpane-filter-container.grow{flex:1}.viewpane-filter-container>.viewpane-filter{align-items:center;display:flex;flex:1;position:relative}.viewpane-filter-container>.viewpane-filter .monaco-inputbox{flex:1;font-size:12px;height:24px}.pane-header .viewpane-filter-container>.viewpane-filter .monaco-inputbox .monaco-inputbox{height:20px;line-height:18px}.monaco-workbench.vs .viewpane-filter-container>.viewpane-filter .monaco-inputbox{height:25px}.viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls{align-items:center;bottom:0;display:flex;position:absolute;right:0;top:0}.viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls>.viewpane-filter-badge{border-radius:2px;margin:4px 0;padding:0 8px}.viewpane-filter.small>.viewpane-filter-controls>.viewpane-filter-badge,.viewpane-filter>.viewpane-filter-controls>.viewpane-filter-badge.hidden{display:none}.viewpane-filter>.viewpane-filter-controls>.monaco-action-bar .action-item .action-label.codicon.filter{padding:2px}.panel>.title .monaco-action-bar .action-item.viewpane-filter-container{margin-right:10px;max-width:400px;min-width:150px}.pane-body .viewpane-filter-container:not(:empty){flex:1;height:auto;margin:10px 20px}.pane-body .viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls .monaco-action-bar .action-item{margin-right:4px}.viewpane-filter>.viewpane-filter-controls .monaco-action-bar .action-label.codicon.codicon-filter.checked{background-color:var(--vscode-inputOption-activeBackground);border-color:var(--vscode-inputOption-activeBorder);color:var(--vscode-inputOption-activeForeground)}";
-n(css,{});
-
-export { css, css as default };