@codingame/monaco-vscode-search-service-override 1.83.5 → 1.83.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. package/package.json +2 -2
  2. package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js +30 -16
  3. package/vscode/src/vs/workbench/contrib/search/browser/anythingQuickAccess.js +52 -9
  4. package/vscode/src/vs/workbench/contrib/search/browser/patternInputWidget.js +15 -3
  5. package/vscode/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.js +15 -3
  6. package/vscode/src/vs/workbench/contrib/search/browser/replaceService.js +12 -2
  7. package/vscode/src/vs/workbench/contrib/search/browser/search.contribution.js +343 -68
  8. package/vscode/src/vs/workbench/contrib/search/browser/searchActionsBase.js +5 -1
  9. package/vscode/src/vs/workbench/contrib/search/browser/searchActionsCopy.js +15 -3
  10. package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js +45 -9
  11. package/vscode/src/vs/workbench/contrib/search/browser/searchActionsNav.js +85 -17
  12. package/vscode/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.js +20 -4
  13. package/vscode/src/vs/workbench/contrib/search/browser/searchActionsSymbol.js +15 -3
  14. package/vscode/src/vs/workbench/contrib/search/browser/searchActionsTextQuickAccess.js +5 -1
  15. package/vscode/src/vs/workbench/contrib/search/browser/searchActionsTopBar.js +40 -8
  16. package/vscode/src/vs/workbench/contrib/search/browser/searchFindInput.js +5 -7
  17. package/vscode/src/vs/workbench/contrib/search/browser/searchIcons.js +85 -17
  18. package/vscode/src/vs/workbench/contrib/search/browser/searchMessage.js +12 -2
  19. package/vscode/src/vs/workbench/contrib/search/browser/searchResultsView.js +88 -12
  20. package/vscode/src/vs/workbench/contrib/search/browser/searchView.js +346 -89
  21. package/vscode/src/vs/workbench/contrib/search/browser/searchWidget.js +40 -8
  22. package/vscode/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.js +14 -2
  23. package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.js +100 -20
  24. package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditor.js +48 -9
  25. package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.js +17 -3
  26. package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.js +30 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-search-service-override",
3
- "version": "1.83.5",
3
+ "version": "1.83.7",
4
4
  "keywords": [],
5
5
  "author": {
6
6
  "name": "CodinGame",
@@ -18,7 +18,7 @@
18
18
  "module": "index.js",
19
19
  "types": "index.d.ts",
20
20
  "dependencies": {
21
- "vscode": "npm:@codingame/monaco-vscode-api@1.83.5",
21
+ "vscode": "npm:@codingame/monaco-vscode-api@1.83.7",
22
22
  "monaco-editor": "0.44.0"
23
23
  }
24
24
  }
@@ -14,22 +14,36 @@ import { filterIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browse
14
14
  import { isSafari } from 'monaco-editor/esm/vs/base/common/platform.js';
15
15
  import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
16
16
 
17
- nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.find', "Find");
18
- nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'placeholder.find', "Find");
19
- nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.previousMatchButton', "Previous Match");
20
- nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.nextMatchButton', "Next Match");
21
- nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.closeButton', "Close");
22
- nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.toggleReplaceButton', "Toggle Replace");
23
- nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.replace', "Replace");
24
- nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'placeholder.replace', "Replace");
25
- nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.replaceButton', "Replace");
26
- nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.replaceAllButton', "Replace All");
27
- registerIcon('find-filter', Codicon.filter, nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'findFilterIcon', 'Icon for Find Filter in find widget.'));
28
- const NOTEBOOK_FIND_FILTERS = nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'notebook.find.filter.filterAction', "Find Filters");
29
- const NOTEBOOK_FIND_IN_MARKUP_INPUT = nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'notebook.find.filter.findInMarkupInput', "Markdown Source");
30
- const NOTEBOOK_FIND_IN_MARKUP_PREVIEW = nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'notebook.find.filter.findInMarkupPreview', "Rendered Markdown");
31
- const NOTEBOOK_FIND_IN_CODE_INPUT = nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'notebook.find.filter.findInCodeInput', "Code Cell Source");
32
- const NOTEBOOK_FIND_IN_CODE_OUTPUT = nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'notebook.find.filter.findInCodeOutput', "Code Cell Output");
17
+ registerIcon('find-filter', Codicon.filter, ( nls.localizeWithPath(
18
+ 'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget',
19
+ 'findFilterIcon',
20
+ 'Icon for Find Filter in find widget.'
21
+ )));
22
+ const NOTEBOOK_FIND_FILTERS = ( nls.localizeWithPath(
23
+ 'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget',
24
+ 'notebook.find.filter.filterAction',
25
+ "Find Filters"
26
+ ));
27
+ const NOTEBOOK_FIND_IN_MARKUP_INPUT = ( nls.localizeWithPath(
28
+ 'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget',
29
+ 'notebook.find.filter.findInMarkupInput',
30
+ "Markdown Source"
31
+ ));
32
+ const NOTEBOOK_FIND_IN_MARKUP_PREVIEW = ( nls.localizeWithPath(
33
+ 'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget',
34
+ 'notebook.find.filter.findInMarkupPreview',
35
+ "Rendered Markdown"
36
+ ));
37
+ const NOTEBOOK_FIND_IN_CODE_INPUT = ( nls.localizeWithPath(
38
+ 'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget',
39
+ 'notebook.find.filter.findInCodeInput',
40
+ "Code Cell Source"
41
+ ));
42
+ const NOTEBOOK_FIND_IN_CODE_OUTPUT = ( nls.localizeWithPath(
43
+ 'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget',
44
+ 'notebook.find.filter.findInCodeOutput',
45
+ "Code Cell Output"
46
+ ));
33
47
  const NOTEBOOK_FIND_WIDGET_INITIAL_WIDTH = 318;
