@codingame/monaco-vscode-api 2.1.4 → 2.2.0-next.2

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js

@@ -0,0 +1,315 @@
+import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
+import { append, addDisposableListener, getWindow, EventType } from '../../../../../../base/browser/dom.js';
+import { alert } from '../../../../../../base/browser/ui/aria/aria.js';
+import { Lazy } from '../../../../../../base/common/lazy.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { format } from '../../../../../../base/common/strings.js';
+import { MATCHES_LIMIT } from '../../../../../../editor/contrib/find/browser/findModel.js';
+import { FindReplaceState } from '../../../../../../editor/contrib/find/browser/findState.js';
+import { NLS_NO_RESULTS, NLS_MATCHES_LOCATION } from '../../../../../../editor/contrib/find/browser/findWidget.js';
+import { localizeWithPath } from '../../../../../../nls.js';
+import { IMenuService } from '../../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IContextViewService, IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { FindModel } from './findModel.js';
+import { SimpleFindReplaceWidget } from './notebookFindReplaceWidget.js';
+import { CellEditState } from '../../notebookBrowser.js';
+import { KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED } from '../../../common/notebookContextKeys.js';
+const FIND_HIDE_TRANSITION = 'find-hide-transition';
+const FIND_SHOW_TRANSITION = 'find-show-transition';
+let MAX_MATCHES_COUNT_WIDTH = 69;
+const PROGRESS_BAR_DELAY = 200;
+let NotebookFindContrib = class NotebookFindContrib extends Disposable {
+    static { this.id = 'workbench.notebook.find'; }
+    constructor(notebookEditor, instantiationService) {
+        super();
+        this.notebookEditor = notebookEditor;
+        this.instantiationService = instantiationService;
+        this.widget = ( new Lazy(
+            () => this._register(this.instantiationService.createInstance(NotebookFindWidget, this.notebookEditor))
+        ));
+    }
+    show(initialInput, options) {
+        return this.widget.value.show(initialInput, options);
+    }
+    hide() {
+        this.widget.rawValue?.hide();
+    }
+    replace(searchString) {
+        return this.widget.value.replace(searchString);
+    }
+};
+NotebookFindContrib = ( __decorate([
+    ( __param(1, IInstantiationService))
+], NotebookFindContrib));
+let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidget {
+    constructor(_notebookEditor, contextViewService, contextKeyService, configurationService, contextMenuService, menuService, instantiationService) {
+        super(contextViewService, contextKeyService, configurationService, contextMenuService, instantiationService, ( new FindReplaceState()), _notebookEditor);
+        this._showTimeout = null;
+        this._hideTimeout = null;
+        this._findModel = ( new FindModel(this._notebookEditor, this._state, this._configurationService));
+        append(this._notebookEditor.getDomNode(), this.getDomNode());
+        this._findWidgetFocused = KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED.bindTo(contextKeyService);
+        this._register(this._findInput.onKeyDown((e) => this._onFindInputKeyDown(e)));
+        this._register(this._replaceInput.onKeyDown((e) => this._onReplaceInputKeyDown(e)));
+        this._register(this._state.onFindReplaceStateChange((e) => {
+            this.onInputChanged();
+            if (e.isSearching) {
+                if (this._state.isSearching) {
+                    this._progressBar.infinite().show(PROGRESS_BAR_DELAY);
+                }
+                else {
+                    this._progressBar.stop().hide();
+                }
+            }
+            if (this._findModel.currentMatch >= 0) {
+                const currentMatch = this._findModel.getCurrentMatch();
+                this._replaceBtn.setEnabled(currentMatch.isModelMatch);
+            }
+            const matches = this._findModel.findMatches;
+            this._replaceAllBtn.setEnabled(matches.length > 0 && matches.find(match => match.webviewMatches.length > 0) === undefined);
+            if (e.filters) {
+                this._findInput.updateFilterState(this._state.filters?.isModified() ?? false);
+            }
+        }));
+        this._register(addDisposableListener(this.getDomNode(), EventType.FOCUS, e => {
+            this._previousFocusElement = e.relatedTarget instanceof HTMLElement ? e.relatedTarget : undefined;
+        }, true));
+    }
+    _onFindInputKeyDown(e) {
+        if (e.equals(3 )) {
+            this.find(false);
+            e.preventDefault();
+            return;
+        }
+        else if (e.equals(1024  | 3 )) {
+            this.find(true);
+            e.preventDefault();
+            return;
+        }
+    }
+    _onReplaceInputKeyDown(e) {
+        if (e.equals(3 )) {
+            this.replaceOne();
+            e.preventDefault();
+            return;
+        }
+    }
+    onInputChanged() {
+        this._state.change({ searchString: this.inputValue }, false);
+        const findMatches = this._findModel.findMatches;
+        if (findMatches && findMatches.length) {
+            return true;
+        }
+        return false;
+    }
+    findIndex(index) {
+        this._findModel.find({ index });
+    }
+    find(previous) {
+        this._findModel.find({ previous });
+    }
+    replaceOne() {
+        if (!this._notebookEditor.hasModel()) {
+            return;
+        }
+        if (!this._findModel.findMatches.length) {
+            return;
+        }
+        this._findModel.ensureFindMatches();
+        if (this._findModel.currentMatch < 0) {
+            this._findModel.find({ previous: false });
+        }
+        const currentMatch = this._findModel.getCurrentMatch();
+        const cell = currentMatch.cell;
+        if (currentMatch.isModelMatch) {
+            const match = currentMatch.match;
+            this._progressBar.infinite().show(PROGRESS_BAR_DELAY);
+            const replacePattern = this.replacePattern;
+            const replaceString = replacePattern.buildReplaceString(match.matches, this._state.preserveCase);
+            const viewModel = this._notebookEditor.getViewModel();
+            viewModel.replaceOne(cell, match.range, replaceString).then(() => {
+                this._progressBar.stop();
+            });
+        }
+        else {
+            console.error('Replace does not work for output match');
+        }
+    }
+    replaceAll() {
+        if (!this._notebookEditor.hasModel()) {
+            return;
+        }
+        this._progressBar.infinite().show(PROGRESS_BAR_DELAY);
+        const replacePattern = this.replacePattern;
+        const cellFindMatches = this._findModel.findMatches;
+        const replaceStrings = [];
+        cellFindMatches.forEach(cellFindMatch => {
+            cellFindMatch.contentMatches.forEach(match => {
+                const matches = match.matches;
+                replaceStrings.push(replacePattern.buildReplaceString(matches, this._state.preserveCase));
+            });
+        });
+        const viewModel = this._notebookEditor.getViewModel();
+        viewModel.replaceAll(this._findModel.findMatches, replaceStrings).then(() => {
+            this._progressBar.stop();
+        });
+    }
+    findFirst() { }
+    onFocusTrackerFocus() {
+        this._findWidgetFocused.set(true);
+    }
+    onFocusTrackerBlur() {
+        this._previousFocusElement = undefined;
+        this._findWidgetFocused.reset();
+    }
+    onReplaceInputFocusTrackerFocus() {
+    }
+    onReplaceInputFocusTrackerBlur() {
+    }
+    onFindInputFocusTrackerFocus() { }
+    onFindInputFocusTrackerBlur() { }
+    async show(initialInput, options) {
+        const searchStringUpdate = this._state.searchString !== initialInput;
+        super.show(initialInput, options);
+        this._state.change({ searchString: initialInput ?? this._state.searchString, isRevealed: true }, false);
+        if (typeof options?.matchIndex === 'number') {
+            if (!this._findModel.findMatches.length) {
+                await this._findModel.research();
+            }
+            this.findIndex(options.matchIndex);
+        }
+        else {
+            this._findInput.select();
+        }
+        if (!searchStringUpdate && options?.searchStringSeededFrom) {
+            this._findModel.refreshCurrentMatch(options.searchStringSeededFrom);
+        }
+        if (this._showTimeout === null) {
+            if (this._hideTimeout !== null) {
+                getWindow(this.getDomNode()).clearTimeout(this._hideTimeout);
+                this._hideTimeout = null;
+                this._notebookEditor.removeClassName(FIND_HIDE_TRANSITION);
+            }
+            this._notebookEditor.addClassName(FIND_SHOW_TRANSITION);
+            this._showTimeout = getWindow(this.getDomNode()).setTimeout(() => {
+                this._notebookEditor.removeClassName(FIND_SHOW_TRANSITION);
+                this._showTimeout = null;
+            }, 200);
+        }
+    }
+    replace(initialFindInput, initialReplaceInput) {
+        super.showWithReplace(initialFindInput, initialReplaceInput);
+        this._state.change({ searchString: initialFindInput ?? '', replaceString: initialReplaceInput ?? '', isRevealed: true }, false);
+        this._replaceInput.select();
+        if (this._showTimeout === null) {
+            if (this._hideTimeout !== null) {
+                getWindow(this.getDomNode()).clearTimeout(this._hideTimeout);
+                this._hideTimeout = null;
+                this._notebookEditor.removeClassName(FIND_HIDE_TRANSITION);
+            }
+            this._notebookEditor.addClassName(FIND_SHOW_TRANSITION);
+            this._showTimeout = getWindow(this.getDomNode()).setTimeout(() => {
+                this._notebookEditor.removeClassName(FIND_SHOW_TRANSITION);
+                this._showTimeout = null;
+            }, 200);
+        }
+    }
+    hide() {
+        super.hide();
+        this._state.change({ isRevealed: false }, false);
+        this._findModel.clear();
+        this._notebookEditor.findStop();
+        this._progressBar.stop();
+        if (this._hideTimeout === null) {
+            if (this._showTimeout !== null) {
+                getWindow(this.getDomNode()).clearTimeout(this._showTimeout);
+                this._showTimeout = null;
+                this._notebookEditor.removeClassName(FIND_SHOW_TRANSITION);
+            }
+            this._notebookEditor.addClassName(FIND_HIDE_TRANSITION);
+            this._hideTimeout = getWindow(this.getDomNode()).setTimeout(() => {
+                this._notebookEditor.removeClassName(FIND_HIDE_TRANSITION);
+            }, 200);
+        }
+        if (this._previousFocusElement && this._previousFocusElement.offsetParent) {
+            this._previousFocusElement.focus();
+            this._previousFocusElement = undefined;
+        }
+        if (this._notebookEditor.hasModel()) {
+            for (let i = 0; i < this._notebookEditor.getLength(); i++) {
+                const cell = this._notebookEditor.cellAt(i);
+                if (cell.getEditState() === CellEditState.Editing && cell.editStateSource === 'find') {
+                    cell.updateEditState(CellEditState.Preview, 'closeFind');
+                }
+            }
+        }
+    }
+    _updateMatchesCount() {
+        if (!this._findModel || !this._findModel.findMatches) {
+            return;
+        }
+        this._matchesCount.style.width = MAX_MATCHES_COUNT_WIDTH + 'px';
+        this._matchesCount.title = '';
+        if (this._matchesCount.firstChild) {
+            this._matchesCount.removeChild(this._matchesCount.firstChild);
+        }
+        let label;
+        if (this._state.matchesCount > 0) {
+            let matchesCount = String(this._state.matchesCount);
+            if (this._state.matchesCount >= MATCHES_LIMIT) {
+                matchesCount += '+';
+            }
+            const matchesPosition = this._findModel.currentMatch < 0 ? '?' : String((this._findModel.currentMatch + 1));
+            label = format(NLS_MATCHES_LOCATION, matchesPosition, matchesCount);
+        }
+        else {
+            label = NLS_NO_RESULTS;
+        }
+        this._matchesCount.appendChild(document.createTextNode(label));
+        alert(this._getAriaLabel(label, this._state.currentMatch, this._state.searchString));
+        MAX_MATCHES_COUNT_WIDTH = Math.max(MAX_MATCHES_COUNT_WIDTH, this._matchesCount.clientWidth);
+    }
+    _getAriaLabel(label, currentMatch, searchString) {
+        if (label === NLS_NO_RESULTS) {
+            return searchString === ''
+                ? ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget',
+                'ariaSearchNoResultEmpty',
+                "{0} found",
+                label
+            ))
+                : ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget',
+                'ariaSearchNoResult',
+                "{0} found for '{1}'",
+                label,
+                searchString
+            ));
+        }
+        return ( localizeWithPath(
+            'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget',
+            'ariaSearchNoResultWithLineNumNoCurrentMatch',
+            "{0} found for '{1}'",
+            label,
+            searchString
+        ));
+    }
+    dispose() {
+        this._notebookEditor?.removeClassName(FIND_SHOW_TRANSITION);
+        this._notebookEditor?.removeClassName(FIND_HIDE_TRANSITION);
+        this._findModel.dispose();
+        super.dispose();
+    }
+};
+NotebookFindWidget = ( __decorate([
+    ( __param(1, IContextViewService)),
+    ( __param(2, IContextKeyService)),
+    ( __param(3, IConfigurationService)),
+    ( __param(4, IContextMenuService)),
+    ( __param(5, IMenuService)),
+    ( __param(6, IInstantiationService))
+], NotebookFindWidget));
+export { NotebookFindContrib };

