@codingame/monaco-vscode-api 1.79.2-next.1 → 1.79.2-next.2

package/dist/vscode/vs/workbench/contrib/search/browser/searchActionsTopBar.js

@@ -0,0 +1,308 @@
+import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { WorkbenchListFocusContextKey } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
+import { IViewsService } from '../../../common/views.js';
+import { searchStopIcon, searchRefreshIcon, searchCollapseAllIcon, searchExpandAllIcon, searchClearIcon, searchShowAsList, searchShowAsTree } from './searchIcons.js';
+import { ClearSearchHistoryCommandId, CancelSearchActionId, SearchViewVisibleKey, RefreshSearchResultsActionId, ViewHasSearchPatternKey, CollapseSearchResultsActionId, HasSearchResults, ViewHasSomeCollapsibleKey, ExpandSearchResultsActionId, ClearSearchResultsActionId, ViewHasReplacePatternKey, ViewHasFilePatternKey, ViewAsTreeActionId, InTreeViewKey, ViewAsListActionId } from '../common/constants.js';
+import { ISearchHistoryService } from '../common/searchHistoryService.js';
+import { FolderMatchWorkspaceRoot, Match, FolderMatch, FolderMatchNoRoot, SearchResult, FileMatch } from './searchModel.js';
+import { VIEW_ID } from '../../../services/search/common/search.js';
+import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { registerAction2, Action2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { SearchStateKey, SearchUIState } from '../common/search.js';
+import { category, getSearchView } from './searchActionsBase.js';
+registerAction2(class ClearSearchHistoryCommandAction extends Action2 {
+    constructor() {
+        super({
+            id: ClearSearchHistoryCommandId,
+            title: {
+                value: ( nls.localize('clearSearchHistoryLabel', "Clear Search History")),
+                original: 'Clear Search History'
+            },
+            category,
+            f1: true
+        });
+    }
+    async run(accessor) {
+        clearHistoryCommand(accessor);
+    }
+});
+registerAction2(class CancelSearchAction extends Action2 {
+    constructor() {
+        super({
+            id: CancelSearchActionId,
+            title: {
+                value: ( nls.localize('CancelSearchAction.label', "Cancel Search")),
+                original: 'Cancel Search'
+            },
+            icon: searchStopIcon,
+            category,
+            f1: true,
+            precondition: ( ( SearchStateKey.isEqualTo(SearchUIState.Idle)).negate()),
+            keybinding: {
+                weight: 200 ,
+                when: ( ContextKeyExpr.and(SearchViewVisibleKey, WorkbenchListFocusContextKey)),
+                primary: 9 ,
+            },
+            menu: [{
+                    id: MenuId.ViewTitle,
+                    group: 'navigation',
+                    order: 0,
+                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), ( SearchStateKey.isEqualTo(SearchUIState.SlowSearch)))),
+                }]
+        });
+    }
+    run(accessor) {
+        return cancelSearch(accessor);
+    }
+});
+registerAction2(class RefreshAction extends Action2 {
+    constructor() {
+        super({
+            id: RefreshSearchResultsActionId,
+            title: {
+                value: ( nls.localize('RefreshAction.label', "Refresh")),
+                original: 'Refresh'
+            },
+            icon: searchRefreshIcon,
+            precondition: ViewHasSearchPatternKey,
+            category,
+            f1: true,
+            menu: [{
+                    id: MenuId.ViewTitle,
+                    group: 'navigation',
+                    order: 0,
+                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), ( ( SearchStateKey.isEqualTo(SearchUIState.SlowSearch)).negate()))),
+                }]
+        });
+    }
+    run(accessor, ...args) {
+        return refreshSearch(accessor);
+    }
+});
+registerAction2(class CollapseDeepestExpandedLevelAction extends Action2 {
+    constructor() {
+        super({
+            id: CollapseSearchResultsActionId,
+            title: {
+                value: ( nls.localize('CollapseDeepestExpandedLevelAction.label', "Collapse All")),
+                original: 'Collapse All'
+            },
+            category,
+            icon: searchCollapseAllIcon,
+            f1: true,
+            precondition: ( ContextKeyExpr.and(HasSearchResults, ViewHasSomeCollapsibleKey)),
+            menu: [{
+                    id: MenuId.ViewTitle,
+                    group: 'navigation',
+                    order: 3,
+                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), ( ContextKeyExpr.or(( HasSearchResults.negate()), ViewHasSomeCollapsibleKey)))),
+                }]
+        });
+    }
+    run(accessor, ...args) {
+        return collapseDeepestExpandedLevel(accessor);
+    }
+});
+registerAction2(class ExpandAllAction extends Action2 {
+    constructor() {
+        super({
+            id: ExpandSearchResultsActionId,
+            title: {
+                value: ( nls.localize('ExpandAllAction.label', "Expand All")),
+                original: 'Expand All'
+            },
+            category,
+            icon: searchExpandAllIcon,
+            f1: true,
+            precondition: ( ContextKeyExpr.and(HasSearchResults, ( ViewHasSomeCollapsibleKey.toNegated()))),
+            menu: [{
+                    id: MenuId.ViewTitle,
+                    group: 'navigation',
+                    order: 3,
+                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), HasSearchResults, ( ViewHasSomeCollapsibleKey.toNegated()))),
+                }]
+        });
+    }
+    run(accessor, ...args) {
+        return expandAll(accessor);
+    }
+});
+registerAction2(class ClearSearchResultsAction extends Action2 {
+    constructor() {
+        super({
+            id: ClearSearchResultsActionId,
+            title: {
+                value: ( nls.localize('ClearSearchResultsAction.label', "Clear Search Results")),
+                original: 'Clear Search Results'
+            },
+            category,
+            icon: searchClearIcon,
+            f1: true,
+            precondition: ( ContextKeyExpr.or(
+                HasSearchResults,
+                ViewHasSearchPatternKey,
+                ViewHasReplacePatternKey,
+                ViewHasFilePatternKey
+            )),
+            menu: [{
+                    id: MenuId.ViewTitle,
+                    group: 'navigation',
+                    order: 1,
+                    when: ( ContextKeyExpr.equals('view', VIEW_ID)),
+                }]
+        });
+    }
+    run(accessor, ...args) {
+        return clearSearchResults(accessor);
+    }
+});
+registerAction2(class ViewAsTreeAction extends Action2 {
+    constructor() {
+        super({
+            id: ViewAsTreeActionId,
+            title: {
+                value: ( nls.localize('ViewAsTreeAction.label', "View as Tree")),
+                original: 'View as Tree'
+            },
+            category,
+            icon: searchShowAsList,
+            f1: true,
+            precondition: ( ContextKeyExpr.and(HasSearchResults, ( InTreeViewKey.toNegated()))),
+            menu: [{
+                    id: MenuId.ViewTitle,
+                    group: 'navigation',
+                    order: 2,
+                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), ( InTreeViewKey.toNegated()))),
+                }]
+        });
+    }
+    run(accessor, ...args) {
+        const searchView = getSearchView(accessor.get(IViewsService));
+        if (searchView) {
+            searchView.setTreeView(true);
+        }
+    }
+});
+registerAction2(class ViewAsListAction extends Action2 {
+    constructor() {
+        super({
+            id: ViewAsListActionId,
+            title: {
+                value: ( nls.localize('ViewAsListAction.label', "View as List")),
+                original: 'View as List'
+            },
+            category,
+            icon: searchShowAsTree,
+            f1: true,
+            precondition: ( ContextKeyExpr.and(HasSearchResults, InTreeViewKey)),
+            menu: [{
+                    id: MenuId.ViewTitle,
+                    group: 'navigation',
+                    order: 2,
+                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), InTreeViewKey)),
+                }]
+        });
+    }
+    run(accessor, ...args) {
+        const searchView = getSearchView(accessor.get(IViewsService));
+        if (searchView) {
+            searchView.setTreeView(false);
+        }
+    }
+});
+const clearHistoryCommand = accessor => {
+    const searchHistoryService = accessor.get(ISearchHistoryService);
+    searchHistoryService.clearHistory();
+};
+function expandAll(accessor) {
+    const viewsService = accessor.get(IViewsService);
+    const searchView = getSearchView(viewsService);
+    if (searchView) {
+        const viewer = searchView.getControl();
+        viewer.expandAll();
+    }
+}
+function clearSearchResults(accessor) {
+    const viewsService = accessor.get(IViewsService);
+    const searchView = getSearchView(viewsService);
+    searchView?.clearSearchResults();
+}
+function cancelSearch(accessor) {
+    const viewsService = accessor.get(IViewsService);
+    const searchView = getSearchView(viewsService);
+    searchView?.cancelSearch();
+}
+function refreshSearch(accessor) {
+    const viewsService = accessor.get(IViewsService);
+    const searchView = getSearchView(viewsService);
+    searchView?.triggerQueryChange({ preserveFocus: false });
+}
+function collapseDeepestExpandedLevel(accessor) {
+    const viewsService = accessor.get(IViewsService);
+    const searchView = getSearchView(viewsService);
+    if (searchView) {
+        const viewer = searchView.getControl();
+        const navigator = viewer.navigate();
+        let node = navigator.first();
+        let canCollapseFileMatchLevel = false;
+        let canCollapseFirstLevel = false;
+        if (node instanceof FolderMatchWorkspaceRoot || searchView.isTreeLayoutViewVisible) {
+            while (node = navigator.next()) {
+                if (node instanceof Match) {
+                    canCollapseFileMatchLevel = true;
+                    break;
+                }
+                if (searchView.isTreeLayoutViewVisible && !canCollapseFirstLevel) {
+                    let nodeToTest = node;
+                    if (node instanceof FolderMatch) {
+                        const compressionStartNode = viewer.getCompressedTreeNode(node).element?.elements[0];
+                        nodeToTest = (compressionStartNode && !(compressionStartNode instanceof Match)) ? compressionStartNode : node;
+                    }
+                    const immediateParent = nodeToTest.parent();
+                    if (!(immediateParent instanceof FolderMatchWorkspaceRoot || immediateParent instanceof FolderMatchNoRoot || immediateParent instanceof SearchResult)) {
+                        canCollapseFirstLevel = true;
+                    }
+                }
+            }
+        }
+        if (canCollapseFileMatchLevel) {
+            node = navigator.first();
+            do {
+                if (node instanceof FileMatch) {
+                    viewer.collapse(node);
+                }
+            } while (node = navigator.next());
+        }
+        else if (canCollapseFirstLevel) {
+            node = navigator.first();
+            if (node) {
+                do {
+                    let nodeToTest = node;
+                    if (node instanceof FolderMatch) {
+                        const compressionStartNode = viewer.getCompressedTreeNode(node).element?.elements[0];
+                        nodeToTest = (compressionStartNode && !(compressionStartNode instanceof Match)) ? compressionStartNode : node;
+                    }
+                    const immediateParent = nodeToTest.parent();
+                    if (immediateParent instanceof FolderMatchWorkspaceRoot || immediateParent instanceof FolderMatchNoRoot) {
+                        if (viewer.hasElement(node)) {
+                            viewer.collapse(node, true);
+                        }
+                        else {
+                            viewer.collapseAll();
+                        }
+                    }
+                } while (node = navigator.next());
+            }
+        }
+        else {
+            viewer.collapseAll();
+        }
+        const firstFocusParent = viewer.getFocus()[0]?.parent();
+        if (firstFocusParent && (firstFocusParent instanceof FolderMatch || firstFocusParent instanceof FileMatch) &&
+            viewer.hasElement(firstFocusParent) && viewer.isCollapsed(firstFocusParent)) {
+            viewer.domFocus();
+            viewer.focusFirst();
+            viewer.setSelection(viewer.getFocus());
+        }
+    }
+}