34
48
  const NOTEBOOK_FIND_WIDGET_INITIAL_HORIZONTAL_PADDING = 4;
35
49
  let NotebookFindFilterActionViewItem = class NotebookFindFilterActionViewItem extends DropdownMenuActionViewItem {
@@ -57,7 +57,11 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
57
57
  static { AnythingQuickAccessProvider_1 = this; }
58
58
  static { this.PREFIX = ''; }
59
59
  static { this.NO_RESULTS_PICK = {
60
- label: localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'noAnythingResults', "No matching results")
60
+ label: ( localizeWithPath(
61
+ 'vs/workbench/contrib/search/browser/anythingQuickAccess',
62
+ 'noAnythingResults',
63
+ "No matching results"
64
+ ))
61
65
  }; }
62
66
  static { this.MAX_RESULTS = 512; }
63
67
  static { this.TYPING_SEARCH_DELAY = 200; }
@@ -255,7 +259,11 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
255
259
  picks.push(...this.getHelpPicks(query, token, options));
256
260
  }
257
261
  if (historyEditorPicks.length !== 0) {
258
- picks.push({ type: 'separator', label: localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'recentlyOpenedSeparator', "recently opened") });
262
+ picks.push({ type: 'separator', label: ( localizeWithPath(
263
+ 'vs/workbench/contrib/search/browser/anythingQuickAccess',
264
+ 'recentlyOpenedSeparator',
265
+ "recently opened"
266
+ )) });
259
267
  picks.push(...historyEditorPicks);
260
268
  }
261
269
  }
@@ -273,7 +281,15 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
273
281
  return [];
274
282
  }
275
283
  return additionalPicks.length > 0 ? [
276
- { type: 'separator', label: this.configuration.includeSymbols ? localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'fileAndSymbolResultsSeparator', "file and symbol results") : localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'fileResultsSeparator', "file results") },
284
+ { type: 'separator', label: this.configuration.includeSymbols ? ( localizeWithPath(
285
+ 'vs/workbench/contrib/search/browser/anythingQuickAccess',
286
+ 'fileAndSymbolResultsSeparator',
287
+ "file and symbol results"
288
+ )) : ( localizeWithPath(
289
+ 'vs/workbench/contrib/search/browser/anythingQuickAccess',
290
+ 'fileResultsSeparator',
291
+ "file results"
292
+ )) },
277
293
  ...additionalPicks
278
294
  ] : [];
279
295
  })(),
@@ -523,7 +539,13 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
523
539
  description: helpEntry.prefix ?? provider.prefix,
524
540
  commandCenterOrder: helpEntry.commandCenterOrder,
525
541
  keybinding: helpEntry.commandId ? this.keybindingService.lookupKeybinding(helpEntry.commandId) : undefined,
526
- ariaLabel: localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'helpPickAriaLabel', "{0}, {1}", label, helpEntry.description),
542
+ ariaLabel: ( localizeWithPath(
543
+ 'vs/workbench/contrib/search/browser/anythingQuickAccess',
544
+ 'helpPickAriaLabel',
545
+ "{0}, {1}",
546
+ label,
547
+ helpEntry.description
548
+ )),
527
549
  accept: () => {
528
550
  this.quickInputService.quickAccess.show(provider.prefix, {
529
551
  preserveValue: true,
@@ -534,7 +556,11 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
534
556
  })));