package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js

@@ -0,0 +1,193 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { parseKeyboardLayoutDescription, IKeyboardLayoutService, areKeyboardLayoutsEqual, getKeyboardLayoutId } from '../../../../platform/keyboardLayout/common/keyboardLayout.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions } from '../../../common/contributions.js';
+import { KEYBOARD_LAYOUT_OPEN_PICKER } from '../common/preferences.js';
+import { isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution extends Disposable {
+    constructor(keyboardLayoutService, statusbarService) {
+        super();
+        this.keyboardLayoutService = keyboardLayoutService;
+        this.statusbarService = statusbarService;
+        this.pickerElement = this._register(( new MutableDisposable()));
+        const name = ( localizeWithPath(
+            'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
+            'status.workbench.keyboardLayout',
+            "Keyboard Layout"
+        ));
+        const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
+        if (layout) {
+            const layoutInfo = parseKeyboardLayoutDescription(layout);
+            const text = ( localizeWithPath(
+                'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
+                'keyboardLayout',
+                "Layout: {0}",
+                layoutInfo.label
+            ));
+            this.pickerElement.value = this.statusbarService.addEntry({
+                name,
+                text,
+                ariaLabel: text,
+                command: KEYBOARD_LAYOUT_OPEN_PICKER
+            }, 'status.workbench.keyboardLayout', 1 );
+        }
+        this._register(this.keyboardLayoutService.onDidChangeKeyboardLayout(() => {
+            const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
+            const layoutInfo = parseKeyboardLayoutDescription(layout);
+            if (this.pickerElement.value) {
+                const text = ( localizeWithPath(
+                    'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
+                    'keyboardLayout',
+                    "Layout: {0}",
+                    layoutInfo.label
+                ));
+                this.pickerElement.value.update({
+                    name,
+                    text,
+                    ariaLabel: text,
+                    command: KEYBOARD_LAYOUT_OPEN_PICKER
+                });
+            }
+            else {
+                const text = ( localizeWithPath(
+                    'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
+                    'keyboardLayout',
+                    "Layout: {0}",
+                    layoutInfo.label
+                ));
+                this.pickerElement.value = this.statusbarService.addEntry({
+                    name,
+                    text,
+                    ariaLabel: text,
+                    command: KEYBOARD_LAYOUT_OPEN_PICKER
+                }, 'status.workbench.keyboardLayout', 1 );
+            }
+        }));
+    }
+};
+KeyboardLayoutPickerContribution = ( __decorate([
+    ( __param(0, IKeyboardLayoutService)),
+    ( __param(1, IStatusbarService))
+], KeyboardLayoutPickerContribution));
+const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
+workbenchContributionsRegistry.registerWorkbenchContribution(KeyboardLayoutPickerContribution, 1 );
+const DEFAULT_CONTENT = [
+    `// ${( localizeWithPath(
+        'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
+        'displayLanguage',
+        'Defines the keyboard layout used in VS Code in the browser environment.'
+    ))}`,
+    `// ${( localizeWithPath(
+        'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
+        'doc',
+        'Open VS Code and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.'
+    ))}`,
+    ``,
+    `// Once you have the keyboard layout info, please paste it below.`,
+    '\n'
+].join('\n');
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: KEYBOARD_LAYOUT_OPEN_PICKER,
+            title: { value: ( localizeWithPath(
+                'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
+                'keyboard.chooseLayout',
+                "Change Keyboard Layout"
+            )), original: 'Change Keyboard Layout' },
+            f1: true
+        });
+    }
+    async run(accessor) {
+        const keyboardLayoutService = accessor.get(IKeyboardLayoutService);
+        const quickInputService = accessor.get(IQuickInputService);
+        const configurationService = accessor.get(IConfigurationService);
+        const environmentService = accessor.get(IEnvironmentService);
+        const editorService = accessor.get(IEditorService);
+        const fileService = accessor.get(IFileService);
+        const layouts = keyboardLayoutService.getAllKeyboardLayouts();
+        const currentLayout = keyboardLayoutService.getCurrentKeyboardLayout();
+        const layoutConfig = configurationService.getValue('keyboard.layout');
+        const isAutoDetect = layoutConfig === 'autodetect';
+        const picks = ( layouts.map(layout => {
+            const picked = !isAutoDetect && areKeyboardLayoutsEqual(currentLayout, layout);
+            const layoutInfo = parseKeyboardLayoutDescription(layout);
+            return {
+                layout: layout,
+                label: [layoutInfo.label, (layout && layout.isUserKeyboardLayout) ? '(User configured layout)' : ''].join(' '),
+                id: layout.text || layout.lang || layout.layout,
+                description: layoutInfo.description + (picked ? ' (Current layout)' : ''),
+                picked: !isAutoDetect && areKeyboardLayoutsEqual(currentLayout, layout)
+            };
+        })).sort((a, b) => {
+            return a.label < b.label ? -1 : (a.label > b.label ? 1 : 0);
+        });
+        if (picks.length > 0) {
+            const platform = isMacintosh ? 'Mac' : isWindows ? 'Win' : 'Linux';
+            picks.unshift({ type: 'separator', label: ( localizeWithPath(
+                'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
+                'layoutPicks',
+                "Keyboard Layouts ({0})",
+                platform
+            )) });
+        }
+        const configureKeyboardLayout = { label: ( localizeWithPath(
+            'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
+            'configureKeyboardLayout',
+            "Configure Keyboard Layout"
+        )) };
+        picks.unshift(configureKeyboardLayout);
+        const autoDetectMode = {
+            label: ( localizeWithPath(
+                'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
+                'autoDetect',
+                "Auto Detect"
+            )),
+            description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
+            picked: isAutoDetect ? true : undefined
+        };
+        picks.unshift(autoDetectMode);
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localizeWithPath(
+            'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker',
+            'pickKeyboardLayout',
+            "Select Keyboard Layout"
+        )), matchOnDescription: true });
+        if (!pick) {
+            return;
+        }
+        if (pick === autoDetectMode) {
+            configurationService.updateValue('keyboard.layout', 'autodetect');
+            return;
+        }
+        if (pick === configureKeyboardLayout) {
+            const file = environmentService.keyboardLayoutResource;
+            await fileService.stat(file).then(undefined, () => {
+                return fileService.createFile(file, VSBuffer.fromString(DEFAULT_CONTENT));
+            }).then((stat) => {
+                if (!stat) {
+                    return undefined;
+                }
+                return editorService.openEditor({
+                    resource: stat.resource,
+                    languageId: 'jsonc',
+                    options: { pinned: true }
+                });
+            }, (error) => {
+                throw new Error(localizeWithPath('vs/workbench/contrib/preferences/browser/keyboardLayoutPicker', 'fail.createSettings', "Unable to create '{0}' ({1}).", file.toString(), error));
+            });
+            return Promise.resolve();
+        }
+        configurationService.updateValue('keyboard.layout', getKeyboardLayoutId(pick.layout));
+    }
+});
+export { KeyboardLayoutPickerContribution };

