@codingame/monaco-vscode-api 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsModel.js

@@ -0,0 +1,140 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { matchesSomeScheme, Schemas } from '../../../../base/common/network.js';
+import { isEqual, dirname } from '../../../../base/common/resources.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { FileKind } from '../../../../platform/files/common/files.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { BreadcrumbsConfig } from './breadcrumbs.js';
+import { IOutlineService } from '../../../services/outline/browser/outline.js';
+class FileElement {
+    constructor(uri, kind) {
+        this.uri = uri;
+        this.kind = kind;
+    }
+}
+class OutlineElement2 {
+    constructor(element, outline) {
+        this.element = element;
+        this.outline = outline;
+    }
+}
+let BreadcrumbsModel = class BreadcrumbsModel {
+    constructor(resource, editor, configurationService, _workspaceService, _outlineService) {
+        this.resource = resource;
+        this._workspaceService = _workspaceService;
+        this._outlineService = _outlineService;
+        this._disposables = ( new DisposableStore());
+        this._currentOutline = ( new MutableDisposable());
+        this._outlineDisposables = ( new DisposableStore());
+        this._onDidUpdate = ( new Emitter());
+        this.onDidUpdate = this._onDidUpdate.event;
+        this._cfgFilePath = BreadcrumbsConfig.FilePath.bindTo(configurationService);
+        this._cfgSymbolPath = BreadcrumbsConfig.SymbolPath.bindTo(configurationService);
+        this._disposables.add(this._cfgFilePath.onDidChange(_ => this._onDidUpdate.fire(this)));
+        this._disposables.add(this._cfgSymbolPath.onDidChange(_ => this._onDidUpdate.fire(this)));
+        this._workspaceService.onDidChangeWorkspaceFolders(this._onDidChangeWorkspaceFolders, this, this._disposables);
+        this._fileInfo = this._initFilePathInfo(resource);
+        if (editor) {
+            this._bindToEditor(editor);
+            this._disposables.add(_outlineService.onDidChange(() => this._bindToEditor(editor)));
+            this._disposables.add(editor.onDidChangeControl(() => this._bindToEditor(editor)));
+        }
+        this._onDidUpdate.fire(this);
+    }
+    dispose() {
+        this._disposables.dispose();
+        this._cfgFilePath.dispose();
+        this._cfgSymbolPath.dispose();
+        this._currentOutline.dispose();
+        this._outlineDisposables.dispose();
+        this._onDidUpdate.dispose();
+    }
+    isRelative() {
+        return Boolean(this._fileInfo.folder);
+    }
+    getElements() {
+        let result = [];
+        if (this._cfgFilePath.getValue() === 'on') {
+            result = result.concat(this._fileInfo.path);
+        }
+        else if (this._cfgFilePath.getValue() === 'last' && this._fileInfo.path.length > 0) {
+            result = result.concat(this._fileInfo.path.slice(-1));
+        }
+        if (this._cfgSymbolPath.getValue() === 'off') {
+            return result;
+        }
+        if (!this._currentOutline.value) {
+            return result;
+        }
+        const breadcrumbsElements = this._currentOutline.value.config.breadcrumbsDataSource.getBreadcrumbElements();
+        for (let i = this._cfgSymbolPath.getValue() === 'last' && breadcrumbsElements.length > 0 ? breadcrumbsElements.length - 1 : 0; i < breadcrumbsElements.length; i++) {
+            result.push(( new OutlineElement2(breadcrumbsElements[i], this._currentOutline.value)));
+        }
+        if (breadcrumbsElements.length === 0 && !this._currentOutline.value.isEmpty) {
+            result.push(( new OutlineElement2(this._currentOutline.value, this._currentOutline.value)));
+        }
+        return result;
+    }
+    _initFilePathInfo(uri) {
+        if (matchesSomeScheme(uri, Schemas.untitled, Schemas.data)) {
+            return {
+                folder: undefined,
+                path: []
+            };
+        }
+        const info = {
+            folder: this._workspaceService.getWorkspaceFolder(uri) ?? undefined,
+            path: []
+        };
+        let uriPrefix = uri;
+        while (uriPrefix && uriPrefix.path !== '/') {
+            if (info.folder && isEqual(info.folder.uri, uriPrefix)) {
+                break;
+            }
+            info.path.unshift(( new FileElement(uriPrefix, info.path.length === 0 ? FileKind.FILE : FileKind.FOLDER)));
+            const prevPathLength = uriPrefix.path.length;
+            uriPrefix = dirname(uriPrefix);
+            if (uriPrefix.path.length === prevPathLength) {
+                break;
+            }
+        }
+        if (info.folder && this._workspaceService.getWorkbenchState() === 3 ) {
+            info.path.unshift(( new FileElement(info.folder.uri, FileKind.ROOT_FOLDER)));
+        }
+        return info;
+    }
+    _onDidChangeWorkspaceFolders() {
+        this._fileInfo = this._initFilePathInfo(this.resource);
+        this._onDidUpdate.fire(this);
+    }
+    _bindToEditor(editor) {
+        const newCts = ( new CancellationTokenSource());
+        this._currentOutline.clear();
+        this._outlineDisposables.clear();
+        this._outlineDisposables.add(toDisposable(() => newCts.dispose(true)));
+        this._outlineService.createOutline(editor, 2 , newCts.token).then(outline => {
+            if (newCts.token.isCancellationRequested) {
+                outline?.dispose();
+                outline = undefined;
+            }
+            this._currentOutline.value = outline;
+            this._onDidUpdate.fire(this);
+            if (outline) {
+                this._outlineDisposables.add(outline.onDidChange(() => this._onDidUpdate.fire(this)));
+            }
+        }).catch(err => {
+            this._onDidUpdate.fire(this);
+            onUnexpectedError(err);
+        });
+    }
+};
+BreadcrumbsModel = ( __decorate([
+    ( __param(2, IConfigurationService)),
+    ( __param(3, IWorkspaceContextService)),
+    ( __param(4, IOutlineService))
+], BreadcrumbsModel));
+export { BreadcrumbsModel, FileElement, OutlineElement2 };