535
557
  if (this.quickChatService.enabled) {
536
558
  providers.push({
537
- label: localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'chat', "Open Quick Chat"),
559
+ label: ( localizeWithPath(
560
+ 'vs/workbench/contrib/search/browser/anythingQuickAccess',
561
+ 'chat',
562
+ "Open Quick Chat"
563
+ )),
538
564
  commandCenterOrder: 30,
539
565
  keybinding: this.keybindingService.lookupKeybinding(ASK_QUICK_QUESTION_ACTION_ID),
540
566
  accept: () => this.quickChatService.toggle()
@@ -661,13 +687,25 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
661
687
  buttons.push({
662
688
  iconClass: openSideBySideDirection === 'right' ? ThemeIcon.asClassName(Codicon.splitHorizontal) : ThemeIcon.asClassName(Codicon.splitVertical),
663
689
  tooltip: openSideBySideDirection === 'right' ?
664
- localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', { key: 'openToSide', comment: ['Open this file in a split editor on the left/right side'] }, "Open to the Side") :
665
- localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', { key: 'openToBottom', comment: ['Open this file in a split editor on the bottom'] }, "Open to the Bottom")
690
+ ( localizeWithPath(
691
+ 'vs/workbench/contrib/search/browser/anythingQuickAccess',
692
+ { key: 'openToSide', comment: ['Open this file in a split editor on the left/right side'] },
693
+ "Open to the Side"
694
+ )) :
695
+ ( localizeWithPath(
696
+ 'vs/workbench/contrib/search/browser/anythingQuickAccess',
697
+ { key: 'openToBottom', comment: ['Open this file in a split editor on the bottom'] },
698
+ "Open to the Bottom"
699
+ ))
666
700
  });
667
701
  if (isEditorHistoryEntry) {
668
702
  buttons.push({
669
703
  iconClass: isDirty ? ('dirty-anything ' + ThemeIcon.asClassName(Codicon.circleFilled)) : ThemeIcon.asClassName(Codicon.close),
670
- tooltip: localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'closeEditor', "Remove from Recently Opened"),
704
+ tooltip: ( localizeWithPath(
705
+ 'vs/workbench/contrib/search/browser/anythingQuickAccess',
706
+ 'closeEditor',
707
+ "Remove from Recently Opened"
708
+ )),
671
709
  alwaysVisible: isDirty
672
710
  });
673
711
  }
@@ -676,7 +714,12 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
676
714
  return {
677
715
  resource,
678
716
  label,
679
- ariaLabel: isDirty ? localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'filePickAriaLabelDirty', "{0} unsaved changes", labelAndDescription) : labelAndDescription,
717
+ ariaLabel: isDirty ? ( localizeWithPath(
718
+ 'vs/workbench/contrib/search/browser/anythingQuickAccess',
719
+ 'filePickAriaLabelDirty',
720
+ "{0} unsaved changes",
721
+ labelAndDescription
722
+ )) : labelAndDescription,
680
723
  description,
681
724
  get iconClasses() { return iconClassesValue.value; },
682
725
  get buttons() { return buttonsValue.value; },
@@ -26,7 +26,11 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
26
26
  this.onCancel = this._onCancel.event;
27
27
  options = {
28
28
  ...{
29
- ariaLabel: nls.localizeWithPath('vs/workbench/contrib/search/browser/patternInputWidget', 'defaultLabel', "input")
29
+ ariaLabel: ( nls.localizeWithPath(
30
+ 'vs/workbench/contrib/search/browser/patternInputWidget',
31
+ 'defaultLabel',
32
+ "input"
33
+ ))
30
34
  },
31
35
  ...options,
32
36
  };
@@ -153,7 +157,11 @@ let IncludePatternInputWidget = class IncludePatternInputWidget extends PatternI
153
157
  renderSubcontrols(controlsDiv) {
154
158
  this.useSearchInEditorsBox = this._register(( new Toggle({
155
159
  icon: Codicon.book,
156
- title: nls.localizeWithPath('vs/workbench/contrib/search/browser/patternInputWidget', 'onlySearchInOpenEditors', "Search only in Open Editors"),
160
+ title: ( nls.localizeWithPath(
161
+ 'vs/workbench/contrib/search/browser/patternInputWidget',
162
+ 'onlySearchInOpenEditors',
163
+ "Search only in Open Editors"
164
+ )),
157
165
  isChecked: false,
158
166
  ...defaultToggleStyles
159
167
  })));
@@ -196,7 +204,11 @@ let ExcludePatternInputWidget = class ExcludePatternInputWidget extends PatternI
196
204
  this.useExcludesAndIgnoreFilesBox = this._register(( new Toggle({
197
205
  icon: Codicon.exclude,
198
206
  actionClassName: 'useExcludesAndIgnoreFiles',
199
- title: nls.localizeWithPath('vs/workbench/contrib/search/browser/patternInputWidget', 'useExcludesAndIgnoreFilesDescription', "Use Exclude Settings and Ignore Files"),
207
+ title: ( nls.localizeWithPath(
208
+ 'vs/workbench/contrib/search/browser/patternInputWidget',
209
+ 'useExcludesAndIgnoreFilesDescription',
210
+ "Use Exclude Settings and Ignore Files"
211
+ )),
200
212
  isChecked: true,
201
213
  ...defaultToggleStyles
202
214
  })));
@@ -123,7 +123,11 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
123
123
  type: 'separator',
124
124
  });