package/vscode/src/vs/workbench/contrib/preferences/common/preferences.js

@@ -43,6 +43,7 @@ const GENERAL_TAG_SETTING_TAG = 'tag:';
 const POLICY_SETTING_TAG = 'hasPolicy';
 const WORKSPACE_TRUST_SETTING_TAG = 'workspaceTrust';
 const REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG = 'requireTrustedWorkspace';
+const KEYBOARD_LAYOUT_OPEN_PICKER = 'workbench.action.openKeyboardLayoutPicker';
 let cachedExtensionToggleData;
 async function getExperimentalExtensionToggleData(extensionGalleryService, productService) {
     if (!extensionGalleryService.isEnabled()) {
@@ -98,4 +99,4 @@ function compareTwoNullableNumbers(a, b) {
         return 0;
     }
 }
-export { CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, CONTEXT_KEYBINDING_FOCUS, CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_JSON_EDITOR, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, CONTEXT_WHEN_FOCUS, EXTENSION_SETTING_TAG, FEATURE_SETTING_TAG, GENERAL_TAG_SETTING_TAG, ID_SETTING_TAG, IPreferencesSearchService, KEYBINDINGS_EDITOR_COMMAND_ACCEPT_WHEN, KEYBINDINGS_EDITOR_COMMAND_ADD, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_HISTORY, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND_TITLE, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_DEFINE_WHEN, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS, KEYBINDINGS_EDITOR_COMMAND_REJECT_WHEN, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_SEARCH, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE, KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_EXTENSION_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS, LANGUAGE_SETTING_TAG, MODIFIED_SETTING_TAG, POLICY_SETTING_TAG, REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU, SETTINGS_EDITOR_COMMAND_SUGGEST_FILTERS, WORKSPACE_TRUST_SETTING_TAG, compareTwoNullableNumbers, getExperimentalExtensionToggleData };
+export { CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, CONTEXT_KEYBINDING_FOCUS, CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_JSON_EDITOR, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, CONTEXT_WHEN_FOCUS, EXTENSION_SETTING_TAG, FEATURE_SETTING_TAG, GENERAL_TAG_SETTING_TAG, ID_SETTING_TAG, IPreferencesSearchService, KEYBINDINGS_EDITOR_COMMAND_ACCEPT_WHEN, KEYBINDINGS_EDITOR_COMMAND_ADD, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_HISTORY, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND_TITLE, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_DEFINE_WHEN, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS, KEYBINDINGS_EDITOR_COMMAND_REJECT_WHEN, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_SEARCH, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE, KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_EXTENSION_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS, KEYBOARD_LAYOUT_OPEN_PICKER, LANGUAGE_SETTING_TAG, MODIFIED_SETTING_TAG, POLICY_SETTING_TAG, REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU, SETTINGS_EDITOR_COMMAND_SUGGEST_FILTERS, WORKSPACE_TRUST_SETTING_TAG, compareTwoNullableNumbers, getExperimentalExtensionToggleData };

package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js

@@ -41,7 +41,7 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
         this.tunnelService = tunnelService;
         this.activityService = activityService;
         this.statusbarService = statusbarService;
-        this._register(( ( Registry.as(Extensions.ViewsRegistry)).registerViewWelcomeContent(TUNNEL_VIEW_ID, {
+        this._register(( Registry.as(Extensions.ViewsRegistry)).registerViewWelcomeContent(TUNNEL_VIEW_ID, {
             content: this.environmentService.remoteAuthority ? ( localizeWithPath(
                 'vs/workbench/contrib/remote/browser/remoteExplorer',
                 'remoteNoPorts',
@@ -54,7 +54,7 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
                 "No forwarded ports. Forward a port to access your locally running services over the internet.\n[Forward a Port]({0})",
                 `command:${ForwardPortAction.INLINE_ID}`
             )),
-        })));
+        }));
         this.enableBadgeAndStatusBar();
         this.enableForwardedPortsView();
     }

