@codingame/monaco-vscode-search-service-override 1.85.0 → 1.85.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-search-service-override",
-  "version": "1.85.0",
+  "version": "1.85.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.1",
     "monaco-editor": "0.45.0"
   }
 }

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

@@ -25,9 +25,9 @@ import { Extensions as Extensions$4 } from 'vscode/vscode/vs/workbench/common/co
 import { CommandsRegistry } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { assertType } from 'monaco-editor/esm/vs/base/common/types.js';
 import { getWorkspaceSymbols } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
-import { ShowAllSymbolsActionId, QuickTextSearchActionId } from '../common/constants.js';
+import { ShowAllSymbolsActionId, QuickTextSearchActionId } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import './searchActionsCopy.js';
-import './searchActionsFind.js';
+import 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsFind';
 import './searchActionsNav.js';
 import './searchActionsRemoveReplace.js';
 import './searchActionsSymbol.js';

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

@@ -2,10 +2,10 @@ import * as nls from 'monaco-editor/esm/vs/nls.js';
 import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
 import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
 import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
-import { CopyMatchCommandId, FileMatchOrMatchFocusKey, CopyPathCommandId, FileMatchOrFolderMatchWithResourceFocusKey, CopyAllCommandId, HasSearchResults } from '../common/constants.js';
+import { CopyMatchCommandId, FileMatchOrMatchFocusKey, CopyPathCommandId, FileMatchOrFolderMatchWithResourceFocusKey, CopyAllCommandId, HasSearchResults } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { FileMatch, FolderMatchWithResource, Match, FolderMatch, searchMatchComparer } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { registerAction2, Action2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { category, getSearchView } from './searchActionsBase.js';
+import { category, getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { isWindows } from 'monaco-editor/esm/vs/base/common/platform.js';
 
 registerAction2(class CopyMatchCommandAction extends Action2 {

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

@@ -2,8 +2,8 @@ import { isMacintosh } from 'monaco-editor/esm/vs/base/common/platform.js';
 import * as nls from 'monaco-editor/esm/vs/nls.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
-import { ToggleQueryDetailsActionId, SearchViewFocusedKey, CloseReplaceWidgetActionId, SearchViewVisibleKey, ReplaceInputBoxFocusedKey, ToggleCaseSensitiveCommandId, FileMatchOrFolderMatchFocusKey, ToggleWholeWordCommandId, ToggleRegexCommandId, TogglePreserveCaseId, OpenMatch, FileMatchOrMatchFocusKey, OpenMatchToSide, AddCursorsAtSearchResults, FocusNextInputActionId, InputBoxFocusedKey, FocusPreviousInputActionId, SearchInputBoxFocusedKey, FocusSearchFromResults, FirstMatchFocusKey, ToggleSearchOnTypeActionId, FocusSearchListCommandID, FocusNextSearchResultActionId, HasSearchResults, FocusPreviousSearchResultActionId, ReplaceInFilesActionId } from '../common/constants.js';
-import { InSearchEditor } from '../../searchEditor/browser/constants.js';
+import { ToggleQueryDetailsActionId, SearchViewFocusedKey, CloseReplaceWidgetActionId, SearchViewVisibleKey, ReplaceInputBoxFocusedKey, ToggleCaseSensitiveCommandId, FileMatchOrFolderMatchFocusKey, ToggleWholeWordCommandId, ToggleRegexCommandId, TogglePreserveCaseId, OpenMatch, FileMatchOrMatchFocusKey, OpenMatchToSide, AddCursorsAtSearchResults, FocusNextInputActionId, InputBoxFocusedKey, FocusPreviousInputActionId, SearchInputBoxFocusedKey, FocusSearchFromResults, FirstMatchFocusKey, ToggleSearchOnTypeActionId, FocusSearchListCommandID, FocusNextSearchResultActionId, HasSearchResults, FocusPreviousSearchResultActionId, ReplaceInFilesActionId } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { InSearchEditor } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { FolderMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { SearchEditorInput } from '../../searchEditor/browser/searchEditorInput.js';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
@@ -11,7 +11,7 @@ import { ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platfor
 import { assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { registerAction2, Action2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { ToggleCaseSensitiveKeybinding, ToggleWholeWordKeybinding, ToggleRegexKeybinding, TogglePreserveCaseKeybinding } from 'monaco-editor/esm/vs/editor/contrib/find/browser/findModel.js';
-import { category, getSearchView, openSearchView } from './searchActionsBase.js';
+import { category, getSearchView, openSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
 import { getActiveElement } from 'monaco-editor/esm/vs/base/browser/dom.js';
 

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

@@ -3,14 +3,14 @@ import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configurati
 import { getSelectionKeyboardEvent } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
 import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
 import { searchRemoveIcon, searchReplaceIcon } from './searchIcons.js';
-import { RemoveActionId, SearchViewVisibleKey, FileMatchOrMatchFocusKey, ReplaceActionId, ReplaceActiveKey, MatchFocusKey, IsEditableItemKey, ReplaceAllInFileActionId, FileFocusKey, ReplaceAllInFolderActionId, FolderFocusKey } from '../common/constants.js';
+import { RemoveActionId, SearchViewVisibleKey, FileMatchOrMatchFocusKey, ReplaceActionId, ReplaceActiveKey, MatchFocusKey, IsEditableItemKey, ReplaceAllInFileActionId, FileFocusKey, ReplaceAllInFolderActionId, FolderFocusKey } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace';
 import { arrayContainsElementOrParent, SearchResult, Match, MatchInNotebook, FileMatch, FolderMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.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 { category, getSearchView, getElementsToOperateOn, shouldRefocus } from './searchActionsBase.js';
+import { category, getSearchView, getElementsToOperateOn, shouldRefocus } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { equals } from 'monaco-editor/esm/vs/base/common/arrays.js';
 
 registerAction2(class RemoveAction extends Action2 {

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

@@ -1,5 +1,5 @@
 import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { ShowAllSymbolsActionId } from '../common/constants.js';
+import { ShowAllSymbolsActionId } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { registerAction2, Action2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
 

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

@@ -1,7 +1,7 @@
 import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { QuickTextSearchActionId } from '../common/constants.js';
+import { QuickTextSearchActionId } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { category } from './searchActionsBase.js';
+import { category } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
 import { TEXT_SEARCH_QUICK_ACCESS_PREFIX } from './quickTextSearch/textSearchQuickAccess.js';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';

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

@@ -2,14 +2,14 @@ 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 'vscode/vscode/vs/workbench/common/views';
 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 { ClearSearchHistoryCommandId, CancelSearchActionId, SearchViewVisibleKey, RefreshSearchResultsActionId, ViewHasSearchPatternKey, CollapseSearchResultsActionId, HasSearchResults, ViewHasSomeCollapsibleKey, ExpandSearchResultsActionId, ClearSearchResultsActionId, ViewHasReplacePatternKey, ViewHasFilePatternKey, ViewAsTreeActionId, InTreeViewKey, ViewAsListActionId } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { ISearchHistoryService } from 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService';
 import { FolderMatchWorkspaceRoot, Match, FolderMatch, FolderMatchNoRoot, SearchResult, FileMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { VIEW_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
 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 'vscode/vscode/vs/workbench/contrib/search/common/search';
-import { category, getSearchView } from './searchActionsBase.js';
+import { category, getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 
 registerAction2(class ClearSearchHistoryCommandAction extends Action2 {
     constructor() {

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

@@ -1,5 +1,5 @@
 import { ContextScopedFindInput } from 'monaco-editor/esm/vs/platform/history/browser/contextScopedHistoryWidget.js';
-import { NotebookFindInputFilterButton } from '../../notebook/browser/contrib/find/notebookFindReplaceWidget.js';
+import { NotebookFindInputFilterButton } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget';
 import * as nls from 'monaco-editor/esm/vs/nls.js';
 
 class SearchFindInput extends ContextScopedFindInput {

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

@@ -15,7 +15,7 @@ import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiati
 import { MenuWorkbenchToolBar } from 'monaco-editor/esm/vs/platform/actions/browser/toolbar.js';
 import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { ServiceCollection } from 'monaco-editor/esm/vs/platform/instantiation/common/serviceCollection.js';
-import { MatchFocusKey, FileFocusKey, FolderFocusKey, IsEditableItemKey } from '../common/constants.js';
+import { MatchFocusKey, FileFocusKey, FolderFocusKey, IsEditableItemKey } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { defaultCountBadgeStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
 
 var FolderMatchRenderer_1, FileMatchRenderer_1, MatchRenderer_1;

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

@@ -47,14 +47,14 @@ import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
-import { NotebookEditor } from '../../../../../../../override/vs/workbench/contrib/notebook/browser/notebookEditor.js';
+import { NotebookEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditor';
 import { IncludePatternInputWidget, ExcludePatternInputWidget } from './patternInputWidget.js';
-import { appendKeyBindingLabel } from './searchActionsBase.js';
+import { appendKeyBindingLabel } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { searchDetailsIcon } from './searchIcons.js';
 import { renderSearchMessage } from './searchMessage.js';
 import { SearchAccessibilityProvider, SearchDelegate, FolderMatchRenderer, FileMatchRenderer, MatchRenderer } from './searchResultsView.js';
 import { SearchWidget } from './searchWidget.js';
-import { SearchViewVisibleKey, FirstMatchFocusKey, FileMatchOrMatchFocusKey, FileMatchOrFolderMatchFocusKey, FileMatchOrFolderMatchWithResourceFocusKey, FileFocusKey, FolderFocusKey, ResourceFolderFocusKey, HasSearchResults, MatchFocusKey, ViewHasSearchPatternKey, ViewHasReplacePatternKey, ViewHasFilePatternKey, ViewHasSomeCollapsibleKey, InTreeViewKey, SearchViewFocusedKey, InputBoxFocusedKey, PatternIncludesFocusedKey, PatternExcludesFocusedKey, IsEditableItemKey, OpenInEditorCommandId } from '../common/constants.js';
+import { SearchViewVisibleKey, FirstMatchFocusKey, FileMatchOrMatchFocusKey, FileMatchOrFolderMatchFocusKey, FileMatchOrFolderMatchWithResourceFocusKey, FileFocusKey, FolderFocusKey, ResourceFolderFocusKey, HasSearchResults, MatchFocusKey, ViewHasSearchPatternKey, ViewHasReplacePatternKey, ViewHasFilePatternKey, ViewHasSomeCollapsibleKey, InTreeViewKey, SearchViewFocusedKey, InputBoxFocusedKey, PatternIncludesFocusedKey, PatternExcludesFocusedKey, IsEditableItemKey, OpenInEditorCommandId } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace';
 import { SearchStateKey, SearchUIState, getOutOfWorkspaceEditorResources } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
 import { SearchHistoryService, ISearchHistoryService } from 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService';

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

@@ -17,20 +17,20 @@ import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/com
 import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 import { ContextScopedReplaceInput } from 'monaco-editor/esm/vs/platform/history/browser/contextScopedHistoryWidget.js';
-import { appendKeyBindingLabel, isSearchViewFocused, getSearchView } from './searchActionsBase.js';
-import { ReplaceActiveKey, SearchInputBoxFocusedKey, ReplaceInputBoxFocusedKey, ToggleCaseSensitiveCommandId, ToggleWholeWordCommandId, ToggleRegexCommandId, TogglePreserveCaseId, SearchViewVisibleKey } from '../common/constants.js';
+import { appendKeyBindingLabel, isSearchViewFocused, getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
+import { ReplaceActiveKey, SearchInputBoxFocusedKey, ReplaceInputBoxFocusedKey, ToggleCaseSensitiveCommandId, ToggleWholeWordCommandId, ToggleRegexCommandId, TogglePreserveCaseId, SearchViewVisibleKey } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { IAccessibilityService } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
 import { isMacintosh } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { Toggle } from 'monaco-editor/esm/vs/base/browser/ui/toggle/toggle.js';
 import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
 import { searchReplaceAllIcon, searchHideReplaceIcon, searchShowContextIcon, searchShowReplaceIcon } from './searchIcons.js';
-import { ToggleSearchEditorContextLinesCommandId } from '../../searchEditor/browser/constants.js';
+import { ToggleSearchEditorContextLinesCommandId } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { showHistoryKeybindingHint } from 'monaco-editor/esm/vs/platform/history/browser/historyWidgetKeybindingHint.js';
 import { defaultToggleStyles, defaultInputBoxStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
-import { NotebookFindFilters } from '../../notebook/browser/contrib/find/findFilters.js';
+import { NotebookFindFilters } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/find/findFilters';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { NotebookEditorInput } from '../../../../../../../override/vs/workbench/contrib/notebook/common/notebookEditorInput.js';
+import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { SearchFindInput } from './searchFindInput.js';
 
 var SearchWidget_1;

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

@@ -14,10 +14,10 @@ import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions, DEFAULT_EDITOR_ASSOCIATION } from 'vscode/vscode/vs/workbench/common/editor';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
-import { getSearchView } from '../../search/browser/searchActionsBase.js';
+import { getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { searchRefreshIcon, searchNewEditorIcon } from '../../search/browser/searchIcons.js';
-import { HasSearchResults, SearchViewFocusedKey, SearchInputBoxFocusedKey } from '../../search/common/constants.js';
-import { InSearchEditor, OpenNewEditorCommandId, OpenEditorCommandId, SearchEditorID, ToggleSearchEditorContextLinesCommandId, SearchEditorScheme } from './constants.js';
+import { HasSearchResults, SearchViewFocusedKey, SearchInputBoxFocusedKey } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { InSearchEditor, OpenNewEditorCommandId, OpenEditorCommandId, SearchEditorID, ToggleSearchEditorContextLinesCommandId, SearchEditorScheme } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { SearchEditor } from './searchEditor.js';
 import { openNewSearchEditor, createEditorFromSearchResult, toggleSearchEditorCaseSensitiveCommand, toggleSearchEditorWholeWordCommand, toggleSearchEditorRegexCommand, toggleSearchEditorContextLinesCommand, modifySearchEditorContextLinesCommand, selectAllSearchEditorMatchesCommand, openSearchEditor } from './searchEditorActions.js';
 import { SearchEditorInput, SEARCH_EDITOR_EXT, getOrMakeSearchEditorInput } from './searchEditorInput.js';

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

@@ -30,11 +30,11 @@ import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspac
 import { AbstractTextCodeEditor } from 'vscode/vscode/vs/workbench/browser/parts/editor/textCodeEditor';
 import { IncludePatternInputWidget, ExcludePatternInputWidget } from '../../search/browser/patternInputWidget.js';
 import { SearchWidget } from '../../search/browser/searchWidget.js';
-import { InputBoxFocusedKey } from '../../search/common/constants.js';
+import { InputBoxFocusedKey } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { QueryBuilder } from 'vscode/vscode/vs/workbench/services/search/common/queryBuilder';
 import { getOutOfWorkspaceEditorResources } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
 import { SearchModel } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
-import { SearchEditorID, InSearchEditor, SearchEditorInputTypeId } from './constants.js';
+import { SearchEditorID, InSearchEditor, SearchEditorInputTypeId } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { serializeSearchResultForEditor } from './searchEditorSerialization.js';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.js

@@ -7,7 +7,7 @@ import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.
 import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
 import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
 import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
-import { getSearchView } from '../../search/browser/searchActionsBase.js';
+import { getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { SearchEditorInput, getOrMakeSearchEditorInput } from './searchEditorInput.js';
 import { serializeSearchResultForEditor } from './searchEditorSerialization.js';
 import { IConfigurationResolverService } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/configurationResolver';

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.js

@@ -12,7 +12,7 @@ import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/st
 import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
 import { EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
-import { SearchEditorInputTypeId, SearchEditorScheme, SearchEditorWorkingCopyTypeId, SearchEditorFindMatchClass } from './constants.js';
+import { SearchEditorInputTypeId, SearchEditorScheme, SearchEditorWorkingCopyTypeId, SearchEditorFindMatchClass } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { SearchEditorModel, searchEditorModelFactory } from './searchEditorModel.js';
 import { serializeSearchConfiguration, parseSavedSearchEditor, defaultSearchConfig } from './searchEditorSerialization.js';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorModel.js

@@ -5,7 +5,7 @@ import { parseSavedSearchEditor, parseSerializedSearchEditor } from './searchEdi
 import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup';
 import { assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { createTextBufferFactoryFromStream } from 'monaco-editor/esm/vs/editor/common/model/textModel.js';
-import { SearchEditorWorkingCopyTypeId } from './constants.js';
+import { SearchEditorWorkingCopyTypeId } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
 import { SEARCH_RESULT_LANGUAGE_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';

package/override/vs/workbench/contrib/notebook/browser/notebookEditor.js

@@ -1,3 +0,0 @@
-class NotebookEditor {}
-
-export { NotebookEditor };

package/override/vs/workbench/contrib/notebook/common/notebookEditorInput.js

@@ -1,3 +0,0 @@
-class NotebookEditorInput {}
-
-export { NotebookEditorInput };

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

@@ -1,72 +0,0 @@
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-
-class NotebookFindFilters extends Disposable {
-    get markupInput() {
-        return this._markupInput;
-    }
-    set markupInput(value) {
-        if (this._markupInput !== value) {
-            this._markupInput = value;
-            this._onDidChange.fire({ markupInput: value });
-        }
-    }
-    get markupPreview() {
-        return this._markupPreview;
-    }
-    set markupPreview(value) {
-        if (this._markupPreview !== value) {
-            this._markupPreview = value;
-            this._onDidChange.fire({ markupPreview: value });
-        }
-    }
-    get codeInput() {
-        return this._codeInput;
-    }
-    set codeInput(value) {
-        if (this._codeInput !== value) {
-            this._codeInput = value;
-            this._onDidChange.fire({ codeInput: value });
-        }
-    }
-    get codeOutput() {
-        return this._codeOutput;
-    }
-    set codeOutput(value) {
-        if (this._codeOutput !== value) {
-            this._codeOutput = value;
-            this._onDidChange.fire({ codeOutput: value });
-        }
-    }
-    constructor(markupInput, markupPreview, codeInput, codeOutput) {
-        super();
-        this._onDidChange = this._register(( new Emitter()));
-        this.onDidChange = this._onDidChange.event;
-        this._markupInput = true;
-        this._markupPreview = true;
-        this._codeInput = true;
-        this._codeOutput = true;
-        this._markupInput = markupInput;
-        this._markupPreview = markupPreview;
-        this._codeInput = codeInput;
-        this._codeOutput = codeOutput;
-        this._initialMarkupInput = markupInput;
-        this._initialMarkupPreview = markupPreview;
-        this._initialCodeInput = codeInput;
-        this._initialCodeOutput = codeOutput;
-    }
-    isModified() {
-        return (this._markupInput !== this._initialMarkupInput
-            || this._markupPreview !== this._initialMarkupPreview
-            || this._codeInput !== this._initialCodeInput
-            || this._codeOutput !== this._initialCodeOutput);
-    }
-    update(v) {
-        this._markupInput = v.markupInput;
-        this._markupPreview = v.markupPreview;
-        this._codeInput = v.codeInput;
-        this._codeOutput = v.codeOutput;
-    }
-}
-
-export { NotebookFindFilters };

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

@@ -1,6 +0,0 @@
-import n from '../../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-
-var css = ".monaco-workbench .simple-fr-find-part-wrapper{background-color:var(--vscode-editorWidget-background)!important;border-bottom-left-radius:4px;border-bottom-right-radius:4px;box-shadow:0 0 8px 2px var(--vscode-widget-shadow);color:var(--vscode-editorWidget-foreground);max-width:calc(100% - 64px);overflow:hidden;padding:0 var(--notebook-find-horizontal-padding);position:absolute;right:18px;top:-45px;transition:top .2s linear;visibility:hidden;width:var(--notebook-find-width);z-index:10}.monaco-workbench.reduce-motion .simple-fr-find-part-wrapper{transition:top 0ms linear}.monaco-workbench .notebookOverlay .simple-fr-find-part-wrapper.visible{z-index:100}.monaco-workbench .simple-fr-find-part,.monaco-workbench .simple-fr-replace-part{align-items:center;display:flex;margin:0 0 0 17px;padding:4px;pointer-events:all;position:relative;top:0;z-index:10}.monaco-workbench .simple-fr-find-part-wrapper .find-replace-progress{height:2px;position:absolute;width:100%}.monaco-workbench .simple-fr-find-part-wrapper .find-replace-progress .monaco-progress-container{top:0!important;z-index:100!important}.monaco-workbench .simple-fr-find-part-wrapper .monaco-findInput{width:224px}.monaco-workbench .simple-fr-find-part-wrapper .button{align-items:center;background-position:50%;background-repeat:no-repeat;cursor:pointer;display:flex;flex:initial;height:20px;justify-content:center;margin-left:3px;width:20px}.monaco-workbench .simple-fr-find-part-wrapper.visible .simple-fr-find-part{visibility:visible}.monaco-workbench .simple-fr-find-part-wrapper .toggle{align-items:center;box-sizing:border-box;display:flex;height:100%;justify-content:center;margin-left:0;pointer-events:all;position:absolute;top:0;width:18px}.monaco-workbench .simple-fr-find-part-wrapper.visible{visibility:visible}.monaco-workbench .simple-fr-find-part-wrapper.visible-transition{top:0}.monaco-workbench .simple-fr-find-part .monaco-findInput{flex:1}.monaco-workbench .simple-fr-find-part .button{background-position:50%;background-repeat:no-repeat;cursor:pointer;display:flex;flex:initial;height:20px;margin-left:3px;min-width:20px;width:20px}.monaco-workbench .simple-fr-find-part-wrapper .button.disabled{cursor:default;opacity:.3}.monaco-workbench .simple-fr-find-part-wrapper .monaco-custom-toggle.disabled{background-color:inherit!important;cursor:default;opacity:.3;pointer-events:none;user-select:none;-webkit-user-select:none}.monaco-workbench .simple-fr-find-part-wrapper .find-filter-button{box-sizing:border-box;color:inherit;cursor:pointer;float:left;margin-left:2px;user-select:none;-webkit-user-select:none}.find-filter-button .monaco-action-bar .action-label{padding:0}.monaco-workbench .simple-fr-find-part .monaco-inputbox>.ibwrapper>.input,.monaco-workbench .simple-fr-replace-part .monaco-inputbox>.ibwrapper>.input{height:24px}.monaco-workbench .simple-fr-find-part-wrapper .monaco-sash{background-color:var(--vscode-editorWidget-resizeBorder,var(--vscode-editorWidget-border));left:0!important}";
-n(css,{});
-
-export { css, css as default };

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

@@ -1,184 +0,0 @@
-import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import './notebookFindReplaceWidget.css.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
-import { registerThemingParticipant } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { Separator, Action, ActionRunner } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { DropdownMenuActionViewItem } from 'monaco-editor/esm/vs/base/browser/ui/dropdown/dropdownActionViewItem.js';
-import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
-import { filterIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
-import { isSafari } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-
-registerIcon('find-filter', Codicon.filter, ( nls.localizeWithPath(
-    'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget',
-    'findFilterIcon',
-    'Icon for Find Filter in find widget.'
-)));
-const NOTEBOOK_FIND_FILTERS = ( nls.localizeWithPath(
-    'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget',
-    'notebook.find.filter.filterAction',
-    "Find Filters"
-));
-const NOTEBOOK_FIND_IN_MARKUP_INPUT = ( nls.localizeWithPath(
-    'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget',
-    'notebook.find.filter.findInMarkupInput',
-    "Markdown Source"
-));
-const NOTEBOOK_FIND_IN_MARKUP_PREVIEW = ( nls.localizeWithPath(
-    'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget',
-    'notebook.find.filter.findInMarkupPreview',
-    "Rendered Markdown"
-));
-const NOTEBOOK_FIND_IN_CODE_INPUT = ( nls.localizeWithPath(
-    'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget',
-    'notebook.find.filter.findInCodeInput',
-    "Code Cell Source"
-));
-const NOTEBOOK_FIND_IN_CODE_OUTPUT = ( nls.localizeWithPath(
-    'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget',
-    'notebook.find.filter.findInCodeOutput',
-    "Code Cell Output"
-));
-const NOTEBOOK_FIND_WIDGET_INITIAL_WIDTH = 318;
-const NOTEBOOK_FIND_WIDGET_INITIAL_HORIZONTAL_PADDING = 4;
-let NotebookFindFilterActionViewItem = class NotebookFindFilterActionViewItem extends DropdownMenuActionViewItem {
-    constructor(filters, action, actionRunner, contextMenuService) {
-        super(action, { getActions: () => this.getActions() }, contextMenuService, {
-            actionRunner,
-            classNames: action.class,
-            anchorAlignmentProvider: () => 1
-        });
-        this.filters = filters;
-    }
-    render(container) {
-        super.render(container);
-        this.updateChecked();
-    }
-    getActions() {
-        const markdownInput = {
-            checked: this.filters.markupInput,
-            class: undefined,
-            enabled: true,
-            id: 'findInMarkdownInput',
-            label: NOTEBOOK_FIND_IN_MARKUP_INPUT,
-            run: async () => {
-                this.filters.markupInput = !this.filters.markupInput;
-            },
-            tooltip: ''
-        };
-        const markdownPreview = {
-            checked: this.filters.markupPreview,
-            class: undefined,
-            enabled: true,
-            id: 'findInMarkdownInput',
-            label: NOTEBOOK_FIND_IN_MARKUP_PREVIEW,
-            run: async () => {
-                this.filters.markupPreview = !this.filters.markupPreview;
-            },
-            tooltip: ''
-        };
-        const codeInput = {
-            checked: this.filters.codeInput,
-            class: undefined,
-            enabled: true,
-            id: 'findInCodeInput',
-            label: NOTEBOOK_FIND_IN_CODE_INPUT,
-            run: async () => {
-                this.filters.codeInput = !this.filters.codeInput;
-            },
-            tooltip: ''
-        };
-        const codeOutput = {
-            checked: this.filters.codeOutput,
-            class: undefined,
-            enabled: true,
-            id: 'findInCodeOutput',
-            label: NOTEBOOK_FIND_IN_CODE_OUTPUT,
-            run: async () => {
-                this.filters.codeOutput = !this.filters.codeOutput;
-            },
-            tooltip: '',
-            dispose: () => null
-        };
-        if (isSafari) {
-            return [
-                markdownInput,
-                codeInput
-            ];
-        }
-        else {
-            return [
-                markdownInput,
-                markdownPreview,
-                ( new Separator()),
-                codeInput,
-                codeOutput,
-            ];
-        }
-    }
-    updateChecked() {
-        this.element.classList.toggle('checked', this._action.checked);
-    }
-};
-NotebookFindFilterActionViewItem = ( __decorate([
-    ( __param(3, IContextMenuService))
-], NotebookFindFilterActionViewItem));
-class NotebookFindInputFilterButton extends Disposable {
-    constructor(filters, contextMenuService, instantiationService, options, tooltip = NOTEBOOK_FIND_FILTERS) {
-        super();
-        this.filters = filters;
-        this.contextMenuService = contextMenuService;
-        this.instantiationService = instantiationService;
-        this._actionbar = null;
-        this._toggleStyles = options.toggleStyles;
-        this._filtersAction = ( new Action(
-            'notebookFindFilterAction',
-            tooltip,
-            'notebook-filters ' + ThemeIcon.asClassName(filterIcon)
-        ));
-        this._filtersAction.checked = false;
-        this._filterButtonContainer = dom.$('.find-filter-button');
-        this._filterButtonContainer.classList.add('monaco-custom-toggle');
-        this.createFilters(this._filterButtonContainer);
-    }
-    get container() {
-        return this._filterButtonContainer;
-    }
-    get width() {
-        return 2  + 2  + 2  + 16 ;
-    }
-    applyStyles(filterChecked) {
-        const toggleStyles = this._toggleStyles;
-        this._filterButtonContainer.style.border = '1px solid transparent';
-        this._filterButtonContainer.style.borderRadius = '3px';
-        this._filterButtonContainer.style.borderColor = (filterChecked && toggleStyles.inputActiveOptionBorder) || '';
-        this._filterButtonContainer.style.color = (filterChecked && toggleStyles.inputActiveOptionForeground) || 'inherit';
-        this._filterButtonContainer.style.backgroundColor = (filterChecked && toggleStyles.inputActiveOptionBackground) || '';
-    }
-    createFilters(container) {
-        this._actionbar = this._register(( new ActionBar(container, {
-            actionViewItemProvider: action => {
-                if (action.id === this._filtersAction.id) {
-                    return this.instantiationService.createInstance(NotebookFindFilterActionViewItem, this.filters, action, ( new ActionRunner()));
-                }
-                return undefined;
-            }
-        })));
-        this._actionbar.push(this._filtersAction, { icon: true, label: false });
-    }
-}
-registerThemingParticipant((theme, collector) => {
-    collector.addRule(`
-	.notebook-editor {
-		--notebook-find-width: ${NOTEBOOK_FIND_WIDGET_INITIAL_WIDTH}px;
-		--notebook-find-horizontal-padding: ${NOTEBOOK_FIND_WIDGET_INITIAL_HORIZONTAL_PADDING}px;
-	}
-	`);
-});
-
-export { NotebookFindInputFilterButton };

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

@@ -1,51 +0,0 @@
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { searchComparer, FileMatch, Match, FolderMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
-import { VIEW_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
-
-const category = { value: ( nls.localizeWithPath(
-    'vs/workbench/contrib/search/browser/searchActionsBase',
-    'search',
-    "Search"
-)), original: 'Search' };
-function isSearchViewFocused(viewsService) {
-    const searchView = getSearchView(viewsService);
-    return !!(searchView && dom.isAncestorOfActiveElement(searchView.getContainer()));
-}
-function appendKeyBindingLabel(label, inputKeyBinding) {
-    return doAppendKeyBindingLabel(label, inputKeyBinding);
-}
-function getSearchView(viewsService) {
-    return viewsService.getActiveViewWithId(VIEW_ID);
-}
-function getElementsToOperateOn(viewer, currElement, sortConfig) {
-    let elements = viewer.getSelection().filter((x) => x !== null).sort((a, b) => searchComparer(a, b, sortConfig.sortOrder));
-    if (currElement && !(elements.length > 1 && elements.includes(currElement))) {
-        elements = [currElement];
-    }
-    return elements;
-}
-function shouldRefocus(elements, focusElement) {
-    if (!focusElement) {
-        return false;
-    }
-    return !focusElement || elements.includes(focusElement) || hasDownstreamMatch(elements, focusElement);
-}
-function hasDownstreamMatch(elements, focusElement) {
-    for (const elem of elements) {
-        if ((elem instanceof FileMatch && focusElement instanceof Match && elem.matches().includes(focusElement)) ||
-            (elem instanceof FolderMatch && ((focusElement instanceof FileMatch && elem.getDownstreamFileMatch(focusElement.resource)) ||
-                (focusElement instanceof Match && elem.getDownstreamFileMatch(focusElement.parent().resource))))) {
-            return true;
-        }
-    }
-    return false;
-}
-function openSearchView(viewsService, focus) {
-    return viewsService.openView(VIEW_ID, focus).then(view => (view ?? undefined));
-}
-function doAppendKeyBindingLabel(label, keyBinding) {
-    return keyBinding ? label + ' (' + keyBinding.getLabel() + ')' : label;
-}
-
-export { appendKeyBindingLabel, category, getElementsToOperateOn, getSearchView, isSearchViewFocused, openSearchView, shouldRefocus };

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

@@ -1,389 +0,0 @@
-import { dirname } from 'monaco-editor/esm/vs/base/common/resources.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IListService } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
-import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
-import { RestrictSearchToFolderId, SearchViewVisibleKey, ResourceFolderFocusKey, ExcludeFolderFromSearchId, RevealInSideBarForSearchResults, FileFocusKey, HasSearchResults, FindInFilesActionId, FindInFolderId, FindInWorkspaceId } from '../common/constants.js';
-import { OpenEditorCommandId } from '../../searchEditor/browser/constants.js';
-import { FileMatch, Match } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-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 { resolveResourcesForSearchIncludes } from 'vscode/vscode/vs/workbench/services/search/common/queryBuilder';
-import { IExplorerService, getMultiSelectedResources } from 'vscode/vscode/vs/workbench/contrib/files/browser/files';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
-import { VIEWLET_ID, FilesExplorerFocusCondition, ExplorerFolderContext, ExplorerRootContext } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
-import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
-import { onUnexpectedError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { category, getSearchView, openSearchView, getElementsToOperateOn } from './searchActionsBase.js';
-import { IConfigurationResolverService } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-
-registerAction2(class RestrictSearchToFolderAction extends Action2 {
-    constructor() {
-        super({
-            id: RestrictSearchToFolderId,
-            title: {
-                value: ( nls.localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsFind',
-                    'restrictResultsToFolder',
-                    "Restrict Search to Folder"
-                )),
-                original: 'Restrict Search to Folder'
-            },
-            category,
-            keybinding: {
-                weight: 200 ,
-                when: ( ContextKeyExpr.and(SearchViewVisibleKey, ResourceFolderFocusKey)),
-                primary: 1024  | 512  | 36 ,
-            },
-            menu: [
-                {
-                    id: MenuId.SearchContext,
-                    group: 'search',
-                    order: 3,
-                    when: ( ContextKeyExpr.and(ResourceFolderFocusKey))
-                }
-            ]
-        });
-    }
-    async run(accessor, folderMatch) {
-        await searchWithFolderCommand(accessor, false, true, undefined, folderMatch);
-    }
-});
-registerAction2(class ExcludeFolderFromSearchAction extends Action2 {
-    constructor() {
-        super({
-            id: ExcludeFolderFromSearchId,
-            title: {
-                value: ( nls.localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsFind',
-                    'excludeFolderFromSearch',
-                    "Exclude Folder from Search"
-                )),
-                original: 'Exclude Folder from Search'
-            },
-            category,
-            menu: [
-                {
-                    id: MenuId.SearchContext,
-                    group: 'search',
-                    order: 4,
-                    when: ( ContextKeyExpr.and(ResourceFolderFocusKey))
-                }
-            ]
-        });
-    }
-    async run(accessor, folderMatch) {
-        await searchWithFolderCommand(accessor, false, false, undefined, folderMatch);
-    }
-});
-registerAction2(class RevealInSideBarForSearchResultsAction extends Action2 {
-    constructor() {
-        super({
-            id: RevealInSideBarForSearchResults,
-            title: {
-                value: ( nls.localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsFind',
-                    'revealInSideBar',
-                    "Reveal in Explorer View"
-                )),
-                original: 'Reveal in Explorer View'
-            },
-            category,
-            menu: [{
-                    id: MenuId.SearchContext,
-                    when: ( ContextKeyExpr.and(FileFocusKey, HasSearchResults)),
-                    group: 'search_3',
-                    order: 1
-                }]
-        });
-    }
-    async run(accessor, args) {
-        const paneCompositeService = accessor.get(IPaneCompositePartService);
-        const explorerService = accessor.get(IExplorerService);
-        const contextService = accessor.get(IWorkspaceContextService);
-        const searchView = getSearchView(accessor.get(IViewsService));
-        if (!searchView) {
-            return;
-        }
-        let fileMatch;
-        if (!(args instanceof FileMatch)) {
-            args = searchView.getControl().getFocus()[0];
-        }
-        if (args instanceof FileMatch) {
-            fileMatch = args;
-        }
-        else {
-            return;
-        }
-        paneCompositeService.openPaneComposite(VIEWLET_ID, 0 , false).then((viewlet) => {
-            if (!viewlet) {
-                return;
-            }
-            const explorerViewContainer = viewlet.getViewPaneContainer();
-            const uri = fileMatch.resource;
-            if (uri && contextService.isInsideWorkspace(uri)) {
-                const explorerView = explorerViewContainer.getExplorerView();
-                explorerView.setExpanded(true);
-                explorerService.select(uri, true).then(() => explorerView.focus(), onUnexpectedError);
-            }
-        });
-    }
-});
-registerAction2(class FindInFilesAction extends Action2 {
-    constructor() {
-        super({
-            id: FindInFilesActionId,
-            title: {
-                value: ( nls.localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsFind',
-                    'findInFiles',
-                    "Find in Files"
-                )),
-                mnemonicTitle: ( nls.localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsFind',
-                    { key: 'miFindInFiles', comment: ['&& denotes a mnemonic'] },
-                    "Find &&in Files"
-                )),
-                original: 'Find in Files'
-            },
-            metadata: {
-                description: ( nls.localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsFind',
-                    'findInFiles.description',
-                    "Open a workspace search"
-                )),
-                args: [
-                    {
-                        name: ( nls.localizeWithPath(
-                            'vs/workbench/contrib/search/browser/searchActionsFind',
-                            'findInFiles.args',
-                            "A set of options for the search"
-                        )),
-                        schema: {
-                            type: 'object',
-                            properties: {
-                                query: { 'type': 'string' },
-                                replace: { 'type': 'string' },
-                                preserveCase: { 'type': 'boolean' },
-                                triggerSearch: { 'type': 'boolean' },
-                                filesToInclude: { 'type': 'string' },
-                                filesToExclude: { 'type': 'string' },
-                                isRegex: { 'type': 'boolean' },
-                                isCaseSensitive: { 'type': 'boolean' },
-                                matchWholeWord: { 'type': 'boolean' },
-                                useExcludeSettingsAndIgnoreFiles: { 'type': 'boolean' },
-                                onlyOpenEditors: { 'type': 'boolean' },
-                            }
-                        }
-                    },
-                ]
-            },
-            category,
-            keybinding: {
-                weight: 200 ,
-                primary: 2048  | 1024  | 36 ,
-            },
-            menu: [{
-                    id: MenuId.MenubarEditMenu,
-                    group: '4_find_global',
-                    order: 1,
-                }],
-            f1: true
-        });
-    }
-    async run(accessor, args = {}) {
-        findInFilesCommand(accessor, args);
-    }
-});
-registerAction2(class FindInFolderAction extends Action2 {
-    constructor() {
-        super({
-            id: FindInFolderId,
-            title: {
-                value: ( nls.localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsFind',
-                    'findInFolder',
-                    "Find in Folder..."
-                )),
-                original: 'Find in Folder...'
-            },
-            category,
-            keybinding: {
-                weight: 200 ,
-                when: ( ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerFolderContext)),
-                primary: 1024  | 512  | 36 ,
-            },
-            menu: [
-                {
-                    id: MenuId.ExplorerContext,
-                    group: '4_search',
-                    order: 10,
-                    when: ( ContextKeyExpr.and(ExplorerFolderContext))
-                }
-            ]
-        });
-    }
-    async run(accessor, resource) {
-        await searchWithFolderCommand(accessor, true, true, resource);
-    }
-});
-registerAction2(class FindInWorkspaceAction extends Action2 {
-    constructor() {
-        super({
-            id: FindInWorkspaceId,
-            title: {
-                value: ( nls.localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsFind',
-                    'findInWorkspace',
-                    "Find in Workspace..."
-                )),
-                original: 'Find in Workspace...'
-            },
-            category,
-            menu: [
-                {
-                    id: MenuId.ExplorerContext,
-                    group: '4_search',
-                    order: 10,
-                    when: ( ContextKeyExpr.and(ExplorerRootContext, ( ExplorerFolderContext.toNegated())))
-                }
-            ]
-        });
-    }
-    async run(accessor) {
-        const searchConfig = accessor.get(IConfigurationService).getValue().search;
-        const mode = searchConfig.mode;
-        if (mode === 'view') {
-            const searchView = await openSearchView(accessor.get(IViewsService), true);
-            searchView?.searchInFolders();
-        }
-        else {
-            return accessor.get(ICommandService).executeCommand(OpenEditorCommandId, {
-                location: mode === 'newEditor' ? 'new' : 'reuse',
-                filesToInclude: '',
-            });
-        }
-    }
-});
-async function searchWithFolderCommand(accessor, isFromExplorer, isIncludes, resource, folderMatch) {
-    const listService = accessor.get(IListService);
-    const fileService = accessor.get(IFileService);
-    const viewsService = accessor.get(IViewsService);
-    const contextService = accessor.get(IWorkspaceContextService);
-    const commandService = accessor.get(ICommandService);
-    const searchConfig = accessor.get(IConfigurationService).getValue().search;
-    const mode = searchConfig.mode;
-    let resources;
-    if (isFromExplorer) {
-        resources = getMultiSelectedResources(resource, listService, accessor.get(IEditorService), accessor.get(IExplorerService));
-    }
-    else {
-        const searchView = getSearchView(accessor.get(IViewsService));
-        if (!searchView) {
-            return;
-        }
-        resources = getMultiSelectedSearchResources(searchView.getControl(), folderMatch, searchConfig);
-    }
-    const resolvedResources = fileService.resolveAll(( resources.map(resource => ({ resource })))).then(results => {
-        const folders = [];
-        results.forEach(result => {
-            if (result.success && result.stat) {
-                folders.push(result.stat.isDirectory ? result.stat.resource : dirname(result.stat.resource));
-            }
-        });
-        return resolveResourcesForSearchIncludes(folders, contextService);
-    });
-    if (mode === 'view') {
-        const searchView = await openSearchView(viewsService, true);
-        if (resources && resources.length && searchView) {
-            if (isIncludes) {
-                searchView.searchInFolders(await resolvedResources);
-            }
-            else {
-                searchView.searchOutsideOfFolders(await resolvedResources);
-            }
-        }
-        return undefined;
-    }
-    else {
-        if (isIncludes) {
-            return commandService.executeCommand(OpenEditorCommandId, {
-                filesToInclude: (await resolvedResources).join(', '),
-                showIncludesExcludes: true,
-                location: mode === 'newEditor' ? 'new' : 'reuse',
-            });
-        }
-        else {
-            return commandService.executeCommand(OpenEditorCommandId, {
-                filesToExclude: (await resolvedResources).join(', '),
-                showIncludesExcludes: true,
-                location: mode === 'newEditor' ? 'new' : 'reuse',
-            });
-        }
-    }
-}
-function getMultiSelectedSearchResources(viewer, currElement, sortConfig) {
-    return ( getElementsToOperateOn(viewer, currElement, sortConfig)
-        .map(
-        (renderableMatch) => ((renderableMatch instanceof Match) ? null : renderableMatch.resource)
-    ))
-        .filter((renderableMatch) => (renderableMatch !== null));
-}
-async function findInFilesCommand(accessor, _args = {}) {
-    const searchConfig = accessor.get(IConfigurationService).getValue().search;
-    const viewsService = accessor.get(IViewsService);
-    const commandService = accessor.get(ICommandService);
-    const args = {};
-    if (( Object.keys(_args)).length !== 0) {
-        const configurationResolverService = accessor.get(IConfigurationResolverService);
-        const historyService = accessor.get(IHistoryService);
-        const workspaceContextService = accessor.get(IWorkspaceContextService);
-        const activeWorkspaceRootUri = historyService.getLastActiveWorkspaceRoot();
-        const filteredActiveWorkspaceRootUri = activeWorkspaceRootUri?.scheme === Schemas.file || activeWorkspaceRootUri?.scheme === Schemas.vscodeRemote ? activeWorkspaceRootUri : undefined;
-        const lastActiveWorkspaceRoot = filteredActiveWorkspaceRootUri ? workspaceContextService.getWorkspaceFolder(filteredActiveWorkspaceRootUri) ?? undefined : undefined;
-        for (const entry of Object.entries(_args)) {
-            const name = entry[0];
-            const value = entry[1];
-            if (value !== undefined) {
-                args[name] = (typeof value === 'string') ? await configurationResolverService.resolveAsync(lastActiveWorkspaceRoot, value) : value;
-            }
-        }
-    }
-    const mode = searchConfig.mode;
-    if (mode === 'view') {
-        openSearchView(viewsService, false).then(openedView => {
-            if (openedView) {
-                const searchAndReplaceWidget = openedView.searchAndReplaceWidget;
-                searchAndReplaceWidget.toggleReplace(typeof args.replace === 'string');
-                let updatedText = false;
-                if (typeof args.query !== 'string') {
-                    updatedText = openedView.updateTextFromFindWidgetOrSelection({ allowUnselectedWord: typeof args.replace !== 'string' });
-                }
-                openedView.setSearchParameters(args);
-                openedView.searchAndReplaceWidget.focus(undefined, updatedText, updatedText);
-            }
-        });
-    }
-    else {
-        const convertArgs = (args) => ({
-            location: mode === 'newEditor' ? 'new' : 'reuse',
-            query: args.query,
-            filesToInclude: args.filesToInclude,
-            filesToExclude: args.filesToExclude,
-            matchWholeWord: args.matchWholeWord,
-            isCaseSensitive: args.isCaseSensitive,
-            isRegexp: args.isRegex,
-            useExcludeSettingsAndIgnoreFiles: args.useExcludeSettingsAndIgnoreFiles,
-            onlyOpenEditors: args.onlyOpenEditors,
-            showIncludesExcludes: !!(args.filesToExclude || args.filesToExclude || !args.useExcludeSettingsAndIgnoreFiles),
-        });
-        commandService.executeCommand(OpenEditorCommandId, convertArgs(args));
-    }
-}
-
-export { findInFilesCommand };

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

@@ -1,68 +0,0 @@
-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 QuickTextSearchActionId = 'workbench.action.experimental.quickTextSearch';
-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));
-const SearchInputBoxFocusedKey = ( new RawContextKey('searchInputBoxFocus', false));
-const ReplaceInputBoxFocusedKey = ( new RawContextKey('replaceInputBoxFocus', false));
-const PatternIncludesFocusedKey = ( new RawContextKey('patternIncludesInputBoxFocus', false));
-const PatternExcludesFocusedKey = ( new RawContextKey('patternExcludesInputBoxFocus', false));
-const ReplaceActiveKey = ( new RawContextKey('replaceActive', false));
-const HasSearchResults = ( new RawContextKey('hasSearchResult', false));
-const FirstMatchFocusKey = ( new RawContextKey('firstMatchFocus', false));
-const FileMatchOrMatchFocusKey = ( new RawContextKey('fileMatchOrMatchFocus', false));
-const FileMatchOrFolderMatchFocusKey = ( new RawContextKey('fileMatchOrFolderMatchFocus', false));
-const FileMatchOrFolderMatchWithResourceFocusKey = ( new RawContextKey('fileMatchOrFolderMatchWithResourceFocus', false));
-const FileFocusKey = ( new RawContextKey('fileMatchFocus', false));
-const FolderFocusKey = ( new RawContextKey('folderMatchFocus', false));
-const ResourceFolderFocusKey = ( new RawContextKey('folderMatchWithResourceFocus', false));
-const IsEditableItemKey = ( new RawContextKey('isEditableItem', true));
-const MatchFocusKey = ( new RawContextKey('matchFocus', false));
-const ViewHasSearchPatternKey = ( new RawContextKey('viewHasSearchPattern', false));
-const ViewHasReplacePatternKey = ( new RawContextKey('viewHasReplacePattern', false));
-const ViewHasFilePatternKey = ( new RawContextKey('viewHasFilePattern', false));
-const ViewHasSomeCollapsibleKey = ( new RawContextKey('viewHasSomeCollapsibleResult', false));
-const InTreeViewKey = ( new RawContextKey('inTreeView', false));
-
-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, QuickTextSearchActionId, 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/vscode/src/vs/workbench/contrib/searchEditor/browser/constants.js

@@ -1,13 +0,0 @@
-import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-
-const InSearchEditor = ( new RawContextKey('inSearchEditor', false));
-const SearchEditorScheme = 'search-editor';
-const SearchEditorWorkingCopyTypeId = 'search/editor';
-const SearchEditorFindMatchClass = 'searchEditorFindMatch';
-const SearchEditorID = 'workbench.editor.searchEditor';
-const OpenNewEditorCommandId = 'search.action.openNewEditor';
-const OpenEditorCommandId = 'search.action.openEditor';
-const ToggleSearchEditorContextLinesCommandId = 'toggleSearchEditorContextLines';
-const SearchEditorInputTypeId = 'workbench.editorinputs.searchEditorInput';
-
-export { InSearchEditor, OpenEditorCommandId, OpenNewEditorCommandId, SearchEditorFindMatchClass, SearchEditorID, SearchEditorInputTypeId, SearchEditorScheme, SearchEditorWorkingCopyTypeId, ToggleSearchEditorContextLinesCommandId };