@codingame/monaco-vscode-search-service-override 4.1.0 → 4.1.2

package/vscode/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.js

@@ -0,0 +1,234 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { PickerQuickAccessProvider, TriggerAction } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
+import { ThrottledDelayer } from 'vscode/vscode/vs/base/common/async';
+import { getWorkspaceSymbols } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
+import { SymbolKinds } from 'vscode/vscode/vs/editor/common/languages';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
+import { getSelectionSearchString } from 'vscode/vscode/vs/editor/contrib/find/browser/findController';
+import { prepareQuery, pieceToQuery, scoreFuzzy2 } from 'vscode/vscode/vs/base/common/fuzzyScorer';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+
+var SymbolsQuickAccessProvider_1;
+let SymbolsQuickAccessProvider = class SymbolsQuickAccessProvider extends PickerQuickAccessProvider {
+    static { SymbolsQuickAccessProvider_1 = this; }
+    static { this.PREFIX = '#'; }
+    static { this.TYPING_SEARCH_DELAY = 200; }
+    static { this.TREAT_AS_GLOBAL_SYMBOL_TYPES = ( new Set([
+        4 ,
+        9 ,
+        0 ,
+        10 ,
+        2 ,
+        3 ,
+        1
+    ])); }
+    get defaultFilterValue() {
+        const editor = this.codeEditorService.getFocusedCodeEditor();
+        if (editor) {
+            return getSelectionSearchString(editor) ?? undefined;
+        }
+        return undefined;
+    }
+    constructor(labelService, openerService, editorService, configurationService, codeEditorService) {
+        super(SymbolsQuickAccessProvider_1.PREFIX, {
+            canAcceptInBackground: true,
+            noResultsPick: {
+                label: ( localizeWithPath(
+                    'vs/workbench/contrib/search/browser/symbolsQuickAccess',
+                    'noSymbolResults',
+                    "No matching workspace symbols"
+                ))
+            }
+        });
+        this.labelService = labelService;
+        this.openerService = openerService;
+        this.editorService = editorService;
+        this.configurationService = configurationService;
+        this.codeEditorService = codeEditorService;
+        this.delayer = this._register(( new ThrottledDelayer(SymbolsQuickAccessProvider_1.TYPING_SEARCH_DELAY)));
+    }
+    get configuration() {
+        const editorConfig = this.configurationService.getValue().workbench?.editor;
+        return {
+            openEditorPinned: !editorConfig?.enablePreviewFromQuickOpen || !editorConfig?.enablePreview,
+            openSideBySideDirection: editorConfig?.openSideBySideDirection
+        };
+    }
+    _getPicks(filter, disposables, token) {
+        return this.getSymbolPicks(filter, undefined, token);
+    }
+    async getSymbolPicks(filter, options, token) {
+        return this.delayer.trigger(async () => {
+            if (token.isCancellationRequested) {
+                return [];
+            }
+            return this.doGetSymbolPicks(prepareQuery(filter), options, token);
+        }, options?.delay);
+    }
+    async doGetSymbolPicks(query, options, token) {
+        let symbolQuery;
+        let containerQuery;
+        if (query.values && query.values.length > 1) {
+            symbolQuery = pieceToQuery(query.values[0]);
+            containerQuery = pieceToQuery(query.values.slice(1));
+        }
+        else {
+            symbolQuery = query;
+        }
+        const workspaceSymbols = await getWorkspaceSymbols(symbolQuery.original, token);
+        if (token.isCancellationRequested) {
+            return [];
+        }
+        const symbolPicks = [];
+        const openSideBySideDirection = this.configuration.openSideBySideDirection;
+        for (const { symbol, provider } of workspaceSymbols) {
+            if (options?.skipLocal && !( SymbolsQuickAccessProvider_1.TREAT_AS_GLOBAL_SYMBOL_TYPES.has(symbol.kind)) && !!symbol.containerName) {
+                continue;
+            }
+            const symbolLabel = symbol.name;
+            const symbolLabelWithIcon = `$(${SymbolKinds.toIcon(symbol.kind).id}) ${symbolLabel}`;
+            const symbolLabelIconOffset = symbolLabelWithIcon.length - symbolLabel.length;
+            let symbolScore = undefined;
+            let symbolMatches = undefined;
+            let skipContainerQuery = false;
+            if (symbolQuery.original.length > 0) {
+                if (symbolQuery !== query) {
+                    [symbolScore, symbolMatches] = scoreFuzzy2(symbolLabelWithIcon, { ...query, values: undefined  }, 0, symbolLabelIconOffset);
+                    if (typeof symbolScore === 'number') {
+                        skipContainerQuery = true;
+                    }
+                }
+                if (typeof symbolScore !== 'number') {
+                    [symbolScore, symbolMatches] = scoreFuzzy2(symbolLabelWithIcon, symbolQuery, 0, symbolLabelIconOffset);
+                    if (typeof symbolScore !== 'number') {
+                        continue;
+                    }
+                }
+            }
+            const symbolUri = symbol.location.uri;
+            let containerLabel = undefined;
+            if (symbolUri) {
+                const containerPath = this.labelService.getUriLabel(symbolUri, { relative: true });
+                if (symbol.containerName) {
+                    containerLabel = `${symbol.containerName} • ${containerPath}`;
+                }
+                else {
+                    containerLabel = containerPath;
+                }
+            }
+            let containerScore = undefined;
+            let containerMatches = undefined;
+            if (!skipContainerQuery && containerQuery && containerQuery.original.length > 0) {
+                if (containerLabel) {
+                    [containerScore, containerMatches] = scoreFuzzy2(containerLabel, containerQuery);
+                }
+                if (typeof containerScore !== 'number') {
+                    continue;
+                }
+                if (typeof symbolScore === 'number') {
+                    symbolScore += containerScore;
+                }
+            }
+            const deprecated = symbol.tags ? symbol.tags.indexOf(1 ) >= 0 : false;
+            symbolPicks.push({
+                symbol,
+                resource: symbolUri,
+                score: symbolScore,
+                label: symbolLabelWithIcon,
+                ariaLabel: symbolLabel,
+                highlights: deprecated ? undefined : {
+                    label: symbolMatches,
+                    description: containerMatches
+                },
+                description: containerLabel,
+                strikethrough: deprecated,
+                buttons: [
+                    {
+                        iconClass: openSideBySideDirection === 'right' ? ThemeIcon.asClassName(Codicon.splitHorizontal) : ThemeIcon.asClassName(Codicon.splitVertical),
+                        tooltip: openSideBySideDirection === 'right' ? ( localizeWithPath(
+                            'vs/workbench/contrib/search/browser/symbolsQuickAccess',
+                            'openToSide',
+                            "Open to the Side"
+                        )) : ( localizeWithPath(
+                            'vs/workbench/contrib/search/browser/symbolsQuickAccess',
+                            'openToBottom',
+                            "Open to the Bottom"
+                        ))
+                    }
+                ],
+                trigger: (buttonIndex, keyMods) => {
+                    this.openSymbol(provider, symbol, token, { keyMods, forceOpenSideBySide: true });
+                    return TriggerAction.CLOSE_PICKER;
+                },
+                accept: async (keyMods, event) => this.openSymbol(provider, symbol, token, { keyMods, preserveFocus: event.inBackground, forcePinned: event.inBackground }),
+            });
+        }
+        if (!options?.skipSorting) {
+            symbolPicks.sort((symbolA, symbolB) => this.compareSymbols(symbolA, symbolB));
+        }
+        return symbolPicks;
+    }
+    async openSymbol(provider, symbol, token, options) {
+        let symbolToOpen = symbol;
+        if (typeof provider.resolveWorkspaceSymbol === 'function') {
+            symbolToOpen = (await provider.resolveWorkspaceSymbol(symbol, token)) || symbol;
+            if (token.isCancellationRequested) {
+                return;
+            }
+        }
+        if (symbolToOpen.location.uri.scheme === Schemas.http || symbolToOpen.location.uri.scheme === Schemas.https) {
+            await this.openerService.open(symbolToOpen.location.uri, { fromUserGesture: true, allowContributedOpeners: true });
+        }
+        else {
+            await this.editorService.openEditor({
+                resource: symbolToOpen.location.uri,
+                options: {
+                    preserveFocus: options?.preserveFocus,
+                    pinned: options.keyMods.ctrlCmd || options.forcePinned || this.configuration.openEditorPinned,
+                    selection: symbolToOpen.location.range ? Range.collapseToStart(symbolToOpen.location.range) : undefined
+                }
+            }, options.keyMods.alt || (this.configuration.openEditorPinned && options.keyMods.ctrlCmd) || options?.forceOpenSideBySide ? SIDE_GROUP : ACTIVE_GROUP);
+        }
+    }
+    compareSymbols(symbolA, symbolB) {
+        if (typeof symbolA.score === 'number' && typeof symbolB.score === 'number') {
+            if (symbolA.score > symbolB.score) {
+                return -1;
+            }
+            if (symbolA.score < symbolB.score) {
+                return 1;
+            }
+        }
+        if (symbolA.symbol && symbolB.symbol) {
+            const symbolAName = symbolA.symbol.name.toLowerCase();
+            const symbolBName = symbolB.symbol.name.toLowerCase();
+            const res = symbolAName.localeCompare(symbolBName);
+            if (res !== 0) {
+                return res;
+            }
+        }
+        if (symbolA.symbol && symbolB.symbol) {
+            const symbolAKind = SymbolKinds.toIcon(symbolA.symbol.kind).id;
+            const symbolBKind = SymbolKinds.toIcon(symbolB.symbol.kind).id;
+            return symbolAKind.localeCompare(symbolBKind);
+        }
+        return 0;
+    }
+};
+SymbolsQuickAccessProvider = SymbolsQuickAccessProvider_1 = ( __decorate([
+    ( __param(0, ILabelService)),
+    ( __param(1, IOpenerService)),
+    ( __param(2, IEditorService)),
+    ( __param(3, IConfigurationService)),
+    ( __param(4, ICodeEditorService))
+], SymbolsQuickAccessProvider));
+
+export { SymbolsQuickAccessProvider };