package/vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js

@@ -0,0 +1,37 @@
+import { localizeWithPath } from '../../../../nls.js';
+import { Extensions as Extensions$1 } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
+import { Extensions } from '../../../common/contributions.js';
+import { SashSettingsController } from './sash.js';
+import { isIOS } from '../../../../base/common/platform.js';
+( Registry.as(Extensions.Workbench))
+    .registerWorkbenchContribution(SashSettingsController, 3 );
+( Registry.as(Extensions$1.Configuration))
+    .registerConfiguration({
+    ...workbenchConfigurationNodeBase,
+    properties: {
+        'workbench.sash.size': {
+            type: 'number',
+            default: isIOS ? 20 : 4,
+            minimum: 1,
+            maximum: 20,
+            description: ( localizeWithPath(
+                'vs/workbench/contrib/sash/browser/sash.contribution',
+                'sashSize',
+                "Controls the feedback area size in pixels of the dragging area in between views/editors. Set it to a larger value if you feel it's hard to resize views using the mouse."
+            ))
+        },
+        'workbench.sash.hoverDelay': {
+            type: 'number',
+            default: 300,
+            minimum: 0,
+            maximum: 2000,
+            description: ( localizeWithPath(
+                'vs/workbench/contrib/sash/browser/sash.contribution',
+                'sashHoverDelay',
+                "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
+            ))
+        },
+    }
+});