package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.js

@@ -0,0 +1,410 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { compareFileNames } from '../../../../base/common/comparers.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { createMatches } from '../../../../base/common/filters.js';
+import { parse } from '../../../../base/common/glob.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { relative, posix } from '../../../../base/common/path.js';
+import { dirname, isEqual, basename } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import './media/breadcrumbscontrol.css.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { FileKind, IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { WorkbenchAsyncDataTree, WorkbenchDataTree } from '../../../../platform/list/browser/listService.js';
+import { breadcrumbsPickerBackground, widgetShadow, widgetBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { isWorkspaceFolder, isWorkspace, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { ResourceLabels, DEFAULT_LABELS_CONTAINER } from '../../labels.js';
+import { BreadcrumbsConfig } from './breadcrumbs.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { SIDE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+let BreadcrumbsPicker = class BreadcrumbsPicker {
+    constructor(parent, resource, _instantiationService, _themeService, _configurationService) {
+        this.resource = resource;
+        this._instantiationService = _instantiationService;
+        this._themeService = _themeService;
+        this._configurationService = _configurationService;
+        this._disposables = ( new DisposableStore());
+        this._fakeEvent = ( new UIEvent('fakeEvent'));
+        this._onWillPickElement = ( new Emitter());
+        this.onWillPickElement = this._onWillPickElement.event;
+        this._previewDispoables = ( new MutableDisposable());
+        this._domNode = document.createElement('div');
+        this._domNode.className = 'monaco-breadcrumbs-picker show-file-icons';
+        parent.appendChild(this._domNode);
+    }
+    dispose() {
+        this._disposables.dispose();
+        this._previewDispoables.dispose();
+        this._onWillPickElement.dispose();
+        this._domNode.remove();
+        setTimeout(() => this._tree.dispose(), 0);
+    }
+    async show(input, maxHeight, width, arrowSize, arrowOffset) {
+        const theme = this._themeService.getColorTheme();
+        const color = theme.getColor(breadcrumbsPickerBackground);
+        this._arrow = document.createElement('div');
+        this._arrow.className = 'arrow';
+        this._arrow.style.borderColor = `transparent transparent ${color ? ( color.toString()) : ''}`;
+        this._domNode.appendChild(this._arrow);
+        this._treeContainer = document.createElement('div');
+        this._treeContainer.style.background = color ? ( color.toString()) : '';
+        this._treeContainer.style.paddingTop = '2px';
+        this._treeContainer.style.borderRadius = '3px';
+        this._treeContainer.style.boxShadow = `0 0 8px 2px ${this._themeService.getColorTheme().getColor(widgetShadow)}`;
+        this._treeContainer.style.border = `1px solid ${this._themeService.getColorTheme().getColor(widgetBorder)}`;
+        this._domNode.appendChild(this._treeContainer);
+        this._layoutInfo = { maxHeight, width, arrowSize, arrowOffset, inputHeight: 0 };
+        this._tree = this._createTree(this._treeContainer, input);
+        this._disposables.add(this._tree.onDidOpen(async (e) => {
+            const { element, editorOptions, sideBySide } = e;
+            const didReveal = await this._revealElement(element, { ...editorOptions, preserveFocus: false }, sideBySide);
+            if (!didReveal) {
+                return;
+            }
+        }));
+        this._disposables.add(this._tree.onDidChangeFocus(e => {
+            this._previewDispoables.value = this._previewElement(e.elements[0]);
+        }));
+        this._disposables.add(this._tree.onDidChangeContentHeight(() => {
+            this._layout();
+        }));
+        this._domNode.focus();
+        try {
+            await this._setInput(input);
+            this._layout();
+        }
+        catch (err) {
+            onUnexpectedError(err);
+        }
+    }
+    _layout() {
+        const headerHeight = 2 * this._layoutInfo.arrowSize;
+        const treeHeight = Math.min(this._layoutInfo.maxHeight - headerHeight, this._tree.contentHeight);
+        const totalHeight = treeHeight + headerHeight;
+        this._domNode.style.height = `${totalHeight}px`;
+        this._domNode.style.width = `${this._layoutInfo.width}px`;
+        this._arrow.style.top = `-${2 * this._layoutInfo.arrowSize}px`;
+        this._arrow.style.borderWidth = `${this._layoutInfo.arrowSize}px`;
+        this._arrow.style.marginLeft = `${this._layoutInfo.arrowOffset}px`;
+        this._treeContainer.style.height = `${treeHeight}px`;
+        this._treeContainer.style.width = `${this._layoutInfo.width}px`;
+        this._tree.layout(treeHeight, this._layoutInfo.width);
+    }
+    restoreViewState() { }
+};
+BreadcrumbsPicker = ( __decorate([
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IThemeService)),
+    ( __param(4, IConfigurationService))
+], BreadcrumbsPicker));
+class FileVirtualDelegate {
+    getHeight(_element) {
+        return 22;
+    }
+    getTemplateId(_element) {
+        return 'FileStat';
+    }
+}
+class FileIdentityProvider {
+    getId(element) {
+        if (URI.isUri(element)) {
+            return ( element.toString());
+        }
+        else if (isWorkspace(element)) {
+            return element.id;
+        }
+        else if (isWorkspaceFolder(element)) {
+            return ( element.uri.toString());
+        }
+        else {
+            return ( element.resource.toString());
+        }
+    }
+}
+let FileDataSource = class FileDataSource {
+    constructor(_fileService) {
+        this._fileService = _fileService;
+    }
+    hasChildren(element) {
+        return URI.isUri(element)
+            || isWorkspace(element)
+            || isWorkspaceFolder(element)
+            || element.isDirectory;
+    }
+    async getChildren(element) {
+        if (isWorkspace(element)) {
+            return element.folders;
+        }
+        let uri;
+        if (isWorkspaceFolder(element)) {
+            uri = element.uri;
+        }
+        else if (URI.isUri(element)) {
+            uri = element;
+        }
+        else {
+            uri = element.resource;
+        }
+        const stat = await this._fileService.resolve(uri);
+        return stat.children ?? [];
+    }
+};
+FileDataSource = ( __decorate([
+    ( __param(0, IFileService))
+], FileDataSource));
+let FileRenderer = class FileRenderer {
+    constructor(_labels, _configService) {
+        this._labels = _labels;
+        this._configService = _configService;
+        this.templateId = 'FileStat';
+    }
+    renderTemplate(container) {
+        return this._labels.create(container, { supportHighlights: true });
+    }
+    renderElement(node, index, templateData) {
+        const fileDecorations = this._configService.getValue('explorer.decorations');
+        const { element } = node;
+        let resource;
+        let fileKind;
+        if (isWorkspaceFolder(element)) {
+            resource = element.uri;
+            fileKind = FileKind.ROOT_FOLDER;
+        }
+        else {
+            resource = element.resource;
+            fileKind = element.isDirectory ? FileKind.FOLDER : FileKind.FILE;
+        }
+        templateData.setFile(resource, {
+            fileKind,
+            hidePath: true,
+            fileDecorations: fileDecorations,
+            matches: createMatches(node.filterData),
+            extraClasses: ['picker-item']
+        });
+    }
+    disposeTemplate(templateData) {
+        templateData.dispose();
+    }
+};
+FileRenderer = ( __decorate([
+    ( __param(1, IConfigurationService))
+], FileRenderer));
+class FileNavigationLabelProvider {
+    getKeyboardNavigationLabel(element) {
+        return element.name;
+    }
+}
+class FileAccessibilityProvider {
+    getWidgetAriaLabel() {
+        return ( localizeWithPath(
+            'vs/workbench/browser/parts/editor/breadcrumbsPicker',
+            'breadcrumbs',
+            "Breadcrumbs"
+        ));
+    }
+    getAriaLabel(element) {
+        return element.name;
+    }
+}
+let FileFilter = class FileFilter {
+    constructor(_workspaceService, configService) {
+        this._workspaceService = _workspaceService;
+        this._cachedExpressions = ( new Map());
+        this._disposables = ( new DisposableStore());
+        const config = BreadcrumbsConfig.FileExcludes.bindTo(configService);
+        const update = () => {
+            _workspaceService.getWorkspace().folders.forEach(folder => {
+                const excludesConfig = config.getValue({ resource: folder.uri });
+                if (!excludesConfig) {
+                    return;
+                }
+                const adjustedConfig = {};
+                for (const pattern in excludesConfig) {
+                    if (typeof excludesConfig[pattern] !== 'boolean') {
+                        continue;
+                    }
+                    const patternAbs = pattern.indexOf('**/') !== 0
+                        ? posix.join(folder.uri.path, pattern)
+                        : pattern;
+                    adjustedConfig[patternAbs] = excludesConfig[pattern];
+                }
+                this._cachedExpressions.set(( folder.uri.toString()), parse(adjustedConfig));
+            });
+        };
+        update();
+        this._disposables.add(config);
+        this._disposables.add(config.onDidChange(update));
+        this._disposables.add(_workspaceService.onDidChangeWorkspaceFolders(update));
+    }
+    dispose() {
+        this._disposables.dispose();
+    }
+    filter(element, _parentVisibility) {
+        if (isWorkspaceFolder(element)) {
+            return true;
+        }
+        const folder = this._workspaceService.getWorkspaceFolder(element.resource);
+        if (!folder || !( this._cachedExpressions.has(( folder.uri.toString())))) {
+            return true;
+        }
+        const expression = this._cachedExpressions.get(( folder.uri.toString()));
+        return !expression(relative(folder.uri.path, element.resource.path), basename(element.resource));
+    }
+};
+FileFilter = ( __decorate([
+    ( __param(0, IWorkspaceContextService)),
+    ( __param(1, IConfigurationService))
+], FileFilter));
+class FileSorter {
+    compare(a, b) {
+        if (isWorkspaceFolder(a) && isWorkspaceFolder(b)) {
+            return a.index - b.index;
+        }
+        if (a.isDirectory === b.isDirectory) {
+            return compareFileNames(a.name, b.name);
+        }
+        else if (a.isDirectory) {
+            return -1;
+        }
+        else {
+            return 1;
+        }
+    }
+}
+let BreadcrumbsFilePicker = class BreadcrumbsFilePicker extends BreadcrumbsPicker {
+    constructor(parent, resource, instantiationService, themeService, configService, _workspaceService, _editorService) {
+        super(parent, resource, instantiationService, themeService, configService);
+        this._workspaceService = _workspaceService;
+        this._editorService = _editorService;
+    }
+    _createTree(container) {
+        this._treeContainer.classList.add('file-icon-themable-tree');
+        this._treeContainer.classList.add('show-file-icons');
+        const onFileIconThemeChange = (fileIconTheme) => {
+            this._treeContainer.classList.toggle('align-icons-and-twisties', fileIconTheme.hasFileIcons && !fileIconTheme.hasFolderIcons);
+            this._treeContainer.classList.toggle('hide-arrows', fileIconTheme.hidesExplorerArrows === true);
+        };
+        this._disposables.add(this._themeService.onDidFileIconThemeChange(onFileIconThemeChange));
+        onFileIconThemeChange(this._themeService.getFileIconTheme());
+        const labels = this._instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER );
+        this._disposables.add(labels);
+        return this._instantiationService.createInstance(WorkbenchAsyncDataTree, 'BreadcrumbsFilePicker', container, ( new FileVirtualDelegate()), [this._instantiationService.createInstance(FileRenderer, labels)], this._instantiationService.createInstance(FileDataSource), {
+            multipleSelectionSupport: false,
+            sorter: ( new FileSorter()),
+            filter: this._instantiationService.createInstance(FileFilter),
+            identityProvider: ( new FileIdentityProvider()),
+            keyboardNavigationLabelProvider: ( new FileNavigationLabelProvider()),
+            accessibilityProvider: this._instantiationService.createInstance(FileAccessibilityProvider),
+            showNotFoundMessage: false,
+            overrideStyles: {
+                listBackground: breadcrumbsPickerBackground
+            },
+        });
+    }
+    async _setInput(element) {
+        const { uri, kind } = element;
+        let input;
+        if (kind === FileKind.ROOT_FOLDER) {
+            input = this._workspaceService.getWorkspace();
+        }
+        else {
+            input = dirname(uri);
+        }
+        const tree = this._tree;
+        await tree.setInput(input);
+        let focusElement;
+        for (const { element } of tree.getNode().children) {
+            if (isWorkspaceFolder(element) && isEqual(element.uri, uri)) {
+                focusElement = element;
+                break;
+            }
+            else if (isEqual(element.resource, uri)) {
+                focusElement = element;
+                break;
+            }
+        }
+        if (focusElement) {
+            tree.reveal(focusElement, 0.5);
+            tree.setFocus([focusElement], this._fakeEvent);
+        }
+        tree.domFocus();
+    }
+    _previewElement(_element) {
+        return Disposable.None;
+    }
+    async _revealElement(element, options, sideBySide) {
+        if (!isWorkspaceFolder(element) && element.isFile) {
+            this._onWillPickElement.fire();
+            await this._editorService.openEditor({ resource: element.resource, options }, sideBySide ? SIDE_GROUP : undefined);
+            return true;
+        }
+        return false;
+    }
+};
+BreadcrumbsFilePicker = ( __decorate([
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IThemeService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, IWorkspaceContextService)),
+    ( __param(6, IEditorService))
+], BreadcrumbsFilePicker));
+let OutlineTreeSorter = class OutlineTreeSorter {
+    constructor(comparator, uri, configService) {
+        this.comparator = comparator;
+        this._order = configService.getValue(uri, 'breadcrumbs.symbolSortOrder');
+    }
+    compare(a, b) {
+        if (this._order === 'name') {
+            return this.comparator.compareByName(a, b);
+        }
+        else if (this._order === 'type') {
+            return this.comparator.compareByType(a, b);
+        }
+        else {
+            return this.comparator.compareByPosition(a, b);
+        }
+    }
+};
+OutlineTreeSorter = ( __decorate([
+    ( __param(2, ITextResourceConfigurationService))
+], OutlineTreeSorter));
+class BreadcrumbsOutlinePicker extends BreadcrumbsPicker {
+    _createTree(container, input) {
+        const { config } = input.outline;
+        return this._instantiationService.createInstance(WorkbenchDataTree, 'BreadcrumbsOutlinePicker', container, config.delegate, config.renderers, config.treeDataSource, {
+            ...config.options,
+            sorter: this._instantiationService.createInstance(OutlineTreeSorter, config.comparator, undefined),
+            collapseByDefault: true,
+            expandOnlyOnTwistieClick: true,
+            multipleSelectionSupport: false,
+            showNotFoundMessage: false
+        });
+    }
+    _setInput(input) {
+        const viewState = input.outline.captureViewState();
+        this.restoreViewState = () => { viewState.dispose(); };
+        const tree = this._tree;
+        tree.setInput(input.outline);
+        if (input.element !== input.outline) {
+            tree.reveal(input.element, 0.5);
+            tree.setFocus([input.element], this._fakeEvent);
+        }
+        tree.domFocus();
+        return Promise.resolve();
+    }
+    _previewElement(element) {
+        const outline = this._tree.getInput();
+        return outline.preview(element);
+    }
+    async _revealElement(element, options, sideBySide) {
+        this._onWillPickElement.fire();
+        const outline = this._tree.getInput();
+        await outline.reveal(element, options, sideBySide);
+        return true;
+    }
+}
+export { BreadcrumbsFilePicker, BreadcrumbsOutlinePicker, BreadcrumbsPicker, FileSorter };

package/vscode/src/vs/workbench/browser/parts/editor/editor.js

@@ -1,7 +1,6 @@
 import { Dimension } from '../../../../base/browser/dom.js';
 import { isObject } from '../../../../base/common/types.js';
 import { verifyObject, BooleanVerifier, NumberVerifier, EnumVerifier, SetVerifier, ObjectVerifier } from '../../../../base/common/verifier.js';
-import product$1 from '../../../../platform/product/common/product.js';
 const DEFAULT_EDITOR_MIN_DIMENSIONS = ( new Dimension(220, 70));
 const DEFAULT_EDITOR_MAX_DIMENSIONS = ( new Dimension(Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY));
 const DEFAULT_EDITOR_PART_OPTIONS = {
@@ -28,7 +27,7 @@ const DEFAULT_EDITOR_PART_OPTIONS = {
     labelFormat: 'default',
     splitSizing: 'auto',
     splitOnDragAndDrop: true,
-    dragToOpenWindow: product$1.quality !== 'stable',
+    dragToOpenWindow: true,
     centeredLayoutFixedWidth: false,
     doubleClickTabToToggleEditorGroupSizes: 'expand',
     editorActionsLocation: 'default',