@codingame/monaco-vscode-search-service-override 4.5.1 → 5.0.0
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 +89 -123
- package/vscode/src/vs/workbench/contrib/search/browser/media/anythingQuickAccess.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/search/browser/patternInputWidget.js +29 -40
- package/vscode/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.js +37 -49
- package/vscode/src/vs/workbench/contrib/search/browser/replaceService.js +34 -35
- package/vscode/src/vs/workbench/contrib/search/browser/search.contribution.js +163 -239
- 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 +3 -6
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsTopBar.js +52 -61
- package/vscode/src/vs/workbench/contrib/search/browser/searchFindInput.js +42 -36
- 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 +59 -108
- package/vscode/src/vs/workbench/contrib/search/browser/searchView.js +176 -291
- package/vscode/src/vs/workbench/contrib/search/browser/searchWidget.js +53 -82
- 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 +54 -81
- 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": "
|
|
3
|
+
"version": "5.0.0",
|
|
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@
|
|
32
|
+
"vscode": "npm:@codingame/monaco-vscode-api@5.0.0"
|
|
33
33
|
}
|
|
34
34
|
}
|
|
@@ -50,8 +50,10 @@ import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
|
|
|
50
50
|
import { ASK_QUICK_QUESTION_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
|
|
51
51
|
import { IQuickChatService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
|
|
52
52
|
import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
|
|
53
|
+
import { ICustomEditorLabelService } from 'vscode/vscode/vs/workbench/services/editor/common/customEditorLabelService.service';
|
|
53
54
|
|
|
54
55
|
var AnythingQuickAccessProvider_1;
|
|
56
|
+
const _moduleId = "vs/workbench/contrib/search/browser/anythingQuickAccess";
|
|
55
57
|
function isEditorSymbolQuickPickItem(pick) {
|
|
56
58
|
const candidate = pick;
|
|
57
59
|
return !!candidate?.range && !!candidate.resource;
|
|
@@ -60,11 +62,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
60
62
|
static { AnythingQuickAccessProvider_1 = this; }
|
|
61
63
|
static { this.PREFIX = ''; }
|
|
62
64
|
static { this.NO_RESULTS_PICK = {
|
|
63
|
-
label: ( localizeWithPath(
|
|
64
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
65
|
-
'noAnythingResults',
|
|
66
|
-
"No matching results"
|
|
67
|
-
))
|
|
65
|
+
label: ( localizeWithPath(_moduleId, 0, "No matching results"))
|
|
68
66
|
}; }
|
|
69
67
|
static { this.MAX_RESULTS = 512; }
|
|
70
68
|
static { this.TYPING_SEARCH_DELAY = 200; }
|
|
@@ -75,7 +73,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
75
73
|
}
|
|
76
74
|
return undefined;
|
|
77
75
|
}
|
|
78
|
-
constructor(instantiationService, searchService, contextService, pathService, environmentService, fileService, labelService, modelService, languageService, workingCopyService, configurationService, editorService, historyService, filesConfigurationService, textModelService, uriIdentityService, quickInputService, keybindingService, quickChatService, logService) {
|
|
76
|
+
constructor(instantiationService, searchService, contextService, pathService, environmentService, fileService, labelService, modelService, languageService, workingCopyService, configurationService, editorService, historyService, filesConfigurationService, textModelService, uriIdentityService, quickInputService, keybindingService, quickChatService, logService, customEditorLabelService) {
|
|
79
77
|
super(AnythingQuickAccessProvider_1.PREFIX, {
|
|
80
78
|
canAcceptInBackground: true,
|
|
81
79
|
noResultsPick: AnythingQuickAccessProvider_1.NO_RESULTS_PICK
|
|
@@ -100,6 +98,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
100
98
|
this.keybindingService = keybindingService;
|
|
101
99
|
this.quickChatService = quickChatService;
|
|
102
100
|
this.logService = logService;
|
|
101
|
+
this.customEditorLabelService = customEditorLabelService;
|
|
103
102
|
this.pickState = this._register(new (class extends Disposable {
|
|
104
103
|
constructor(provider, instantiationService) {
|
|
105
104
|
super();
|
|
@@ -135,10 +134,10 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
135
134
|
this.editorViewState.reset();
|
|
136
135
|
}
|
|
137
136
|
})(this, this.instantiationService));
|
|
138
|
-
this.labelOnlyEditorHistoryPickAccessor = ( new QuickPickItemScorerAccessor({ skipDescription: true }));
|
|
139
|
-
this.fileQueryDelayer = this._register(( new ThrottledDelayer(AnythingQuickAccessProvider_1.TYPING_SEARCH_DELAY)));
|
|
137
|
+
this.labelOnlyEditorHistoryPickAccessor = ( (new QuickPickItemScorerAccessor({ skipDescription: true })));
|
|
138
|
+
this.fileQueryDelayer = this._register(( (new ThrottledDelayer(AnythingQuickAccessProvider_1.TYPING_SEARCH_DELAY))));
|
|
140
139
|
this.fileQueryBuilder = this.instantiationService.createInstance(QueryBuilder);
|
|
141
|
-
this.lazyRegistry = ( new Lazy(() => ( Registry.as(Extensions.Quickaccess))));
|
|
140
|
+
this.lazyRegistry = ( (new Lazy(() => ( (Registry.as(Extensions.Quickaccess))))));
|
|
142
141
|
this.workspaceSymbolsQuickAccess = this._register(this.instantiationService.createInstance(SymbolsQuickAccessProvider));
|
|
143
142
|
this.editorSymbolsQuickAccess = this.instantiationService.createInstance(GotoSymbolQuickAccessProvider);
|
|
144
143
|
}
|
|
@@ -156,9 +155,9 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
156
155
|
};
|
|
157
156
|
}
|
|
158
157
|
provide(picker, token, runOptions) {
|
|
159
|
-
const disposables = ( new DisposableStore());
|
|
158
|
+
const disposables = ( (new DisposableStore()));
|
|
160
159
|
this.pickState.set(picker);
|
|
161
|
-
const editorDecorationsDisposable = disposables.add(( new MutableDisposable()));
|
|
160
|
+
const editorDecorationsDisposable = disposables.add(( (new MutableDisposable())));
|
|
162
161
|
disposables.add(picker.onDidChangeActive(() => {
|
|
163
162
|
editorDecorationsDisposable.value = undefined;
|
|
164
163
|
const [item] = picker.activeItems;
|
|
@@ -234,17 +233,13 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
234
233
|
return this.pickState.lastGlobalPicks;
|
|
235
234
|
}
|
|
236
235
|
const historyEditorPicks = this.getEditorHistoryPicks(query);
|
|
237
|
-
let picks = ( new Array());
|
|
236
|
+
let picks = ( (new Array()));
|
|
238
237
|
if (options.additionPicks) {
|
|
239
238
|
picks.push(...options.additionPicks);
|
|
240
239
|
}
|
|
241
240
|
if (this.pickState.isQuickNavigating) {
|
|
242
241
|
if (picks.length > 0) {
|
|
243
|
-
picks.push({ type: 'separator', label: ( localizeWithPath(
|
|
244
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
245
|
-
'recentlyOpenedSeparator',
|
|
246
|
-
"recently opened"
|
|
247
|
-
)) });
|
|
242
|
+
picks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 1, "recently opened")) });
|
|
248
243
|
}
|
|
249
244
|
picks = historyEditorPicks;
|
|
250
245
|
}
|
|
@@ -253,18 +248,14 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
253
248
|
picks.push(...this.getHelpPicks(query, token, options));
|
|
254
249
|
}
|
|
255
250
|
if (historyEditorPicks.length !== 0) {
|
|
256
|
-
picks.push({ type: 'separator', label: ( localizeWithPath(
|
|
257
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
258
|
-
'recentlyOpenedSeparator',
|
|
259
|
-
"recently opened"
|
|
260
|
-
)) });
|
|
251
|
+
picks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 1, "recently opened")) });
|
|
261
252
|
picks.push(...historyEditorPicks);
|
|
262
253
|
}
|
|
263
254
|
}
|
|
264
255
|
return {
|
|
265
256
|
picks,
|
|
266
257
|
additionalPicks: (async () => {
|
|
267
|
-
const additionalPicksExcludes = ( new ResourceMap());
|
|
258
|
+
const additionalPicksExcludes = ( (new ResourceMap()));
|
|
268
259
|
for (const historyEditorPick of historyEditorPicks) {
|
|
269
260
|
if (historyEditorPick.resource) {
|
|
270
261
|
additionalPicksExcludes.set(historyEditorPick.resource, true);
|
|
@@ -275,15 +266,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
275
266
|
return [];
|
|
276
267
|
}
|
|
277
268
|
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
|
-
)) },
|
|
269
|
+
{ type: 'separator', label: this.configuration.includeSymbols ? ( localizeWithPath(_moduleId, 2, "file and symbol results")) : ( localizeWithPath(_moduleId, 3, "file results")) },
|
|
287
270
|
...additionalPicks
|
|
288
271
|
] : [];
|
|
289
272
|
})(),
|
|
@@ -321,7 +304,9 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
321
304
|
getEditorHistoryPicks(query) {
|
|
322
305
|
const configuration = this.configuration;
|
|
323
306
|
if (!query.normalized) {
|
|
324
|
-
return (
|
|
307
|
+
return (
|
|
308
|
+
(this.historyService.getHistory().map(editor => this.createAnythingPick(editor, configuration)))
|
|
309
|
+
);
|
|
325
310
|
}
|
|
326
311
|
if (!this.configuration.includeHistory) {
|
|
327
312
|
return [];
|
|
@@ -350,12 +335,12 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
350
335
|
return editorHistoryPicks.sort((editorA, editorB) => compareItemsByFuzzyScore(editorA, editorB, query, false, editorHistoryScorerAccessor, this.pickState.scorerCache));
|
|
351
336
|
}
|
|
352
337
|
createFileQueryCache() {
|
|
353
|
-
return ( new FileQueryCacheState(
|
|
338
|
+
return ( (new FileQueryCacheState(
|
|
354
339
|
cacheKey => this.fileQueryBuilder.file(this.contextService.getWorkspace().folders, this.getFileQueryOptions({ cacheKey })),
|
|
355
340
|
query => this.searchService.fileSearch(query),
|
|
356
341
|
cacheKey => this.searchService.clearCache(cacheKey),
|
|
357
342
|
this.pickState.fileQueryCache
|
|
358
|
-
)).load();
|
|
343
|
+
))).load();
|
|
359
344
|
}
|
|
360
345
|
async getFilePicks(query, excludes, token) {
|
|
361
346
|
if (!query.normalized) {
|
|
@@ -367,7 +352,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
367
352
|
}
|
|
368
353
|
let fileMatches;
|
|
369
354
|
if (absolutePathResult) {
|
|
370
|
-
if (( excludes.has(absolutePathResult))) {
|
|
355
|
+
if (( (excludes.has(absolutePathResult)))) {
|
|
371
356
|
return [];
|
|
372
357
|
}
|
|
373
358
|
const absolutePathPick = this.createAnythingPick(absolutePathResult, this.configuration);
|
|
@@ -392,9 +377,11 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
392
377
|
return [];
|
|
393
378
|
}
|
|
394
379
|
const configuration = this.configuration;
|
|
395
|
-
return (
|
|
396
|
-
|
|
397
|
-
|
|
380
|
+
return (
|
|
381
|
+
(fileMatches
|
|
382
|
+
.filter(resource => !( (excludes.has(resource))))
|
|
383
|
+
.map(resource => this.createAnythingPick(resource, configuration)))
|
|
384
|
+
);
|
|
398
385
|
}
|
|
399
386
|
async doFileSearch(query, token) {
|
|
400
387
|
const [fileSearchResults, relativePathFileResults] = await Promise.all([
|
|
@@ -407,12 +394,12 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
407
394
|
if (!relativePathFileResults) {
|
|
408
395
|
return fileSearchResults;
|
|
409
396
|
}
|
|
410
|
-
const relativePathFileResultsMap = ( new ResourceMap());
|
|
397
|
+
const relativePathFileResultsMap = ( (new ResourceMap()));
|
|
411
398
|
for (const relativePathFileResult of relativePathFileResults) {
|
|
412
399
|
relativePathFileResultsMap.set(relativePathFileResult, true);
|
|
413
400
|
}
|
|
414
401
|
return [
|
|
415
|
-
...fileSearchResults.filter(result => !( relativePathFileResultsMap.has(result))),
|
|
402
|
+
...fileSearchResults.filter(result => !( (relativePathFileResultsMap.has(result)))),
|
|
416
403
|
...relativePathFileResults
|
|
417
404
|
];
|
|
418
405
|
}
|
|
@@ -433,17 +420,19 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
433
420
|
if (token.isCancellationRequested) {
|
|
434
421
|
return [];
|
|
435
422
|
}
|
|
436
|
-
const existingFileSearchResultsMap = ( new ResourceMap());
|
|
423
|
+
const existingFileSearchResultsMap = ( (new ResourceMap()));
|
|
437
424
|
for (const fileSearchResult of fileSearchResults.results) {
|
|
438
425
|
existingFileSearchResultsMap.set(fileSearchResult.resource, true);
|
|
439
426
|
}
|
|
440
427
|
for (const additionalFileSearchResult of additionalFileSearchResults.results) {
|
|
441
|
-
if (!( existingFileSearchResultsMap.has(additionalFileSearchResult.resource))) {
|
|
428
|
+
if (!( (existingFileSearchResultsMap.has(additionalFileSearchResult.resource)))) {
|
|
442
429
|
fileSearchResults.results.push(additionalFileSearchResult);
|
|
443
430
|
}
|
|
444
431
|
}
|
|
445
432
|
}
|
|
446
|
-
return (
|
|
433
|
+
return (
|
|
434
|
+
(fileSearchResults.results.map(result => result.resource))
|
|
435
|
+
);
|
|
447
436
|
}
|
|
448
437
|
doGetFileSearchResults(filePattern, token) {
|
|
449
438
|
const start = Date.now();
|
|
@@ -522,8 +511,8 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
522
511
|
return [];
|
|
523
512
|
}
|
|
524
513
|
const providers = this.lazyRegistry.value.getQuickAccessProviders()
|
|
525
|
-
.filter(p => ( p.helpEntries.some(h => h.commandCenterOrder !== undefined)))
|
|
526
|
-
.flatMap(provider => ( provider.helpEntries
|
|
514
|
+
.filter(p => ( (p.helpEntries.some(h => h.commandCenterOrder !== undefined))))
|
|
515
|
+
.flatMap(provider => ( (provider.helpEntries
|
|
527
516
|
.filter(h => h.commandCenterOrder !== undefined)
|
|
528
517
|
.map(helpEntry => {
|
|
529
518
|
const providerSpecificOptions = {
|
|
@@ -536,13 +525,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
536
525
|
description: helpEntry.prefix ?? provider.prefix,
|
|
537
526
|
commandCenterOrder: helpEntry.commandCenterOrder,
|
|
538
527
|
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
|
-
)),
|
|
528
|
+
ariaLabel: ( localizeWithPath(_moduleId, 4, "{0}, {1}", label, helpEntry.description)),
|
|
546
529
|
accept: () => {
|
|
547
530
|
this.quickInputService.quickAccess.show(provider.prefix, {
|
|
548
531
|
preserveValue: true,
|
|
@@ -550,14 +533,10 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
550
533
|
});
|
|
551
534
|
}
|
|
552
535
|
};
|
|
553
|
-
})));
|
|
536
|
+
}))));
|
|
554
537
|
if (this.quickChatService.enabled) {
|
|
555
538
|
providers.push({
|
|
556
|
-
label: ( localizeWithPath(
|
|
557
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
558
|
-
'chat',
|
|
559
|
-
"Open Quick Chat"
|
|
560
|
-
)),
|
|
539
|
+
label: ( localizeWithPath(_moduleId, 5, "Open Quick Chat")),
|
|
561
540
|
commandCenterOrder: 30,
|
|
562
541
|
keybinding: this.keybindingService.lookupKeybinding(ASK_QUICK_QUESTION_ACTION_ID),
|
|
563
542
|
accept: () => this.quickChatService.toggle()
|
|
@@ -631,21 +610,23 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
631
610
|
if (token.isCancellationRequested) {
|
|
632
611
|
return [];
|
|
633
612
|
}
|
|
634
|
-
return (
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
613
|
+
return (
|
|
614
|
+
(editorSymbolPicks.map(editorSymbolPick => {
|
|
615
|
+
if (editorSymbolPick.type === 'separator') {
|
|
616
|
+
return editorSymbolPick;
|
|
617
|
+
}
|
|
618
|
+
return {
|
|
619
|
+
...editorSymbolPick,
|
|
620
|
+
resource: activeGlobalResource,
|
|
621
|
+
description: editorSymbolPick.description,
|
|
622
|
+
trigger: (buttonIndex, keyMods) => {
|
|
623
|
+
this.openAnything(activeGlobalResource, { keyMods, range: editorSymbolPick.range?.selection, forceOpenSideBySide: true });
|
|
624
|
+
return TriggerAction.CLOSE_PICKER;
|
|
625
|
+
},
|
|
626
|
+
accept: (keyMods, event) => this.openAnything(activeGlobalResource, { keyMods, range: editorSymbolPick.range?.selection, preserveFocus: event.inBackground, forcePinned: event.inBackground })
|
|
627
|
+
};
|
|
628
|
+
}))
|
|
629
|
+
);
|
|
649
630
|
}
|
|
650
631
|
addDecorations(editor, range) {
|
|
651
632
|
this.editorSymbolsQuickAccess.addDecorations(editor, range);
|
|
@@ -671,54 +652,38 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
671
652
|
}
|
|
672
653
|
else {
|
|
673
654
|
resource = URI.isUri(resourceOrEditor) ? resourceOrEditor : resourceOrEditor.resource;
|
|
674
|
-
|
|
675
|
-
|
|
655
|
+
const customLabel = this.customEditorLabelService.getName(resource);
|
|
656
|
+
label = customLabel || basenameOrAuthority(resource);
|
|
657
|
+
description = this.labelService.getUriLabel(!!customLabel ? resource : dirname(resource), { relative: true });
|
|
676
658
|
isDirty = this.workingCopyService.isDirty(resource) && !this.filesConfigurationService.hasShortAutoSaveDelay(resource);
|
|
677
659
|
extraClasses = [];
|
|
678
660
|
}
|
|
679
661
|
const labelAndDescription = description ? `${label} ${description}` : label;
|
|
680
|
-
const iconClassesValue = ( new Lazy(
|
|
662
|
+
const iconClassesValue = ( (new Lazy(
|
|
681
663
|
() => getIconClasses(this.modelService, this.languageService, resource, undefined, icon).concat(extraClasses)
|
|
682
|
-
));
|
|
683
|
-
const buttonsValue = ( new Lazy(() => {
|
|
664
|
+
)));
|
|
665
|
+
const buttonsValue = ( (new Lazy(() => {
|
|
684
666
|
const openSideBySideDirection = configuration.openSideBySideDirection;
|
|
685
667
|
const buttons = [];
|
|
686
668
|
buttons.push({
|
|
687
669
|
iconClass: openSideBySideDirection === 'right' ? ThemeIcon.asClassName(Codicon.splitHorizontal) : ThemeIcon.asClassName(Codicon.splitVertical),
|
|
688
670
|
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
|
-
))
|
|
671
|
+
( localizeWithPath(_moduleId, 6, "Open to the Side")) :
|
|
672
|
+
( localizeWithPath(_moduleId, 7, "Open to the Bottom"))
|
|
699
673
|
});
|
|
700
674
|
if (isEditorHistoryEntry) {
|
|
701
675
|
buttons.push({
|
|
702
676
|
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
|
-
)),
|
|
677
|
+
tooltip: ( localizeWithPath(_moduleId, 8, "Remove from Recently Opened")),
|
|
708
678
|
alwaysVisible: isDirty
|
|
709
679
|
});
|
|
710
680
|
}
|
|
711
681
|
return buttons;
|
|
712
|
-
}));
|
|
682
|
+
})));
|
|
713
683
|
return {
|
|
714
684
|
resource,
|
|
715
685
|
label,
|
|
716
|
-
ariaLabel: isDirty ? ( localizeWithPath(
|
|
717
|
-
'vs/workbench/contrib/search/browser/anythingQuickAccess',
|
|
718
|
-
'filePickAriaLabelDirty',
|
|
719
|
-
"{0} unsaved changes",
|
|
720
|
-
labelAndDescription
|
|
721
|
-
)) : labelAndDescription,
|
|
686
|
+
ariaLabel: isDirty ? ( localizeWithPath(_moduleId, 9, "{0} unsaved changes", labelAndDescription)) : labelAndDescription,
|
|
722
687
|
description,
|
|
723
688
|
get iconClasses() { return iconClassesValue.value; },
|
|
724
689
|
get buttons() { return buttonsValue.value; },
|
|
@@ -772,27 +737,28 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
|
|
|
772
737
|
}
|
|
773
738
|
}
|
|
774
739
|
};
|
|
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
|
-
|
|
740
|
+
AnythingQuickAccessProvider = AnythingQuickAccessProvider_1 = ( (__decorate([
|
|
741
|
+
( (__param(0, IInstantiationService))),
|
|
742
|
+
( (__param(1, ISearchService))),
|
|
743
|
+
( (__param(2, IWorkspaceContextService))),
|
|
744
|
+
( (__param(3, IPathService))),
|
|
745
|
+
( (__param(4, IWorkbenchEnvironmentService))),
|
|
746
|
+
( (__param(5, IFileService))),
|
|
747
|
+
( (__param(6, ILabelService))),
|
|
748
|
+
( (__param(7, IModelService))),
|
|
749
|
+
( (__param(8, ILanguageService))),
|
|
750
|
+
( (__param(9, IWorkingCopyService))),
|
|
751
|
+
( (__param(10, IConfigurationService))),
|
|
752
|
+
( (__param(11, IEditorService))),
|
|
753
|
+
( (__param(12, IHistoryService))),
|
|
754
|
+
( (__param(13, IFilesConfigurationService))),
|
|
755
|
+
( (__param(14, ITextModelService))),
|
|
756
|
+
( (__param(15, IUriIdentityService))),
|
|
757
|
+
( (__param(16, IQuickInputService))),
|
|
758
|
+
( (__param(17, IKeybindingService))),
|
|
759
|
+
( (__param(18, IQuickChatService))),
|
|
760
|
+
( (__param(19, ILogService))),
|
|
761
|
+
( (__param(20, ICustomEditorLabelService)))
|
|
762
|
+
], AnythingQuickAccessProvider)));
|
|
797
763
|
|
|
798
764
|
export { AnythingQuickAccessProvider };
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
|
|
2
2
|
|
|
3
|
-
var css = ".quick-input-list .quick-input-list-entry.has-actions:hover .quick-input-list-entry-action-bar .action-label.dirty-anything:before{content
|
|
3
|
+
var css = ".quick-input-list .quick-input-list-entry.has-actions:hover .quick-input-list-entry-action-bar .action-label.dirty-anything:before{content:var(--vscode-icon-x-content);font-family:var(--vscode-icon-x-font-family)}";
|
|
4
4
|
n(css,{});
|
|
5
5
|
|
|
6
6
|
export { css, css as default };
|
|
@@ -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 };
|