package/vscode/src/vs/workbench/contrib/sash/browser/sash.js

@@ -0,0 +1,39 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { clamp } from '../../../../base/common/numbers.js';
+import { setGlobalSashSize, setGlobalHoverDelay } from '../../../../base/browser/ui/sash/sash.js';
+import { Event } from '../../../../base/common/event.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+let SashSettingsController = class SashSettingsController {
+    constructor(configurationService, layoutService) {
+        this.configurationService = configurationService;
+        this.layoutService = layoutService;
+        this.disposables = ( new DisposableStore());
+        const onDidChangeSize = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('workbench.sash.size'));
+        onDidChangeSize(this.onDidChangeSize, this, this.disposables);
+        this.onDidChangeSize();
+        const onDidChangeHoverDelay = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('workbench.sash.hoverDelay'));
+        onDidChangeHoverDelay(this.onDidChangeHoverDelay, this, this.disposables);
+        this.onDidChangeHoverDelay();
+    }
+    onDidChangeSize() {
+        const configuredSize = this.configurationService.getValue('workbench.sash.size');
+        const size = clamp(configuredSize, 4, 20);
+        const hoverSize = clamp(configuredSize, 1, 8);
+        this.layoutService.mainContainer.style.setProperty('--vscode-sash-size', size + 'px');
+        this.layoutService.mainContainer.style.setProperty('--vscode-sash-hover-size', hoverSize + 'px');
+        setGlobalSashSize(size);
+    }
+    onDidChangeHoverDelay() {
+        setGlobalHoverDelay(this.configurationService.getValue('workbench.sash.hoverDelay'));
+    }
+    dispose() {
+        this.disposables.dispose();
+    }
+};
+SashSettingsController = ( __decorate([
+    ( __param(0, IConfigurationService)),
+    ( __param(1, ILayoutService))
+], SashSettingsController));
+export { SashSettingsController };