@codingame/monaco-vscode-search-service-override 4.5.1 → 4.5.2
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.
- package/package.json +2 -2
- package/vscode/src/vs/workbench/contrib/search/browser/anythingQuickAccess.js +82 -120
- package/vscode/src/vs/workbench/contrib/search/browser/patternInputWidget.js +29 -40
- package/vscode/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.js +21 -44
- package/vscode/src/vs/workbench/contrib/search/browser/replaceService.js +34 -35
- package/vscode/src/vs/workbench/contrib/search/browser/search.contribution.js +132 -217
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsCopy.js +8 -19
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsNav.js +46 -131
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.js +24 -42
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsSymbol.js +4 -15
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsTextQuickAccess.js +2 -5
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsTopBar.js +52 -61
- package/vscode/src/vs/workbench/contrib/search/browser/searchFindInput.js +6 -13
- package/vscode/src/vs/workbench/contrib/search/browser/searchIcons.js +22 -97
- package/vscode/src/vs/workbench/contrib/search/browser/searchMessage.js +5 -9
- package/vscode/src/vs/workbench/contrib/search/browser/searchResultsView.js +53 -104
- package/vscode/src/vs/workbench/contrib/search/browser/searchView.js +168 -282
- package/vscode/src/vs/workbench/contrib/search/browser/searchWidget.js +52 -81
- package/vscode/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.js +14 -25
- package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.js +38 -120
- package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditor.js +50 -79
- package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.js +1 -1
- package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.js +30 -40
- package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.js +21 -42
- package/vscode/src/vs/workbench/services/search/browser/searchService.js +29 -36
- package/vscode/src/vs/workbench/services/search/common/searchService.js +3 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-search-service-override",
|
|
3
|
-
"version": "4.5.
|
|
3
|
+
"version": "4.5.2",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -29,6 +29,6 @@
|
|
|
29
29
|
}
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"vscode": "npm:@codingame/monaco-vscode-api@4.5.
|
|
32
|
+
"vscode": "npm:@codingame/monaco-vscode-api@4.5.2"
|
|
33
33
|
}
|
|
34
34
|
}
|
|
@@ -52,6 +52,7 @@ import { IQuickChatService } from 'vscode/vscode/vs/workbench/contrib/chat/brows
|
|
|
52
52
|
import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
|
|
53
53
|
|
|
54
54
|
var AnythingQuickAccessProvider_1;
|
|
55
|
+
const _moduleId = "vs/workbench/contrib/search/browser/anythingQuickAccess";
|
|
55
56
|
function isEditorSymbolQuickPickItem(pick) {
|
|
56
57
|
const candidate = pick;
|
|
57
58
|
return !!candidate?.range && !!candidate.resource;
|
|
@@ -60,11 +61,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
60
61
|
static { AnythingQuickAccessProvider_1 = this; }
|
|
61
62
|
static { this.PREFIX = ''; }
|
|
62
63
|
static { this.NO_RESULTS_PICK = {
|
|
63
|
-
label: ( localizeWithPath(
|
|
64
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
65
|
-
'noAnythingResults',
|
|
66
|
-
"No matching results"
|
|
67
|
-
))
|
|
64
|
+
label: ( localizeWithPath(_moduleId, 0, "No matching results"))
|
|
68
65
|
}; }
|
|
69
66
|
static { this.MAX_RESULTS = 512; }
|
|
70
67
|
static { this.TYPING_SEARCH_DELAY = 200; }
|
|
@@ -135,10 +132,10 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
135
132
|
this.editorViewState.reset();
|
|
136
133
|
}
|
|
137
134
|
})(this, this.instantiationService));
|
|
138
|
-
this.labelOnlyEditorHistoryPickAccessor = ( new QuickPickItemScorerAccessor({ skipDescription: true }));
|
|
139
|
-
this.fileQueryDelayer = this._register(( new ThrottledDelayer(AnythingQuickAccessProvider_1.TYPING_SEARCH_DELAY)));
|
|
135
|
+
this.labelOnlyEditorHistoryPickAccessor = ( (new QuickPickItemScorerAccessor({ skipDescription: true })));
|
|
136
|
+
this.fileQueryDelayer = this._register(( (new ThrottledDelayer(AnythingQuickAccessProvider_1.TYPING_SEARCH_DELAY))));
|
|
140
137
|
this.fileQueryBuilder = this.instantiationService.createInstance(QueryBuilder);
|
|
141
|
-
this.lazyRegistry = ( new Lazy(() => ( Registry.as(Extensions.Quickaccess))));
|
|
138
|
+
this.lazyRegistry = ( (new Lazy(() => ( (Registry.as(Extensions.Quickaccess))))));
|
|
142
139
|
this.workspaceSymbolsQuickAccess = this._register(this.instantiationService.createInstance(SymbolsQuickAccessProvider));
|
|
143
140
|
this.editorSymbolsQuickAccess = this.instantiationService.createInstance(GotoSymbolQuickAccessProvider);
|
|
144
141
|
}
|
|
@@ -156,9 +153,9 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
156
153
|
};
|
|
157
154
|
}
|
|
158
155
|
provide(picker, token, runOptions) {
|
|
159
|
-
const disposables = ( new DisposableStore());
|
|
156
|
+
const disposables = ( (new DisposableStore()));
|
|
160
157
|
this.pickState.set(picker);
|
|
161
|
-
const editorDecorationsDisposable = disposables.add(( new MutableDisposable()));
|
|
158
|
+
const editorDecorationsDisposable = disposables.add(( (new MutableDisposable())));
|
|
162
159
|
disposables.add(picker.onDidChangeActive(() => {
|
|
163
160
|
editorDecorationsDisposable.value = undefined;
|
|
164
161
|
const [item] = picker.activeItems;
|
|
@@ -234,17 +231,13 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
234
231
|
return this.pickState.lastGlobalPicks;
|
|
235
232
|
}
|
|
236
233
|
const historyEditorPicks = this.getEditorHistoryPicks(query);
|
|
237
|
-
let picks = ( new Array());
|
|
234
|
+
let picks = ( (new Array()));
|
|
238
235
|
if (options.additionPicks) {
|
|
239
236
|
picks.push(...options.additionPicks);
|
|
240
237
|
}
|
|
241
238
|
if (this.pickState.isQuickNavigating) {
|
|
242
239
|
if (picks.length > 0) {
|
|
243
|
-
picks.push({ type: 'separator', label: ( localizeWithPath(
|
|
244
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
245
|
-
'recentlyOpenedSeparator',
|
|
246
|
-
"recently opened"
|
|
247
|
-
)) });
|
|
240
|
+
picks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 1, "recently opened")) });
|
|
248
241
|
}
|
|
249
242
|
picks = historyEditorPicks;
|
|
250
243
|
}
|
|
@@ -253,18 +246,14 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
253
246
|
picks.push(...this.getHelpPicks(query, token, options));
|
|
254
247
|
}
|
|
255
248
|
if (historyEditorPicks.length !== 0) {
|
|
256
|
-
picks.push({ type: 'separator', label: ( localizeWithPath(
|
|
257
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
258
|
-
'recentlyOpenedSeparator',
|
|
259
|
-
"recently opened"
|
|
260
|
-
)) });
|
|
249
|
+
picks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 1, "recently opened")) });
|
|
261
250
|
picks.push(...historyEditorPicks);
|
|
262
251
|
}
|
|
263
252
|
}
|
|
264
253
|
return {
|
|
265
254
|
picks,
|
|
266
255
|
additionalPicks: (async () => {
|
|
267
|
-
const additionalPicksExcludes = ( new ResourceMap());
|
|
256
|
+
const additionalPicksExcludes = ( (new ResourceMap()));
|
|
268
257
|
for (const historyEditorPick of historyEditorPicks) {
|
|
269
258
|
if (historyEditorPick.resource) {
|
|
270
259
|
additionalPicksExcludes.set(historyEditorPick.resource, true);
|
|
@@ -275,15 +264,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
275
264
|
return [];
|
|
276
265
|
}
|
|
277
266
|
return additionalPicks.length > 0 ? [
|
|
278
|
-
{ type: 'separator', label: this.configuration.includeSymbols ? ( localizeWithPath(
|
|
279
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
280
|
-
'fileAndSymbolResultsSeparator',
|
|
281
|
-
"file and symbol results"
|
|
282
|
-
)) : ( localizeWithPath(
|
|
283
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
284
|
-
'fileResultsSeparator',
|
|
285
|
-
"file results"
|
|
286
|
-
)) },
|
|
267
|
+
{ type: 'separator', label: this.configuration.includeSymbols ? ( localizeWithPath(_moduleId, 2, "file and symbol results")) : ( localizeWithPath(_moduleId, 3, "file results")) },
|
|
287
268
|
...additionalPicks
|
|
288
269
|
] : [];
|
|
289
270
|
})(),
|
|
@@ -321,7 +302,9 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
321
302
|
getEditorHistoryPicks(query) {
|
|
322
303
|
const configuration = this.configuration;
|
|
323
304
|
if (!query.normalized) {
|
|
324
|
-
return (
|
|
305
|
+
return (
|
|
306
|
+
(this.historyService.getHistory().map(editor => this.createAnythingPick(editor, configuration)))
|
|
307
|
+
);
|
|
325
308
|
}
|
|
326
309
|
if (!this.configuration.includeHistory) {
|
|
327
310
|
return [];
|
|
@@ -350,12 +333,12 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
350
333
|
return editorHistoryPicks.sort((editorA, editorB) => compareItemsByFuzzyScore(editorA, editorB, query, false, editorHistoryScorerAccessor, this.pickState.scorerCache));
|
|
351
334
|
}
|
|
352
335
|
createFileQueryCache() {
|
|
353
|
-
return ( new FileQueryCacheState(
|
|
336
|
+
return ( (new FileQueryCacheState(
|
|
354
337
|
cacheKey => this.fileQueryBuilder.file(this.contextService.getWorkspace().folders, this.getFileQueryOptions({ cacheKey })),
|
|
355
338
|
query => this.searchService.fileSearch(query),
|
|
356
339
|
cacheKey => this.searchService.clearCache(cacheKey),
|
|
357
340
|
this.pickState.fileQueryCache
|
|
358
|
-
)).load();
|
|
341
|
+
))).load();
|
|
359
342
|
}
|
|
360
343
|
async getFilePicks(query, excludes, token) {
|
|
361
344
|
if (!query.normalized) {
|
|
@@ -367,7 +350,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
367
350
|
}
|
|
368
351
|
let fileMatches;
|
|
369
352
|
if (absolutePathResult) {
|
|
370
|
-
if (( excludes.has(absolutePathResult))) {
|
|
353
|
+
if (( (excludes.has(absolutePathResult)))) {
|
|
371
354
|
return [];
|
|
372
355
|
}
|
|
373
356
|
const absolutePathPick = this.createAnythingPick(absolutePathResult, this.configuration);
|
|
@@ -392,9 +375,11 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
392
375
|
return [];
|
|
393
376
|
}
|
|
394
377
|
const configuration = this.configuration;
|
|
395
|
-
return (
|
|
396
|
-
|
|
397
|
-
|
|
378
|
+
return (
|
|
379
|
+
(fileMatches
|
|
380
|
+
.filter(resource => !( (excludes.has(resource))))
|
|
381
|
+
.map(resource => this.createAnythingPick(resource, configuration)))
|
|
382
|
+
);
|
|
398
383
|
}
|
|
399
384
|
async doFileSearch(query, token) {
|
|
400
385
|
const [fileSearchResults, relativePathFileResults] = await Promise.all([
|
|
@@ -407,12 +392,12 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
407
392
|
if (!relativePathFileResults) {
|
|
408
393
|
return fileSearchResults;
|
|
409
394
|
}
|
|
410
|
-
const relativePathFileResultsMap = ( new ResourceMap());
|
|
395
|
+
const relativePathFileResultsMap = ( (new ResourceMap()));
|
|
411
396
|
for (const relativePathFileResult of relativePathFileResults) {
|
|
412
397
|
relativePathFileResultsMap.set(relativePathFileResult, true);
|
|
413
398
|
}
|
|
414
399
|
return [
|
|
415
|
-
...fileSearchResults.filter(result => !( relativePathFileResultsMap.has(result))),
|
|
400
|
+
...fileSearchResults.filter(result => !( (relativePathFileResultsMap.has(result)))),
|
|
416
401
|
...relativePathFileResults
|
|
417
402
|
];
|
|
418
403
|
}
|
|
@@ -433,17 +418,19 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
433
418
|
if (token.isCancellationRequested) {
|
|
434
419
|
return [];
|
|
435
420
|
}
|
|
436
|
-
const existingFileSearchResultsMap = ( new ResourceMap());
|
|
421
|
+
const existingFileSearchResultsMap = ( (new ResourceMap()));
|
|
437
422
|
for (const fileSearchResult of fileSearchResults.results) {
|
|
438
423
|
existingFileSearchResultsMap.set(fileSearchResult.resource, true);
|
|
439
424
|
}
|
|
440
425
|
for (const additionalFileSearchResult of additionalFileSearchResults.results) {
|
|
441
|
-
if (!( existingFileSearchResultsMap.has(additionalFileSearchResult.resource))) {
|
|
426
|
+
if (!( (existingFileSearchResultsMap.has(additionalFileSearchResult.resource)))) {
|
|
442
427
|
fileSearchResults.results.push(additionalFileSearchResult);
|
|
443
428
|
}
|
|
444
429
|
}
|
|
445
430
|
}
|
|
446
|
-
return (
|
|
431
|
+
return (
|
|
432
|
+
(fileSearchResults.results.map(result => result.resource))
|
|
433
|
+
);
|
|
447
434
|
}
|
|
448
435
|
doGetFileSearchResults(filePattern, token) {
|
|
449
436
|
const start = Date.now();
|
|
@@ -522,8 +509,8 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
522
509
|
return [];
|
|
523
510
|
}
|
|
524
511
|
const providers = this.lazyRegistry.value.getQuickAccessProviders()
|
|
525
|
-
.filter(p => ( p.helpEntries.some(h => h.commandCenterOrder !== undefined)))
|
|
526
|
-
.flatMap(provider => ( provider.helpEntries
|
|
512
|
+
.filter(p => ( (p.helpEntries.some(h => h.commandCenterOrder !== undefined))))
|
|
513
|
+
.flatMap(provider => ( (provider.helpEntries
|
|
527
514
|
.filter(h => h.commandCenterOrder !== undefined)
|
|
528
515
|
.map(helpEntry => {
|
|
529
516
|
const providerSpecificOptions = {
|
|
@@ -536,13 +523,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
536
523
|
description: helpEntry.prefix ?? provider.prefix,
|
|
537
524
|
commandCenterOrder: helpEntry.commandCenterOrder,
|
|
538
525
|
keybinding: helpEntry.commandId ? this.keybindingService.lookupKeybinding(helpEntry.commandId) : undefined,
|
|
539
|
-
ariaLabel: ( localizeWithPath(
|
|
540
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
541
|
-
'helpPickAriaLabel',
|
|
542
|
-
"{0}, {1}",
|
|
543
|
-
label,
|
|
544
|
-
helpEntry.description
|
|
545
|
-
)),
|
|
526
|
+
ariaLabel: ( localizeWithPath(_moduleId, 4, "{0}, {1}", label, helpEntry.description)),
|
|
546
527
|
accept: () => {
|
|
547
528
|
this.quickInputService.quickAccess.show(provider.prefix, {
|
|
548
529
|
preserveValue: true,
|
|
@@ -550,14 +531,10 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
550
531
|
});
|
|
551
532
|
}
|
|
552
533
|
};
|
|
553
|
-
})));
|
|
534
|
+
}))));
|
|
554
535
|
if (this.quickChatService.enabled) {
|
|
555
536
|
providers.push({
|
|
556
|
-
label: ( localizeWithPath(
|
|
557
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
558
|
-
'chat',
|
|
559
|
-
"Open Quick Chat"
|
|
560
|
-
)),
|
|
537
|
+
label: ( localizeWithPath(_moduleId, 5, "Open Quick Chat")),
|
|
561
538
|
commandCenterOrder: 30,
|
|
562
539
|
keybinding: this.keybindingService.lookupKeybinding(ASK_QUICK_QUESTION_ACTION_ID),
|
|
563
540
|
accept: () => this.quickChatService.toggle()
|
|
@@ -631,21 +608,23 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
631
608
|
if (token.isCancellationRequested) {
|
|
632
609
|
return [];
|
|
633
610
|
}
|
|
634
|
-
return (
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
611
|
+
return (
|
|
612
|
+
(editorSymbolPicks.map(editorSymbolPick => {
|
|
613
|
+
if (editorSymbolPick.type === 'separator') {
|
|
614
|
+
return editorSymbolPick;
|
|
615
|
+
}
|
|
616
|
+
return {
|
|
617
|
+
...editorSymbolPick,
|
|
618
|
+
resource: activeGlobalResource,
|
|
619
|
+
description: editorSymbolPick.description,
|
|
620
|
+
trigger: (buttonIndex, keyMods) => {
|
|
621
|
+
this.openAnything(activeGlobalResource, { keyMods, range: editorSymbolPick.range?.selection, forceOpenSideBySide: true });
|
|
622
|
+
return TriggerAction.CLOSE_PICKER;
|
|
623
|
+
},
|
|
624
|
+
accept: (keyMods, event) => this.openAnything(activeGlobalResource, { keyMods, range: editorSymbolPick.range?.selection, preserveFocus: event.inBackground, forcePinned: event.inBackground })
|
|
625
|
+
};
|
|
626
|
+
}))
|
|
627
|
+
);
|
|
649
628
|
}
|
|
650
629
|
addDecorations(editor, range) {
|
|
651
630
|
this.editorSymbolsQuickAccess.addDecorations(editor, range);
|
|
@@ -677,48 +656,31 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
677
656
|
extraClasses = [];
|
|
678
657
|
}
|
|
679
658
|
const labelAndDescription = description ? `${label} ${description}` : label;
|
|
680
|
-
const iconClassesValue = ( new Lazy(
|
|
659
|
+
const iconClassesValue = ( (new Lazy(
|
|
681
660
|
() => getIconClasses(this.modelService, this.languageService, resource, undefined, icon).concat(extraClasses)
|
|
682
|
-
));
|
|
683
|
-
const buttonsValue = ( new Lazy(() => {
|
|
661
|
+
)));
|
|
662
|
+
const buttonsValue = ( (new Lazy(() => {
|
|
684
663
|
const openSideBySideDirection = configuration.openSideBySideDirection;
|
|
685
664
|
const buttons = [];
|
|
686
665
|
buttons.push({
|
|
687
666
|
iconClass: openSideBySideDirection === 'right' ? ThemeIcon.asClassName(Codicon.splitHorizontal) : ThemeIcon.asClassName(Codicon.splitVertical),
|
|
688
667
|
tooltip: openSideBySideDirection === 'right' ?
|
|
689
|
-
( localizeWithPath(
|
|
690
|
-
|
|
691
|
-
{ key: 'openToSide', comment: ['Open this file in a split editor on the left/right side'] },
|
|
692
|
-
"Open to the Side"
|
|
693
|
-
)) :
|
|
694
|
-
( localizeWithPath(
|
|
695
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
696
|
-
{ key: 'openToBottom', comment: ['Open this file in a split editor on the bottom'] },
|
|
697
|
-
"Open to the Bottom"
|
|
698
|
-
))
|
|
668
|
+
( localizeWithPath(_moduleId, 6, "Open to the Side")) :
|
|
669
|
+
( localizeWithPath(_moduleId, 7, "Open to the Bottom"))
|
|
699
670
|
});
|
|
700
671
|
if (isEditorHistoryEntry) {
|
|
701
672
|
buttons.push({
|
|
702
673
|
iconClass: isDirty ? ('dirty-anything ' + ThemeIcon.asClassName(Codicon.circleFilled)) : ThemeIcon.asClassName(Codicon.close),
|
|
703
|
-
tooltip: ( localizeWithPath(
|
|
704
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
705
|
-
'closeEditor',
|
|
706
|
-
"Remove from Recently Opened"
|
|
707
|
-
)),
|
|
674
|
+
tooltip: ( localizeWithPath(_moduleId, 8, "Remove from Recently Opened")),
|
|
708
675
|
alwaysVisible: isDirty
|
|
709
676
|
});
|
|
710
677
|
}
|
|
711
678
|
return buttons;
|
|
712
|
-
}));
|
|
679
|
+
})));
|
|
713
680
|
return {
|
|
714
681
|
resource,
|
|
715
682
|
label,
|
|
716
|
-
ariaLabel: isDirty ? ( localizeWithPath(
|
|
717
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
718
|
-
'filePickAriaLabelDirty',
|
|
719
|
-
"{0} unsaved changes",
|
|
720
|
-
labelAndDescription
|
|
721
|
-
)) : labelAndDescription,
|
|
683
|
+
ariaLabel: isDirty ? ( localizeWithPath(_moduleId, 9, "{0} unsaved changes", labelAndDescription)) : labelAndDescription,
|
|
722
684
|
description,
|
|
723
685
|
get iconClasses() { return iconClassesValue.value; },
|
|
724
686
|
get buttons() { return buttonsValue.value; },
|
|
@@ -772,27 +734,27 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
772
734
|
}
|
|
773
735
|
}
|
|
774
736
|
};
|
|
775
|
-
AnythingQuickAccessProvider = AnythingQuickAccessProvider_1 = ( __decorate([
|
|
776
|
-
( __param(0, IInstantiationService)),
|
|
777
|
-
( __param(1, ISearchService)),
|
|
778
|
-
( __param(2, IWorkspaceContextService)),
|
|
779
|
-
( __param(3, IPathService)),
|
|
780
|
-
( __param(4, IWorkbenchEnvironmentService)),
|
|
781
|
-
( __param(5, IFileService)),
|
|
782
|
-
( __param(6, ILabelService)),
|
|
783
|
-
( __param(7, IModelService)),
|
|
784
|
-
( __param(8, ILanguageService)),
|
|
785
|
-
( __param(9, IWorkingCopyService)),
|
|
786
|
-
( __param(10, IConfigurationService)),
|
|
787
|
-
( __param(11, IEditorService)),
|
|
788
|
-
( __param(12, IHistoryService)),
|
|
789
|
-
( __param(13, IFilesConfigurationService)),
|
|
790
|
-
( __param(14, ITextModelService)),
|
|
791
|
-
( __param(15, IUriIdentityService)),
|
|
792
|
-
( __param(16, IQuickInputService)),
|
|
793
|
-
( __param(17, IKeybindingService)),
|
|
794
|
-
( __param(18, IQuickChatService)),
|
|
795
|
-
( __param(19, ILogService))
|
|
796
|
-
], AnythingQuickAccessProvider));
|
|
737
|
+
AnythingQuickAccessProvider = AnythingQuickAccessProvider_1 = ( (__decorate([
|
|
738
|
+
( (__param(0, IInstantiationService))),
|
|
739
|
+
( (__param(1, ISearchService))),
|
|
740
|
+
( (__param(2, IWorkspaceContextService))),
|
|
741
|
+
( (__param(3, IPathService))),
|
|
742
|
+
( (__param(4, IWorkbenchEnvironmentService))),
|
|
743
|
+
( (__param(5, IFileService))),
|
|
744
|
+
( (__param(6, ILabelService))),
|
|
745
|
+
( (__param(7, IModelService))),
|
|
746
|
+
( (__param(8, ILanguageService))),
|
|
747
|
+
( (__param(9, IWorkingCopyService))),
|
|
748
|
+
( (__param(10, IConfigurationService))),
|
|
749
|
+
( (__param(11, IEditorService))),
|
|
750
|
+
( (__param(12, IHistoryService))),
|
|
751
|
+
( (__param(13, IFilesConfigurationService))),
|
|
752
|
+
( (__param(14, ITextModelService))),
|
|
753
|
+
( (__param(15, IUriIdentityService))),
|
|
754
|
+
( (__param(16, IQuickInputService))),
|
|
755
|
+
( (__param(17, IKeybindingService))),
|
|
756
|
+
( (__param(18, IQuickChatService))),
|
|
757
|
+
( (__param(19, ILogService)))
|
|
758
|
+
], AnythingQuickAccessProvider)));
|
|
797
759
|
|
|
798
760
|
export { AnythingQuickAccessProvider };
|
|
@@ -13,6 +13,7 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
|
|
|
13
13
|
import { defaultToggleStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
|
|
14
14
|
import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
|
|
15
15
|
|
|
16
|
+
const _moduleId = "vs/workbench/contrib/search/browser/patternInputWidget";
|
|
16
17
|
let PatternInputWidget = class PatternInputWidget extends Widget {
|
|
17
18
|
static { this.OPTION_CHANGE = 'optionChange'; }
|
|
18
19
|
constructor(parent, contextViewProvider, options, contextKeyService, configurationService, keybindingService) {
|
|
@@ -21,17 +22,13 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
|
|
|
21
22
|
this.contextKeyService = contextKeyService;
|
|
22
23
|
this.configurationService = configurationService;
|
|
23
24
|
this.keybindingService = keybindingService;
|
|
24
|
-
this._onSubmit = this._register(( new Emitter()));
|
|
25
|
+
this._onSubmit = this._register(( (new Emitter())));
|
|
25
26
|
this.onSubmit = this._onSubmit.event;
|
|
26
|
-
this._onCancel = this._register(( new Emitter()));
|
|
27
|
+
this._onCancel = this._register(( (new Emitter())));
|
|
27
28
|
this.onCancel = this._onCancel.event;
|
|
28
29
|
options = {
|
|
29
30
|
...{
|
|
30
|
-
ariaLabel: ( localizeWithPath(
|
|
31
|
-
'vs/workbench/contrib/search/browser/patternInputWidget',
|
|
32
|
-
'defaultLabel',
|
|
33
|
-
"input"
|
|
34
|
-
))
|
|
31
|
+
ariaLabel: ( localizeWithPath(_moduleId, 0, "input"))
|
|
35
32
|
},
|
|
36
33
|
...options,
|
|
37
34
|
};
|
|
@@ -95,7 +92,7 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
|
|
|
95
92
|
render(options) {
|
|
96
93
|
this.domNode = document.createElement('div');
|
|
97
94
|
this.domNode.classList.add('monaco-findInput');
|
|
98
|
-
this.inputBox = ( new ContextScopedHistoryInputBox(this.domNode, this.contextViewProvider, {
|
|
95
|
+
this.inputBox = ( (new ContextScopedHistoryInputBox(this.domNode, this.contextViewProvider, {
|
|
99
96
|
placeholder: options.placeholder,
|
|
100
97
|
showPlaceholderOnFocus: options.showPlaceholderOnFocus,
|
|
101
98
|
tooltip: options.tooltip,
|
|
@@ -106,7 +103,7 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
|
|
|
106
103
|
history: options.history || [],
|
|
107
104
|
showHistoryHint: () => showHistoryKeybindingHint(this.keybindingService),
|
|
108
105
|
inputBoxStyles: options.inputBoxStyles
|
|
109
|
-
}, this.contextKeyService));
|
|
106
|
+
}, this.contextKeyService)));
|
|
110
107
|
this._register(this.inputBox.onDidChange(() => this._onSubmit.fire(true)));
|
|
111
108
|
this.inputFocusTracker = trackFocus(this.inputBox.inputElement);
|
|
112
109
|
this.onkeyup(this.inputBox.inputElement, (keyboardEvent) => this.onInputKeyUp(keyboardEvent));
|
|
@@ -130,15 +127,15 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
|
|
|
130
127
|
}
|
|
131
128
|
}
|
|
132
129
|
};
|
|
133
|
-
PatternInputWidget = ( __decorate([
|
|
134
|
-
( __param(3, IContextKeyService)),
|
|
135
|
-
( __param(4, IConfigurationService)),
|
|
136
|
-
( __param(5, IKeybindingService))
|
|
137
|
-
], PatternInputWidget));
|
|
130
|
+
PatternInputWidget = ( (__decorate([
|
|
131
|
+
( (__param(3, IContextKeyService))),
|
|
132
|
+
( (__param(4, IConfigurationService))),
|
|
133
|
+
( (__param(5, IKeybindingService)))
|
|
134
|
+
], PatternInputWidget)));
|
|
138
135
|
let IncludePatternInputWidget = class IncludePatternInputWidget extends PatternInputWidget {
|
|
139
136
|
constructor(parent, contextViewProvider, options, contextKeyService, configurationService, keybindingService) {
|
|
140
137
|
super(parent, contextViewProvider, options, contextKeyService, configurationService, keybindingService);
|
|
141
|
-
this._onChangeSearchInEditorsBoxEmitter = this._register(( new Emitter()));
|
|
138
|
+
this._onChangeSearchInEditorsBoxEmitter = this._register(( (new Emitter())));
|
|
142
139
|
this.onChangeSearchInEditorsBox = this._onChangeSearchInEditorsBoxEmitter.event;
|
|
143
140
|
}
|
|
144
141
|
dispose() {
|
|
@@ -156,17 +153,13 @@ let IncludePatternInputWidget = class IncludePatternInputWidget extends PatternI
|
|
|
156
153
|
return super.getSubcontrolsWidth() + this.useSearchInEditorsBox.width();
|
|
157
154
|
}
|
|
158
155
|
renderSubcontrols(controlsDiv) {
|
|
159
|
-
this.useSearchInEditorsBox = this._register(( new Toggle({
|
|
156
|
+
this.useSearchInEditorsBox = this._register(( (new Toggle({
|
|
160
157
|
icon: Codicon.book,
|
|
161
|
-
title: ( localizeWithPath(
|
|
162
|
-
'vs/workbench/contrib/search/browser/patternInputWidget',
|
|
163
|
-
'onlySearchInOpenEditors',
|
|
164
|
-
"Search only in Open Editors"
|
|
165
|
-
)),
|
|
158
|
+
title: ( localizeWithPath(_moduleId, 1, "Search only in Open Editors")),
|
|
166
159
|
isChecked: false,
|
|
167
160
|
hoverDelegate: getDefaultHoverDelegate('element'),
|
|
168
161
|
...defaultToggleStyles
|
|
169
|
-
})));
|
|
162
|
+
}))));
|
|
170
163
|
this._register(this.useSearchInEditorsBox.onChange(viaKeyboard => {
|
|
171
164
|
this._onChangeSearchInEditorsBoxEmitter.fire();
|
|
172
165
|
if (!viaKeyboard) {
|
|
@@ -177,15 +170,15 @@ let IncludePatternInputWidget = class IncludePatternInputWidget extends PatternI
|
|
|
177
170
|
super.renderSubcontrols(controlsDiv);
|
|
178
171
|
}
|
|
179
172
|
};
|
|
180
|
-
IncludePatternInputWidget = ( __decorate([
|
|
181
|
-
( __param(3, IContextKeyService)),
|
|
182
|
-
( __param(4, IConfigurationService)),
|
|
183
|
-
( __param(5, IKeybindingService))
|
|
184
|
-
], IncludePatternInputWidget));
|
|
173
|
+
IncludePatternInputWidget = ( (__decorate([
|
|
174
|
+
( (__param(3, IContextKeyService))),
|
|
175
|
+
( (__param(4, IConfigurationService))),
|
|
176
|
+
( (__param(5, IKeybindingService)))
|
|
177
|
+
], IncludePatternInputWidget)));
|
|
185
178
|
let ExcludePatternInputWidget = class ExcludePatternInputWidget extends PatternInputWidget {
|
|
186
179
|
constructor(parent, contextViewProvider, options, contextKeyService, configurationService, keybindingService) {
|
|
187
180
|
super(parent, contextViewProvider, options, contextKeyService, configurationService, keybindingService);
|
|
188
|
-
this._onChangeIgnoreBoxEmitter = this._register(( new Emitter()));
|
|
181
|
+
this._onChangeIgnoreBoxEmitter = this._register(( (new Emitter())));
|
|
189
182
|
this.onChangeIgnoreBox = this._onChangeIgnoreBoxEmitter.event;
|
|
190
183
|
}
|
|
191
184
|
dispose() {
|
|
@@ -203,18 +196,14 @@ let ExcludePatternInputWidget = class ExcludePatternInputWidget extends PatternI
|
|
|
203
196
|
return super.getSubcontrolsWidth() + this.useExcludesAndIgnoreFilesBox.width();
|
|
204
197
|
}
|
|
205
198
|
renderSubcontrols(controlsDiv) {
|
|
206
|
-
this.useExcludesAndIgnoreFilesBox = this._register(( new Toggle({
|
|
199
|
+
this.useExcludesAndIgnoreFilesBox = this._register(( (new Toggle({
|
|
207
200
|
icon: Codicon.exclude,
|
|
208
201
|
actionClassName: 'useExcludesAndIgnoreFiles',
|
|
209
|
-
title: ( localizeWithPath(
|
|
210
|
-
'vs/workbench/contrib/search/browser/patternInputWidget',
|
|
211
|
-
'useExcludesAndIgnoreFilesDescription',
|
|
212
|
-
"Use Exclude Settings and Ignore Files"
|
|
213
|
-
)),
|
|
202
|
+
title: ( localizeWithPath(_moduleId, 2, "Use Exclude Settings and Ignore Files")),
|
|
214
203
|
isChecked: true,
|
|
215
204
|
hoverDelegate: getDefaultHoverDelegate('element'),
|
|
216
205
|
...defaultToggleStyles
|
|
217
|
-
})));
|
|
206
|
+
}))));
|
|
218
207
|
this._register(this.useExcludesAndIgnoreFilesBox.onChange(viaKeyboard => {
|
|
219
208
|
this._onChangeIgnoreBoxEmitter.fire();
|
|
220
209
|
if (!viaKeyboard) {
|
|
@@ -225,10 +214,10 @@ let ExcludePatternInputWidget = class ExcludePatternInputWidget extends PatternI
|
|
|
225
214
|
super.renderSubcontrols(controlsDiv);
|
|
226
215
|
}
|
|
227
216
|
};
|
|
228
|
-
ExcludePatternInputWidget = ( __decorate([
|
|
229
|
-
( __param(3, IContextKeyService)),
|
|
230
|
-
( __param(4, IConfigurationService)),
|
|
231
|
-
( __param(5, IKeybindingService))
|
|
232
|
-
], ExcludePatternInputWidget));
|
|
217
|
+
ExcludePatternInputWidget = ( (__decorate([
|
|
218
|
+
( (__param(3, IContextKeyService))),
|
|
219
|
+
( (__param(4, IConfigurationService))),
|
|
220
|
+
( (__param(5, IKeybindingService)))
|
|
221
|
+
], ExcludePatternInputWidget)));
|
|
233
222
|
|
|
234
223
|
export { ExcludePatternInputWidget, IncludePatternInputWidget, PatternInputWidget };
|