package/dist/vscode/vs/workbench/contrib/search/browser/searchIcons.js

@@ -15,21 +15,21 @@ const searchShowReplaceIcon = registerIcon('search-show-replace', Codicon.chevro
  'Icon to expand the replace section in the search view.'
 )));
 const searchReplaceAllIcon = registerIcon('search-replace-all', Codicon.replaceAll, ( localize('searchReplaceAllIcon', 'Icon for replace all in the search view.')));
-registerIcon('search-replace', Codicon.replace, ( localize('searchReplaceIcon', 'Icon for replace in the search view.')));
-registerIcon('search-remove', Codicon.close, ( localize('searchRemoveIcon', 'Icon to remove a search result.')));
+const searchReplaceIcon = registerIcon('search-replace', Codicon.replace, ( localize('searchReplaceIcon', 'Icon for replace in the search view.')));
+const searchRemoveIcon = registerIcon('search-remove', Codicon.close, ( localize('searchRemoveIcon', 'Icon to remove a search result.')));
 const searchRefreshIcon = registerIcon('search-refresh', Codicon.refresh, ( localize('searchRefreshIcon', 'Icon for refresh in the search view.')));
-registerIcon('search-collapse-results', Codicon.collapseAll, ( localize('searchCollapseAllIcon', 'Icon for collapse results in the search view.')));
-registerIcon('search-expand-results', Codicon.expandAll, ( localize('searchExpandAllIcon', 'Icon for expand results in the search view.')));
-registerIcon('search-tree', Codicon.listTree, ( localize(
+const searchCollapseAllIcon = registerIcon('search-collapse-results', Codicon.collapseAll, ( localize('searchCollapseAllIcon', 'Icon for collapse results in the search view.')));
+const searchExpandAllIcon = registerIcon('search-expand-results', Codicon.expandAll, ( localize('searchExpandAllIcon', 'Icon for expand results in the search view.')));
+const searchShowAsTree = registerIcon('search-tree', Codicon.listTree, ( localize(
  'searchShowAsTree',
  'Icon for viewing results as a tree in the search view.'
 )));
-registerIcon('search-list', Codicon.listFlat, ( localize(
+const searchShowAsList = registerIcon('search-list', Codicon.listFlat, ( localize(
  'searchShowAsList',
  'Icon for viewing results as a list in the search view.'
 )));
-registerIcon('search-clear-results', Codicon.clearAll, ( localize('searchClearIcon', 'Icon for clear results in the search view.')));
-registerIcon('search-stop', Codicon.searchStop, ( localize('searchStopIcon', 'Icon for stop in the search view.')));
+const searchClearIcon = registerIcon('search-clear-results', Codicon.clearAll, ( localize('searchClearIcon', 'Icon for clear results in the search view.')));
+const searchStopIcon = registerIcon('search-stop', Codicon.searchStop, ( localize('searchStopIcon', 'Icon for stop in the search view.')));
 const searchViewIcon = registerIcon('search-view-icon', Codicon.search, ( localize('searchViewIcon', 'View icon of the search view.')));
 const searchNewEditorIcon = registerIcon('search-new-editor', Codicon.newFile, ( localize('searchNewEditorIcon', 'Icon for the action to open a new search editor.')));
-export { searchDetailsIcon, searchHideReplaceIcon, searchNewEditorIcon, searchRefreshIcon, searchReplaceAllIcon, searchShowContextIcon, searchShowReplaceIcon, searchViewIcon };
+export { searchClearIcon, searchCollapseAllIcon, searchDetailsIcon, searchExpandAllIcon, searchHideReplaceIcon, searchNewEditorIcon, searchRefreshIcon, searchRemoveIcon, searchReplaceAllIcon, searchReplaceIcon, searchShowAsList, searchShowAsTree, searchShowContextIcon, searchShowReplaceIcon, searchStopIcon, searchViewIcon };

package/dist/vscode/vs/workbench/contrib/search/browser/searchModel.js

@@ -33,7 +33,7 @@ import { NotebookCellsChangeType } from '../../notebook/common/notebookCommon.js
 import { IReplaceService } from './replace.js';
 import { isIFileMatchWithCells, contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches } from './searchNotebookHelpers.js';
 import { ReplacePattern } from '../../../services/search/common/replace.js';
-import { resultIsMatch, OneLineRange, ISearchService } from '../../../services/search/common/search.js';
+import { OneLineRange, resultIsMatch, ISearchService } from '../../../services/search/common/search.js';
 import { editorMatchesToTextSearchResults, addContextToEditorMatches } from '../../../services/search/common/searchHelpers.js';
 class Match {
     constructor(_parent, _fullPreviewLines, _fullPreviewRange, _documentRange) {
@@ -1186,6 +1186,37 @@ function compareNotebookPos(match1, match2) {
         return 1;
     }
 }
+function searchComparer(elementA, elementB, sortOrder = "default" ) {
+    const elemAParents = createParentList(elementA);
+    const elemBParents = createParentList(elementB);
+    let i = elemAParents.length - 1;
+    let j = elemBParents.length - 1;
+    while (i >= 0 && j >= 0) {
+        if (elemAParents[i].id() !== elemBParents[j].id()) {
+            return searchMatchComparer(elemAParents[i], elemBParents[j], sortOrder);
+        }
+        i--;
+        j--;
+    }
+    const elemAAtEnd = i === 0;
+    const elemBAtEnd = j === 0;
+    if (elemAAtEnd && !elemBAtEnd) {
+        return 1;
+    }
+    else if (!elemAAtEnd && elemBAtEnd) {
+        return -1;
+    }
+    return 0;
+}
+function createParentList(element) {
+    const parentArray = [];
+    let currElement = element;
+    while (!(currElement instanceof SearchResult)) {
+        parentArray.push(currElement);
+        currElement = currElement.parent();
+    }
+    return parentArray;
+}
 let SearchResult = class SearchResult extends Disposable {
     constructor(_searchModel, replaceService, instantiationService, modelService, uriIdentityService, notebookEditorService) {
         super();
@@ -1839,4 +1870,4 @@ function getFileMatches(matches) {
     });
     return fileMatches.concat(( folderMatches.map(e => e.allDownstreamFileMatches())).flat());
 }
-export { CellMatch, FileMatch, FolderMatch, FolderMatchNoRoot, FolderMatchWithResource, FolderMatchWorkspaceRoot, ISearchWorkbenchService, Match, MatchInNotebook, RangeHighlightDecorations, SearchModel, SearchResult, SearchWorkbenchService, arrayContainsElementOrParent, compareNotebookPos, searchMatchComparer, textSearchMatchesToNotebookMatches };
+export { CellMatch, FileMatch, FolderMatch, FolderMatchNoRoot, FolderMatchWithResource, FolderMatchWorkspaceRoot, ISearchWorkbenchService, Match, MatchInNotebook, RangeHighlightDecorations, SearchModel, SearchResult, SearchWorkbenchService, arrayContainsElementOrParent, compareNotebookPos, searchComparer, searchMatchComparer, textSearchMatchesToNotebookMatches };

package/dist/vscode/vs/workbench/contrib/search/common/constants.js

@@ -1,10 +1,44 @@
 import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+const FindInFilesActionId = 'workbench.action.findInFiles';
+const FocusSearchFromResults = 'search.action.focusSearchFromResults';
+const OpenMatch = 'search.action.openResult';
+const OpenMatchToSide = 'search.action.openResultToSide';
+const RemoveActionId = 'search.action.remove';
+const CopyPathCommandId = 'search.action.copyPath';
+const CopyMatchCommandId = 'search.action.copyMatch';
+const CopyAllCommandId = 'search.action.copyAll';
 const OpenInEditorCommandId = 'search.action.openInEditor';
+const ClearSearchHistoryCommandId = 'search.action.clearHistory';
+const FocusSearchListCommandID = 'search.action.focusSearchList';
+const ReplaceActionId = 'search.action.replace';
+const ReplaceAllInFileActionId = 'search.action.replaceAllInFile';
+const ReplaceAllInFolderActionId = 'search.action.replaceAllInFolder';
+const CloseReplaceWidgetActionId = 'closeReplaceInFilesWidget';
 const ToggleCaseSensitiveCommandId = 'toggleSearchCaseSensitive';
 const ToggleWholeWordCommandId = 'toggleSearchWholeWord';
 const ToggleRegexCommandId = 'toggleSearchRegex';
 const TogglePreserveCaseId = 'toggleSearchPreserveCase';
+const AddCursorsAtSearchResults = 'addCursorsAtSearchResults';
+const RevealInSideBarForSearchResults = 'search.action.revealInSideBar';
+const ReplaceInFilesActionId = 'workbench.action.replaceInFiles';
 const ShowAllSymbolsActionId = 'workbench.action.showAllSymbols';
+const CancelSearchActionId = 'search.action.cancel';
+const RefreshSearchResultsActionId = 'search.action.refreshSearchResults';
+const FocusNextSearchResultActionId = 'search.action.focusNextSearchResult';
+const FocusPreviousSearchResultActionId = 'search.action.focusPreviousSearchResult';
+const ToggleSearchOnTypeActionId = 'workbench.action.toggleSearchOnType';
+const CollapseSearchResultsActionId = 'search.action.collapseSearchResults';
+const ExpandSearchResultsActionId = 'search.action.expandSearchResults';
+const ClearSearchResultsActionId = 'search.action.clearSearchResults';
+const ViewAsTreeActionId = 'search.action.viewAsTree';
+const ViewAsListActionId = 'search.action.viewAsList';
+const ToggleQueryDetailsActionId = 'workbench.action.search.toggleQueryDetails';
+const ExcludeFolderFromSearchId = 'search.action.excludeFromSearch';
+const FocusNextInputActionId = 'search.focus.nextInputBox';
+const FocusPreviousInputActionId = 'search.focus.previousInputBox';
+const RestrictSearchToFolderId = 'search.action.restrictSearchToFolder';
+const FindInFolderId = 'filesExplorer.findInFolder';
+const FindInWorkspaceId = 'filesExplorer.findInWorkspace';
 const SearchViewVisibleKey = ( new RawContextKey('searchViewletVisible', true));
 const SearchViewFocusedKey = ( new RawContextKey('searchViewletFocus', false));
 const InputBoxFocusedKey = ( new RawContextKey('inputBoxFocus', false));
@@ -28,4 +62,4 @@ const ViewHasReplacePatternKey = ( new RawContextKey('viewHasReplacePattern', fa
 const ViewHasFilePatternKey = ( new RawContextKey('viewHasFilePattern', false));
 const ViewHasSomeCollapsibleKey = ( new RawContextKey('viewHasSomeCollapsibleResult', false));
 const InTreeViewKey = ( new RawContextKey('inTreeView', false));
-export { FileFocusKey, FileMatchOrFolderMatchFocusKey, FileMatchOrFolderMatchWithResourceFocusKey, FileMatchOrMatchFocusKey, FirstMatchFocusKey, FolderFocusKey, HasSearchResults, InTreeViewKey, InputBoxFocusedKey, IsEditableItemKey, MatchFocusKey, OpenInEditorCommandId, PatternExcludesFocusedKey, PatternIncludesFocusedKey, ReplaceActiveKey, ReplaceInputBoxFocusedKey, ResourceFolderFocusKey, SearchInputBoxFocusedKey, SearchViewFocusedKey, SearchViewVisibleKey, ShowAllSymbolsActionId, ToggleCaseSensitiveCommandId, TogglePreserveCaseId, ToggleRegexCommandId, ToggleWholeWordCommandId, ViewHasFilePatternKey, ViewHasReplacePatternKey, ViewHasSearchPatternKey, ViewHasSomeCollapsibleKey };
+export { AddCursorsAtSearchResults, CancelSearchActionId, ClearSearchHistoryCommandId, ClearSearchResultsActionId, CloseReplaceWidgetActionId, CollapseSearchResultsActionId, CopyAllCommandId, CopyMatchCommandId, CopyPathCommandId, ExcludeFolderFromSearchId, ExpandSearchResultsActionId, FileFocusKey, FileMatchOrFolderMatchFocusKey, FileMatchOrFolderMatchWithResourceFocusKey, FileMatchOrMatchFocusKey, FindInFilesActionId, FindInFolderId, FindInWorkspaceId, FirstMatchFocusKey, FocusNextInputActionId, FocusNextSearchResultActionId, FocusPreviousInputActionId, FocusPreviousSearchResultActionId, FocusSearchFromResults, FocusSearchListCommandID, FolderFocusKey, HasSearchResults, InTreeViewKey, InputBoxFocusedKey, IsEditableItemKey, MatchFocusKey, OpenInEditorCommandId, OpenMatch, OpenMatchToSide, PatternExcludesFocusedKey, PatternIncludesFocusedKey, RefreshSearchResultsActionId, RemoveActionId, ReplaceActionId, ReplaceActiveKey, ReplaceAllInFileActionId, ReplaceAllInFolderActionId, ReplaceInFilesActionId, ReplaceInputBoxFocusedKey, ResourceFolderFocusKey, RestrictSearchToFolderId, RevealInSideBarForSearchResults, SearchInputBoxFocusedKey, SearchViewFocusedKey, SearchViewVisibleKey, ShowAllSymbolsActionId, ToggleCaseSensitiveCommandId, TogglePreserveCaseId, ToggleQueryDetailsActionId, ToggleRegexCommandId, ToggleSearchOnTypeActionId, ToggleWholeWordCommandId, ViewAsListActionId, ViewAsTreeActionId, ViewHasFilePatternKey, ViewHasReplacePatternKey, ViewHasSearchPatternKey, ViewHasSomeCollapsibleKey };

package/dist/vscode/vs/workbench/services/search/common/queryBuilder.js

@@ -6,7 +6,7 @@ import { untildify } from 'monaco-editor/esm/vs/base/common/labels.js';
 import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import * as path from 'monaco-editor/esm/vs/base/common/path.js';
-import { isAbsolutePath, isEqual, basename } from 'monaco-editor/esm/vs/base/common/resources.js';
+import { relativePath, isAbsolutePath, isEqual, basename } from 'monaco-editor/esm/vs/base/common/resources.js';
 import * as strings from 'monaco-editor/esm/vs/base/common/strings.js';
 import { assertIsDefined, isDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
@@ -449,4 +449,46 @@ function normalizeGlobPattern(pattern) {
         .replace(/^\.\//, '')
         .replace(/\/+$/g, '');
 }
-export { QueryBuilder };
+function escapeGlobPattern(path) {
+    return path.replace(/([?*[\]])/g, '[$1]');
+}
+function resolveResourcesForSearchIncludes(resources, contextService) {
+    resources = arrays.distinct(resources, resource => ( resource.toString()));
+    const folderPaths = [];
+    const workspace = contextService.getWorkspace();
+    if (resources) {
+        resources.forEach(resource => {
+            let folderPath;
+            if (contextService.getWorkbenchState() === 2 ) {
+                folderPath = relativePath(workspace.folders[0].uri, resource);
+                if (folderPath && folderPath !== '.') {
+                    folderPath = './' + folderPath;
+                }
+            }
+            else {
+                const owningFolder = contextService.getWorkspaceFolder(resource);
+                if (owningFolder) {
+                    const owningRootName = owningFolder.name;
+                    const isUniqueFolder = workspace.folders.filter(folder => folder.name === owningRootName).length === 1;
+                    if (isUniqueFolder) {
+                        const relPath = relativePath(owningFolder.uri, resource);
+                        if (relPath === '') {
+                            folderPath = `./${owningFolder.name}`;
+                        }
+                        else {
+                            folderPath = `./${owningFolder.name}/${relPath}`;
+                        }
+                    }
+                    else {
+                        folderPath = resource.fsPath;
+                    }
+                }
+            }
+            if (folderPath) {
+                folderPaths.push(escapeGlobPattern(folderPath));
+            }
+        });
+    }
+    return folderPaths;
+}
+export { QueryBuilder, resolveResourcesForSearchIncludes };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "1.79.2-next.1",
+  "version": "1.79.2-next.2",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],