125
125
  picks.push({
126
- label: localizeWithPath('vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess', 'QuickSearchSeeMoreFiles', "See More Files"),
126
+ label: ( localizeWithPath(
127
+ 'vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess',
128
+ 'QuickSearchSeeMoreFiles',
129
+ "See More Files"
130
+ )),
127
131
  iconClass: ThemeIcon.asClassName(searchDetailsIcon),
128
132
  accept: async () => {
129
133
  this.moveToSearchViewlet(this.searchModel, matches[limit]);
@@ -140,7 +144,11 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
140
144
  tooltip: description,
141
145
  buttons: [{
142
146
  iconClass: ThemeIcon.asClassName(searchOpenInFileIcon),
143
- tooltip: localizeWithPath('vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess', 'QuickSearchOpenInFile', "Open File")
147
+ tooltip: ( localizeWithPath(
148
+ 'vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess',
149
+ 'QuickSearchOpenInFile',
150
+ "Open File"
151
+ ))
144
152
  }],
145
153
  });
146
154
  const results = fileMatch.matches() ?? [];
@@ -148,7 +156,11 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
148
156
  const element = results[matchIndex];
149
157
  if (matchIndex === MAX_RESULTS_PER_FILE) {
150
158
  picks.push({
151
- label: localizeWithPath('vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess', 'QuickSearchMore', "More"),
159
+ label: ( localizeWithPath(
160
+ 'vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess',
161
+ 'QuickSearchMore',
162
+ "More"
163
+ )),
152
164
  iconClass: ThemeIcon.asClassName(searchDetailsIcon),
153
165
  accept: async () => {
154
166
  this.moveToSearchViewlet(this.searchModel, element);
@@ -84,7 +84,11 @@ ReplacePreviewModel = ( __decorate([
84
84
  ], ReplacePreviewModel));
85
85
  let ReplaceService = class ReplaceService {
86
86
  static { ReplaceService_1 = this; }
87
- static { this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource('searchReplace.source', nls.localizeWithPath('vs/workbench/contrib/search/browser/replaceService', 'searchReplace.source', "Search and Replace")); }
87
+ static { this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource('searchReplace.source', ( nls.localizeWithPath(
88
+ 'vs/workbench/contrib/search/browser/replaceService',
89
+ 'searchReplace.source',
90
+ "Search and Replace"
91
+ ))); }
88
92
  constructor(textFileService, editorService, textModelResolverService, bulkEditorService, labelService, notebookEditorModelResolverService) {
89
93
  this.textFileService = textFileService;
90
94
  this.editorService = editorService;
@@ -122,7 +126,13 @@ let ReplaceService = class ReplaceService {
122
126
  const editor = await this.editorService.openEditor({
123
127
  original: { resource: fileMatch.resource },
124
128
  modified: { resource: toReplaceResource(fileMatch.resource) },
125
- label: nls.localizeWithPath('vs/workbench/contrib/search/browser/replaceService', 'fileReplaceChanges', "{0} ↔ {1} (Replace Preview)", fileMatch.name(), fileMatch.name()),
129
+ label: ( nls.localizeWithPath(
130
+ 'vs/workbench/contrib/search/browser/replaceService',
131
+ 'fileReplaceChanges',
132
+ "{0} ↔ {1} (Replace Preview)",
133
+ fileMatch.name(),
134
+ fileMatch.name()
135
+ )),
126
136
  description: this.labelService.getUriLabel(dirname(fileMatch.resource), { relative: true }),
127
137
  options: {
128
138
  preserveFocus,