package/vscode/src/vs/workbench/contrib/search/common/cacheState.js

@@ -0,0 +1,87 @@
+import { defaultGenerator } from 'vscode/vscode/vs/base/common/idGenerator';
+import { equals } from 'vscode/vscode/vs/base/common/objects';
+
+var LoadingPhase;
+( (function(LoadingPhase) {
+    LoadingPhase[LoadingPhase["Created"] = 1] = "Created";
+    LoadingPhase[LoadingPhase["Loading"] = 2] = "Loading";
+    LoadingPhase[LoadingPhase["Loaded"] = 3] = "Loaded";
+    LoadingPhase[LoadingPhase["Errored"] = 4] = "Errored";
+    LoadingPhase[LoadingPhase["Disposed"] = 5] = "Disposed";
+})(LoadingPhase || (LoadingPhase = {})));
+class FileQueryCacheState {
+    get cacheKey() {
+        if (this.loadingPhase === LoadingPhase.Loaded || !this.previousCacheState) {
+            return this._cacheKey;
+        }
+        return this.previousCacheState.cacheKey;
+    }
+    get isLoaded() {
+        const isLoaded = this.loadingPhase === LoadingPhase.Loaded;
+        return isLoaded || !this.previousCacheState ? isLoaded : this.previousCacheState.isLoaded;
+    }
+    get isUpdating() {
+        const isUpdating = this.loadingPhase === LoadingPhase.Loading;
+        return isUpdating || !this.previousCacheState ? isUpdating : this.previousCacheState.isUpdating;
+    }
+    constructor(cacheQuery, loadFn, disposeFn, previousCacheState) {
+        this.cacheQuery = cacheQuery;
+        this.loadFn = loadFn;
+        this.disposeFn = disposeFn;
+        this.previousCacheState = previousCacheState;
+        this._cacheKey = defaultGenerator.nextId();
+        this.query = this.cacheQuery(this._cacheKey);
+        this.loadingPhase = LoadingPhase.Created;
+        if (this.previousCacheState) {
+            const current = Object.assign({}, this.query, { cacheKey: null });
+            const previous = Object.assign({}, this.previousCacheState.query, { cacheKey: null });
+            if (!equals(current, previous)) {
+                this.previousCacheState.dispose();
+                this.previousCacheState = undefined;
+            }
+        }
+    }
+    load() {
+        if (this.isUpdating) {
+            return this;
+        }
+        this.loadingPhase = LoadingPhase.Loading;
+        this.loadPromise = (async () => {
+            try {
+                await this.loadFn(this.query);
+                this.loadingPhase = LoadingPhase.Loaded;
+                if (this.previousCacheState) {
+                    this.previousCacheState.dispose();
+                    this.previousCacheState = undefined;
+                }
+            }
+            catch (error) {
+                this.loadingPhase = LoadingPhase.Errored;
+                throw error;
+            }
+        })();
+        return this;
+    }
+    dispose() {
+        if (this.loadPromise) {
+            (async () => {
+                try {
+                    await this.loadPromise;
+                }
+                catch (error) {
+                }
+                this.loadingPhase = LoadingPhase.Disposed;
+                this.disposeFn(this._cacheKey);
+            })();
+        }
+        else {
+            this.loadingPhase = LoadingPhase.Disposed;
+        }
+        if (this.previousCacheState) {
+            this.previousCacheState.dispose();
+            this.previousCacheState = undefined;
+        }
+    }
+}
+
+export { FileQueryCacheState };

