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

package/package.json

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

@@ -26,8 +26,6 @@ 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/vscode/vs/workbench/browser/parts/views/media/views.css';
 import './vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js';
@@ -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/contrib/codeEditor/browser/outline/documentSymbolsOutline.js

@@ -1,371 +0,0 @@
-import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { DisposableStore, Disposable, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { IOutlineService } from 'vscode/vscode/vs/workbench/services/outline/browser/outline';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { DocumentSymbolFilter, DocumentSymbolGroupRenderer, DocumentSymbolRenderer, DocumentSymbolComparator, DocumentSymbolIdentityProvider, DocumentSymbolNavigationLabelProvider, DocumentSymbolAccessibilityProvider, DocumentSymbolVirtualDelegate } from './documentSymbolsTree.js';
-import { isCodeEditor, isDiffEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
-import { OutlineModel, OutlineGroup, OutlineElement, TreeElement, IOutlineModelService } from 'monaco-editor/esm/vs/editor/contrib/documentSymbols/browser/outlineModel.js';
-import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { Barrier, TimeoutTimer, timeout, raceCancellation } from 'monaco-editor/esm/vs/base/common/async.js';
-import { onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { ITextResourceConfigurationService } from 'monaco-editor/esm/vs/editor/common/services/textResourceConfiguration.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { IMarkerDecorationsService } from 'monaco-editor/esm/vs/editor/common/services/markerDecorations.js';
-import { MarkerSeverity } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
-import { isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { ILanguageFeaturesService } from 'monaco-editor/esm/vs/editor/common/services/languageFeatures.js';
-
-let DocumentSymbolBreadcrumbsSource = class DocumentSymbolBreadcrumbsSource {
-    constructor(_editor, _textResourceConfigurationService) {
-        this._editor = _editor;
-        this._textResourceConfigurationService = _textResourceConfigurationService;
-        this._breadcrumbs = [];
-    }
-    getBreadcrumbElements() {
-        return this._breadcrumbs;
-    }
-    clear() {
-        this._breadcrumbs = [];
-    }
-    update(model, position) {
-        const newElements = this._computeBreadcrumbs(model, position);
-        this._breadcrumbs = newElements;
-    }
-    _computeBreadcrumbs(model, position) {
-        let item = model.getItemEnclosingPosition(position);
-        if (!item) {
-            return [];
-        }
-        const chain = [];
-        while (item) {
-            chain.push(item);
-            const parent = item.parent;
-            if (parent instanceof OutlineModel) {
-                break;
-            }
-            if (parent instanceof OutlineGroup && parent.parent && parent.parent.children.size === 1) {
-                break;
-            }
-            item = parent;
-        }
-        const result = [];
-        for (let i = chain.length - 1; i >= 0; i--) {
-            const element = chain[i];
-            if (this._isFiltered(element)) {
-                break;
-            }
-            result.push(element);
-        }
-        if (result.length === 0) {
-            return [];
-        }
-        return result;
-    }
-    _isFiltered(element) {
-        if (!(element instanceof OutlineElement)) {
-            return false;
-        }
-        const key = `breadcrumbs.${DocumentSymbolFilter.kindToConfigName[element.symbol.kind]}`;
-        let uri;
-        if (this._editor && this._editor.getModel()) {
-            const model = this._editor.getModel();
-            uri = model.uri;
-        }
-        return !this._textResourceConfigurationService.getValue(uri, key);
-    }
-};
-DocumentSymbolBreadcrumbsSource = ( __decorate([
-    ( __param(1, ITextResourceConfigurationService))
-], DocumentSymbolBreadcrumbsSource));
-let DocumentSymbolsOutline = class DocumentSymbolsOutline {
-    get activeElement() {
-        const posistion = this._editor.getPosition();
-        if (!posistion || !this._outlineModel) {
-            return undefined;
-        }
-        else {
-            return this._outlineModel.getItemEnclosingPosition(posistion);
-        }
-    }
-    constructor(_editor, target, firstLoadBarrier, _languageFeaturesService, _codeEditorService, _outlineModelService, _configurationService, _markerDecorationsService, textResourceConfigurationService, instantiationService) {
-        this._editor = _editor;
-        this._languageFeaturesService = _languageFeaturesService;
-        this._codeEditorService = _codeEditorService;
-        this._outlineModelService = _outlineModelService;
-        this._configurationService = _configurationService;
-        this._markerDecorationsService = _markerDecorationsService;
-        this._disposables = ( new DisposableStore());
-        this._onDidChange = ( new Emitter());
-        this.onDidChange = this._onDidChange.event;
-        this._outlineDisposables = ( new DisposableStore());
-        this.outlineKind = 'documentSymbols';
-        this._breadcrumbsDataSource = ( new DocumentSymbolBreadcrumbsSource(_editor, textResourceConfigurationService));
-        const delegate = ( new DocumentSymbolVirtualDelegate());
-        const renderers = [( new DocumentSymbolGroupRenderer()), instantiationService.createInstance(DocumentSymbolRenderer, true)];
-        const treeDataSource = {
-            getChildren: (parent) => {
-                if (parent instanceof OutlineElement || parent instanceof OutlineGroup) {
-                    return ( parent.children.values());
-                }
-                if (parent === this && this._outlineModel) {
-                    return ( this._outlineModel.children.values());
-                }
-                return [];
-            }
-        };
-        const comparator = ( new DocumentSymbolComparator());
-        const initialState = textResourceConfigurationService.getValue(_editor.getModel()?.uri, "outline.collapseItems" );
-        const options = {
-            collapseByDefault: target === 2  || ((target === 1  && initialState === "alwaysCollapse") ),
-            expandOnlyOnTwistieClick: true,
-            multipleSelectionSupport: false,
-            identityProvider: ( new DocumentSymbolIdentityProvider()),
-            keyboardNavigationLabelProvider: ( new DocumentSymbolNavigationLabelProvider()),
-            accessibilityProvider: ( new DocumentSymbolAccessibilityProvider(( localizeWithPath(
-                'vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline',
-                'document',
-                "Document Symbols"
-            )))),
-            filter: target === 1
-                ? instantiationService.createInstance(DocumentSymbolFilter, 'outline')
-                : target === 2
-                    ? instantiationService.createInstance(DocumentSymbolFilter, 'breadcrumbs')
-                    : undefined
-        };
-        this.config = {
-            breadcrumbsDataSource: this._breadcrumbsDataSource,
-            delegate,
-            renderers,
-            treeDataSource,
-            comparator,
-            options,
-            quickPickDataSource: { getQuickPickElements: () => { throw new Error('not implemented'); } }
-        };
-        this._disposables.add(_languageFeaturesService.documentSymbolProvider.onDidChange(_ => this._createOutline()));
-        this._disposables.add(this._editor.onDidChangeModel(_ => this._createOutline()));
-        this._disposables.add(this._editor.onDidChangeModelLanguage(_ => this._createOutline()));
-        const updateSoon = ( new TimeoutTimer());
-        this._disposables.add(updateSoon);
-        this._disposables.add(this._editor.onDidChangeModelContent(event => {
-            const model = this._editor.getModel();
-            if (model) {
-                const timeout = _outlineModelService.getDebounceValue(model);
-                updateSoon.cancelAndSet(() => this._createOutline(event), timeout);
-            }
-        }));
-        this._disposables.add(this._editor.onDidDispose(() => this._outlineDisposables.clear()));
-        this._createOutline().finally(() => firstLoadBarrier.open());
-    }
-    dispose() {
-        this._disposables.dispose();
-        this._outlineDisposables.dispose();
-    }
-    get isEmpty() {
-        return !this._outlineModel || TreeElement.empty(this._outlineModel);
-    }
-    get uri() {
-        return this._outlineModel?.uri;
-    }
-    async reveal(entry, options, sideBySide) {
-        const model = OutlineModel.get(entry);
-        if (!model || !(entry instanceof OutlineElement)) {
-            return;
-        }
-        await this._codeEditorService.openCodeEditor({
-            resource: model.uri,
-            options: {
-                ...options,
-                selection: Range.collapseToStart(entry.symbol.selectionRange),
-                selectionRevealType: 3 ,
-            }
-        }, this._editor, sideBySide);
-    }
-    preview(entry) {
-        if (!(entry instanceof OutlineElement)) {
-            return Disposable.None;
-        }
-        const { symbol } = entry;
-        this._editor.revealRangeInCenterIfOutsideViewport(symbol.range, 0 );
-        const decorationsCollection = this._editor.createDecorationsCollection([{
-                range: symbol.range,
-                options: {
-                    description: 'document-symbols-outline-range-highlight',
-                    className: 'rangeHighlight',
-                    isWholeLine: true
-                }
-            }]);
-        return toDisposable(() => decorationsCollection.clear());
-    }
-    captureViewState() {
-        const viewState = this._editor.saveViewState();
-        return toDisposable(() => {
-            if (viewState) {
-                this._editor.restoreViewState(viewState);
-            }
-        });
-    }
-    async _createOutline(contentChangeEvent) {
-        this._outlineDisposables.clear();
-        if (!contentChangeEvent) {
-            this._setOutlineModel(undefined);
-        }
-        if (!this._editor.hasModel()) {
-            return;
-        }
-        const buffer = this._editor.getModel();
-        if (!( this._languageFeaturesService.documentSymbolProvider.has(buffer))) {
-            return;
-        }
-        const cts = ( new CancellationTokenSource());
-        const versionIdThen = buffer.getVersionId();
-        const timeoutTimer = ( new TimeoutTimer());
-        this._outlineDisposables.add(timeoutTimer);
-        this._outlineDisposables.add(toDisposable(() => cts.dispose(true)));
-        try {
-            const model = await this._outlineModelService.getOrCreate(buffer, cts.token);
-            if (cts.token.isCancellationRequested) {
-                return;
-            }
-            if (TreeElement.empty(model) || !this._editor.hasModel()) {
-                this._setOutlineModel(model);
-                return;
-            }
-            if (contentChangeEvent && this._outlineModel && buffer.getLineCount() >= 25) {
-                const newSize = TreeElement.size(model);
-                const newLength = buffer.getValueLength();
-                const newRatio = newSize / newLength;
-                const oldSize = TreeElement.size(this._outlineModel);
-                const oldLength = newLength - contentChangeEvent.changes.reduce((prev, value) => prev + value.rangeLength, 0);
-                const oldRatio = oldSize / oldLength;
-                if (newRatio <= oldRatio * 0.5 || newRatio >= oldRatio * 1.5) {
-                    const value = await raceCancellation(timeout(2000).then(() => true), cts.token, false);
-                    if (!value) {
-                        return;
-                    }
-                }
-            }
-            this._applyMarkersToOutline(model);
-            this._outlineDisposables.add(this._markerDecorationsService.onDidChangeMarker(textModel => {
-                if (isEqual(model.uri, textModel.uri)) {
-                    this._applyMarkersToOutline(model);
-                    this._onDidChange.fire({});
-                }
-            }));
-            this._outlineDisposables.add(this._configurationService.onDidChangeConfiguration(e => {
-                if (e.affectsConfiguration("outline.problems.enabled" ) || e.affectsConfiguration('problems.visibility')) {
-                    const problem = this._configurationService.getValue('problems.visibility');
-                    const config = this._configurationService.getValue("outline.problems.enabled" );
-                    if (!problem || !config) {
-                        model.updateMarker([]);
-                    }
-                    else {
-                        this._applyMarkersToOutline(model);
-                    }
-                    this._onDidChange.fire({});
-                }
-                if (e.affectsConfiguration('outline')) {
-                    this._onDidChange.fire({});
-                }
-                if (e.affectsConfiguration('breadcrumbs') && this._editor.hasModel()) {
-                    this._breadcrumbsDataSource.update(model, this._editor.getPosition());
-                    this._onDidChange.fire({});
-                }
-            }));
-            this._outlineDisposables.add(this._configurationService.onDidChangeConfiguration(e => {
-                if (e.affectsConfiguration("outline.icons" )) {
-                    this._onDidChange.fire({});
-                }
-                if (e.affectsConfiguration('outline')) {
-                    this._onDidChange.fire({});
-                }
-            }));
-            this._outlineDisposables.add(this._editor.onDidChangeCursorPosition(_ => {
-                timeoutTimer.cancelAndSet(() => {
-                    if (!buffer.isDisposed() && versionIdThen === buffer.getVersionId() && this._editor.hasModel()) {
-                        this._breadcrumbsDataSource.update(model, this._editor.getPosition());
-                        this._onDidChange.fire({ affectOnlyActiveElement: true });
-                    }
-                }, 150);
-            }));
-            this._setOutlineModel(model);
-        }
-        catch (err) {
-            this._setOutlineModel(undefined);
-            onUnexpectedError(err);
-        }
-    }
-    _applyMarkersToOutline(model) {
-        const problem = this._configurationService.getValue('problems.visibility');
-        const config = this._configurationService.getValue("outline.problems.enabled" );
-        if (!model || !problem || !config) {
-            return;
-        }
-        const markers = [];
-        for (const [range, marker] of this._markerDecorationsService.getLiveMarkers(model.uri)) {
-            if (marker.severity === MarkerSeverity.Error || marker.severity === MarkerSeverity.Warning) {
-                markers.push({ ...range, severity: marker.severity });
-            }
-        }
-        model.updateMarker(markers);
-    }
-    _setOutlineModel(model) {
-        const position = this._editor.getPosition();
-        if (!position || !model) {
-            this._outlineModel = undefined;
-            this._breadcrumbsDataSource.clear();
-        }
-        else {
-            if (!this._outlineModel?.merge(model)) {
-                this._outlineModel = model;
-            }
-            this._breadcrumbsDataSource.update(model, position);
-        }
-        this._onDidChange.fire({});
-    }
-};
-DocumentSymbolsOutline = ( __decorate([
-    ( __param(3, ILanguageFeaturesService)),
-    ( __param(4, ICodeEditorService)),
-    ( __param(5, IOutlineModelService)),
-    ( __param(6, IConfigurationService)),
-    ( __param(7, IMarkerDecorationsService)),
-    ( __param(8, ITextResourceConfigurationService)),
-    ( __param(9, IInstantiationService))
-], DocumentSymbolsOutline));
-let DocumentSymbolsOutlineCreator = class DocumentSymbolsOutlineCreator {
-    constructor(outlineService) {
-        const reg = outlineService.registerOutlineCreator(this);
-        this.dispose = () => reg.dispose();
-    }
-    matches(candidate) {
-        const ctrl = candidate.getControl();
-        return isCodeEditor(ctrl) || isDiffEditor(ctrl);
-    }
-    async createOutline(pane, target, _token) {
-        const control = pane.getControl();
-        let editor;
-        if (isCodeEditor(control)) {
-            editor = control;
-        }
-        else if (isDiffEditor(control)) {
-            editor = control.getModifiedEditor();
-        }
-        if (!editor) {
-            return undefined;
-        }
-        const firstLoadBarrier = ( new Barrier());
-        const result = editor.invokeWithinContext(accessor => accessor.get(IInstantiationService).createInstance(DocumentSymbolsOutline, editor, target, firstLoadBarrier));
-        await firstLoadBarrier.wait();
-        return result;
-    }
-};
-DocumentSymbolsOutlineCreator = ( __decorate([
-    ( __param(0, IOutlineService))
-], DocumentSymbolsOutlineCreator));
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(DocumentSymbolsOutlineCreator, 4 );

package/vscode/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.css.js

@@ -1,6 +0,0 @@
-import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-
-var css = ".monaco-list .monaco-list-row.focused.selected .outline-element .monaco-highlighted-label,.monaco-list .monaco-list-row.focused.selected .outline-element-decoration{color:inherit!important}.monaco-list .outline-element{align-items:center;display:flex;flex:1;flex-flow:row nowrap}.monaco-list .outline-element .monaco-highlighted-label{color:var(--outline-element-color)}.monaco-breadcrumbs .outline-element .outline-element-decoration,.monaco-list .outline-element .outline-element-decoration{color:var(--outline-element-color);font-size:90%;font-weight:600;margin-left:auto;opacity:.75;padding:0 12px 0 5px;text-align:center}.monaco-breadcrumbs .outline-element .monaco-icon-label-container .monaco-icon-description-container,.monaco-breadcrumbs .outline-element .outline-element-decoration{display:none}.monaco-list .outline-element .outline-element-decoration.bubble{font-family:codicon;font-size:14px;opacity:.4;padding-right:8px}.monaco-list .outline-element .outline-element-icon{margin-right:4px}";
-n(css,{});
-
-export { css, css as default };