package/vscode/src/vs/workbench/contrib/searchEditor/browser/media/searchEditor.css.js

@@ -0,0 +1,6 @@
+import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
+
+var css = ".search-editor{display:flex;flex-direction:column}.search-editor .search-results{flex:1}.search-editor .query-container{margin:0 12px 12px 19px;padding-top:6px}.search-editor .search-widget .toggle-replace-button{align-items:center;background-position:50%;background-repeat:no-repeat;box-sizing:border-box;cursor:pointer;display:flex;height:100%;justify-content:center;left:0;position:absolute;top:0;width:16px}.search-editor .search-widget .replace-container,.search-editor .search-widget .search-container{align-items:center;display:flex}.search-editor .search-widget .monaco-findInput{display:inline-block;vertical-align:middle;width:100%}.search-editor .search-widget .monaco-inputbox>.ibwrapper{height:100%}.search-editor .search-widget .monaco-inputbox>.ibwrapper>.mirror,.search-editor .search-widget .monaco-inputbox>.ibwrapper>textarea.input{padding:3px 3px 3px 6px}.search-editor .search-widget .monaco-inputbox>.ibwrapper>.mirror{max-height:134px}.search-editor .search-widget .monaco-inputbox>.ibwrapper>textarea.input{height:26px;overflow:initial}.search-editor .monaco-inputbox>.ibwrapper>textarea.input{scrollbar-width:none}.search-editor .monaco-inputbox>.ibwrapper>textarea.input::-webkit-scrollbar{display:none}.search-editor .search-widget .context-lines-input{margin-left:5px;margin-right:2px;max-width:50px}.search-editor .search-widget .context-lines-input input[type=number]::-webkit-inner-spin-button{-webkit-appearance:none!important}.search-editor .search-widget .replace-container{display:inline-flex;margin-top:6px;position:relative}.search-editor .search-widget .replace-input{display:flex;height:25px;position:relative;vertical-align:middle;width:auto!important}.search-editor .search-widget .replace-input>.controls{position:absolute;right:2px;top:3px}.search-editor .search-widget .replace-container.disabled{display:none}.search-editor .search-widget .replace-container .monaco-action-bar{height:25px;margin-left:0}.search-editor .search-widget .replace-container .monaco-action-bar .action-item .codicon{align-items:center;background-repeat:no-repeat;display:flex;height:25px;justify-content:center;margin-right:0;width:25px}.search-editor .includes-excludes{min-height:1em;position:relative}.search-editor .includes-excludes .expand{cursor:pointer;height:16px;position:absolute;right:-2px;width:25px;z-index:2}.search-editor .includes-excludes .file-types{display:none}.search-editor .includes-excludes.expanded .file-types{display:inherit}.search-editor .includes-excludes.expanded .file-types:last-child{padding-bottom:10px}.search-editor .includes-excludes.expanded h4{font-size:11px;font-weight:400;margin:0;overflow:hidden;padding:4px 0 0;text-overflow:ellipsis;white-space:nowrap}.search-editor .messages{cursor:default;margin-top:-5px}.search-editor .message{padding-left:7px;padding-right:22px;padding-top:0}.search-editor a.prominent{text-decoration:underline}.monaco-editor .searchEditorFindMatch{background-color:var(--vscode-searchEditor-findMatchBackground);border:1px solid var(--vscode-searchEditor-findMatchBorder);box-sizing:border-box}.monaco-editor.hc-black .searchEditorFindMatch,.monaco-editor.hc-light .searchEditorFindMatch{border:1px dotted var(--vscode-searchEditor-findMatchBorder)}";
+n(css,{});
+
+export { css, css as default };