@codingame/monaco-vscode-api 1.79.2-next.2 → 1.79.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/dist/extensions.d.ts +1 -1
- package/dist/extensions.d2.ts +1 -1
- package/dist/extensionsRegistry.d.ts +1 -1
- package/dist/rollup-extension-directory-plugin.d.ts +2 -10
- package/dist/rollup-extension-directory-plugin.js +2 -2
- package/dist/rollup-vsix-plugin.d.ts +2 -10
- package/dist/rollup-vsix-plugin.js +5 -7
- package/dist/services.d.ts +1 -1
- package/dist/views.d.ts +1 -1
- package/dist/vscode/vs/workbench/contrib/search/browser/search.contribution.js +0 -6
- package/dist/vscode/vs/workbench/contrib/search/browser/searchActionsBase.js +1 -30
- package/dist/vscode/vs/workbench/contrib/search/browser/searchIcons.js +9 -9
- package/dist/vscode/vs/workbench/contrib/search/browser/searchModel.js +2 -33
- package/dist/vscode/vs/workbench/contrib/search/common/constants.js +1 -35
- package/dist/vscode/vs/workbench/services/search/common/queryBuilder.js +2 -44
- package/monaco-editor-treemending.patch +780 -780
- package/package.json +1 -1
- package/dist/vscode/vs/workbench/contrib/search/browser/searchActionsCopy.js +0 -204
- package/dist/vscode/vs/workbench/contrib/search/browser/searchActionsFind.js +0 -355
- package/dist/vscode/vs/workbench/contrib/search/browser/searchActionsNav.js +0 -461
- package/dist/vscode/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.js +0 -365
- package/dist/vscode/vs/workbench/contrib/search/browser/searchActionsSymbol.js +0 -37
- package/dist/vscode/vs/workbench/contrib/search/browser/searchActionsTopBar.js +0 -308
package/dist/extensions.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as vscode from 'vscode';
|
|
2
|
-
import {
|
|
2
|
+
import { a as IExtensionDescription, b as IExtensionManifest } from './extensions.d2.ts';
|
|
3
3
|
export { c as IExtensionContributions } from './extensions.d2.ts';
|
|
4
4
|
import { I as IMessage } from './extensionsRegistry.js';
|
|
5
5
|
import { a as IDisposable } from './event.js';
|
package/dist/extensions.d2.ts
CHANGED
|
@@ -443,4 +443,4 @@ interface IRelaxedExtensionDescription extends IRelaxedExtensionManifest {
|
|
|
443
443
|
}
|
|
444
444
|
type IExtensionDescription = Readonly<IRelaxedExtensionDescription>;
|
|
445
445
|
|
|
446
|
-
export { ExtensionIdentifier as E,
|
|
446
|
+
export { ExtensionIdentifier as E, ILocalizedString as I, TargetPlatform as T, IExtensionDescription as a, IExtensionManifest as b, IExtensionContributions as c, ExtensionKind as d, ICommandAction as e, ICommandActionTitle as f, Icon as g, IEnvironmentService as h };
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { S as ServiceIdentifier } from './instantiation.js';
|
|
2
|
-
import { E as ExtensionIdentifier,
|
|
2
|
+
import { E as ExtensionIdentifier, a as IExtensionDescription, c as IExtensionContributions, d as ExtensionKind } from './extensions.d2.ts';
|
|
3
3
|
import { E as Event } from './event.js';
|
|
4
4
|
import { S as Severity } from './severity.js';
|
|
5
5
|
|
|
@@ -1,21 +1,13 @@
|
|
|
1
1
|
import { FilterPattern } from '@rollup/pluginutils';
|
|
2
2
|
import { Plugin, InputPluginOption } from 'rollup';
|
|
3
|
-
import { I as IExtensionManifest } from './extensions.d2.ts';
|
|
4
|
-
import './uri.js';
|
|
5
|
-
import './contextkey.js';
|
|
6
|
-
import './instantiation.js';
|
|
7
|
-
import './event.js';
|
|
8
|
-
import 'vscode';
|
|
9
|
-
import './themables.js';
|
|
10
3
|
|
|
11
4
|
interface Options {
|
|
12
5
|
include?: FilterPattern;
|
|
13
6
|
exclude?: FilterPattern;
|
|
14
7
|
isDefaultExtension?: boolean;
|
|
15
8
|
withCode?: (extensionPath: string) => boolean;
|
|
16
|
-
rollupPlugins
|
|
17
|
-
transformManifest?: (manifest: IExtensionManifest) => IExtensionManifest;
|
|
9
|
+
rollupPlugins: InputPluginOption[];
|
|
18
10
|
}
|
|
19
|
-
declare function plugin({ include, exclude, isDefaultExtension, withCode, rollupPlugins
|
|
11
|
+
declare function plugin({ include, exclude, isDefaultExtension, withCode, rollupPlugins }: Options): Plugin;
|
|
20
12
|
|
|
21
13
|
export { plugin as default };
|
|
@@ -11,7 +11,7 @@ import 'node:crypto';
|
|
|
11
11
|
import 'node:fs/promises';
|
|
12
12
|
import 'tty';
|
|
13
13
|
|
|
14
|
-
function plugin({ include, exclude, isDefaultExtension = false, withCode = () => true, rollupPlugins
|
|
14
|
+
function plugin({ include, exclude, isDefaultExtension = false, withCode = () => true, rollupPlugins }) {
|
|
15
15
|
const filter = createFilter(include, exclude);
|
|
16
16
|
return {
|
|
17
17
|
name: 'default-extensions-loader',
|
|
@@ -36,7 +36,7 @@ function plugin({ include, exclude, isDefaultExtension = false, withCode = () =>
|
|
|
36
36
|
parsed = localizeManifest(parsed, parseJson(id, (await fsPromise.readFile(nlsFile)).toString()));
|
|
37
37
|
}
|
|
38
38
|
return {
|
|
39
|
-
code: dataToEsm(
|
|
39
|
+
code: dataToEsm(parsed, {
|
|
40
40
|
compact: true,
|
|
41
41
|
namedExports: false,
|
|
42
42
|
preferConst: false
|
|
@@ -1,20 +1,12 @@
|
|
|
1
1
|
import { FilterPattern } from '@rollup/pluginutils';
|
|
2
2
|
import { Plugin, InputPluginOption } from 'rollup';
|
|
3
|
-
import { I as IExtensionManifest } from './extensions.d2.ts';
|
|
4
|
-
import './uri.js';
|
|
5
|
-
import './contextkey.js';
|
|
6
|
-
import './instantiation.js';
|
|
7
|
-
import './event.js';
|
|
8
|
-
import 'vscode';
|
|
9
|
-
import './themables.js';
|
|
10
3
|
|
|
11
4
|
interface Options {
|
|
12
5
|
include?: FilterPattern;
|
|
13
6
|
exclude?: FilterPattern;
|
|
14
7
|
withCode?: (extensionPath: string) => boolean;
|
|
15
|
-
rollupPlugins
|
|
16
|
-
transformManifest?: (manifest: IExtensionManifest) => IExtensionManifest;
|
|
8
|
+
rollupPlugins: InputPluginOption[];
|
|
17
9
|
}
|
|
18
|
-
declare function plugin({ include, exclude, rollupPlugins, withCode
|
|
10
|
+
declare function plugin({ include, exclude, rollupPlugins, withCode }: Options): Plugin;
|
|
19
11
|
|
|
20
12
|
export { plugin as default };
|
|
@@ -53,7 +53,7 @@ async function readVsix(file) {
|
|
|
53
53
|
function getVsixPath(file) {
|
|
54
54
|
return path.relative('/', path.resolve('/', file));
|
|
55
55
|
}
|
|
56
|
-
function plugin({ include = '**/*.vsix', exclude, rollupPlugins
|
|
56
|
+
function plugin({ include = '**/*.vsix', exclude, rollupPlugins, withCode = () => true }) {
|
|
57
57
|
const filter = createFilter(include, exclude);
|
|
58
58
|
const vsixFiles = {};
|
|
59
59
|
return {
|
|
@@ -81,7 +81,7 @@ function plugin({ include = '**/*.vsix', exclude, rollupPlugins = [], withCode =
|
|
|
81
81
|
map: { mappings: '' }
|
|
82
82
|
};
|
|
83
83
|
}
|
|
84
|
-
const content = vsixFile[
|
|
84
|
+
const content = vsixFile[resourcePath];
|
|
85
85
|
if (isBinaryFileSync_1(content)) {
|
|
86
86
|
return {
|
|
87
87
|
code: `export default Uint8Array.from(window.atob(${JSON.stringify(content.toString('base64'))}), v => v.charCodeAt(0));`,
|
|
@@ -100,13 +100,11 @@ function plugin({ include = '**/*.vsix', exclude, rollupPlugins = [], withCode =
|
|
|
100
100
|
const file = match[2];
|
|
101
101
|
const vsixFile = vsixFiles[match[1]];
|
|
102
102
|
let parsed = parseJson(id, vsixFile[file].toString('utf8'));
|
|
103
|
-
if (file === 'package.json') {
|
|
104
|
-
|
|
105
|
-
parsed = localizeManifest(parsed, parseJson(id, vsixFile['package.nls.json'].toString()));
|
|
106
|
-
}
|
|
103
|
+
if (file === 'package.json' && 'package.nls.json' in vsixFile) {
|
|
104
|
+
parsed = localizeManifest(parsed, parseJson(id, vsixFile['package.nls.json'].toString()));
|
|
107
105
|
}
|
|
108
106
|
return {
|
|
109
|
-
code: dataToEsm(
|
|
107
|
+
code: dataToEsm(parsed, {
|
|
110
108
|
compact: true,
|
|
111
109
|
namedExports: false,
|
|
112
110
|
preferConst: false
|
package/dist/services.d.ts
CHANGED
|
@@ -19,7 +19,7 @@ import { I as IconIdentifier, T as ThemeIcon } from './themables.js';
|
|
|
19
19
|
import { I as IJSONSchema, a as IJSONSchemaMap } from './jsonSchema.js';
|
|
20
20
|
import { I as IView$3, a as IViewDescriptorService, b as IViewPaneContainer, c as ViewContainer, d as IViewContainerModel, e as IViewDescriptor, f as IAddedViewDescriptorRef, g as IPaneComposite, V as ViewContainerLocation } from './views.js';
|
|
21
21
|
export { h as IViewsService } from './views.js';
|
|
22
|
-
import { e as ICommandAction, f as ICommandActionTitle, g as Icon, h as IEnvironmentService, E as ExtensionIdentifier, T as TargetPlatform,
|
|
22
|
+
import { e as ICommandAction, f as ICommandActionTitle, g as Icon, h as IEnvironmentService, E as ExtensionIdentifier, T as TargetPlatform, a as IExtensionDescription } from './extensions.d2.ts';
|
|
23
23
|
import { b as IProgress, c as IProgressStep, I as IComposite, d as ICompositeControl, a as IProgressIndicator } from './composite.js';
|
|
24
24
|
import { a as IContextKeyService, C as ContextKeyExpression } from './contextkey.js';
|
|
25
25
|
import { a as IExtensionService } from './extensionsRegistry.js';
|
package/dist/views.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { U as URI } from './uri.js';
|
|
|
3
3
|
import { E as Event } from './event.js';
|
|
4
4
|
import { T as ThemeIcon } from './themables.js';
|
|
5
5
|
import { C as ContextKeyExpression } from './contextkey.js';
|
|
6
|
-
import {
|
|
6
|
+
import { I as ILocalizedString, E as ExtensionIdentifier } from './extensions.d2.ts';
|
|
7
7
|
import { I as IComposite, a as IProgressIndicator } from './composite.js';
|
|
8
8
|
|
|
9
9
|
interface IKeybindings {
|
|
@@ -21,12 +21,6 @@ import { CommandsRegistry } from 'monaco-editor/esm/vs/platform/commands/common/
|
|
|
21
21
|
import { assertType } from 'monaco-editor/esm/vs/base/common/types.js';
|
|
22
22
|
import { getWorkspaceSymbols } from '../common/search.js';
|
|
23
23
|
import { ShowAllSymbolsActionId } from '../common/constants.js';
|
|
24
|
-
import './searchActionsCopy.js';
|
|
25
|
-
import './searchActionsFind.js';
|
|
26
|
-
import './searchActionsNav.js';
|
|
27
|
-
import './searchActionsRemoveReplace.js';
|
|
28
|
-
import './searchActionsSymbol.js';
|
|
29
|
-
import './searchActionsTopBar.js';
|
|
30
24
|
registerContributions();
|
|
31
25
|
registerContributions$1();
|
|
32
26
|
const SEARCH_MODE_CONFIG = 'search.mode';
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
|
|
2
|
-
import * as nls from 'monaco-editor/esm/vs/nls.js';
|
|
3
|
-
import { searchComparer, FileMatch, Match, FolderMatch } from './searchModel.js';
|
|
4
2
|
import { VIEW_ID } from '../../../services/search/common/search.js';
|
|
5
|
-
const category = { value: ( nls.localize('search', "Search")), original: 'Search' };
|
|
6
3
|
function isSearchViewFocused(viewsService) {
|
|
7
4
|
const searchView = getSearchView(viewsService);
|
|
8
5
|
const activeElement = document.activeElement;
|
|
@@ -14,33 +11,7 @@ function appendKeyBindingLabel(label, inputKeyBinding) {
|
|
|
14
11
|
function getSearchView(viewsService) {
|
|
15
12
|
return viewsService.getActiveViewWithId(VIEW_ID);
|
|
16
13
|
}
|
|
17
|
-
function getElementsToOperateOn(viewer, currElement, sortConfig) {
|
|
18
|
-
let elements = viewer.getSelection().filter((x) => x !== null).sort((a, b) => searchComparer(a, b, sortConfig.sortOrder));
|
|
19
|
-
if (currElement && !(elements.length > 1 && elements.includes(currElement))) {
|
|
20
|
-
elements = [currElement];
|
|
21
|
-
}
|
|
22
|
-
return elements;
|
|
23
|
-
}
|
|
24
|
-
function shouldRefocus(elements, focusElement) {
|
|
25
|
-
if (!focusElement) {
|
|
26
|
-
return false;
|
|
27
|
-
}
|
|
28
|
-
return !focusElement || elements.includes(focusElement) || hasDownstreamMatch(elements, focusElement);
|
|
29
|
-
}
|
|
30
|
-
function hasDownstreamMatch(elements, focusElement) {
|
|
31
|
-
for (const elem of elements) {
|
|
32
|
-
if ((elem instanceof FileMatch && focusElement instanceof Match && elem.matches().includes(focusElement)) ||
|
|
33
|
-
(elem instanceof FolderMatch && ((focusElement instanceof FileMatch && elem.getDownstreamFileMatch(focusElement.resource)) ||
|
|
34
|
-
(focusElement instanceof Match && elem.getDownstreamFileMatch(focusElement.parent().resource))))) {
|
|
35
|
-
return true;
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
return false;
|
|
39
|
-
}
|
|
40
|
-
function openSearchView(viewsService, focus) {
|
|
41
|
-
return viewsService.openView(VIEW_ID, focus).then(view => (view ?? undefined));
|
|
42
|
-
}
|
|
43
14
|
function doAppendKeyBindingLabel(label, keyBinding) {
|
|
44
15
|
return keyBinding ? label + ' (' + keyBinding.getLabel() + ')' : label;
|
|
45
16
|
}
|
|
46
|
-
export { appendKeyBindingLabel,
|
|
17
|
+
export { appendKeyBindingLabel, getSearchView, isSearchViewFocused };
|
|
@@ -15,21 +15,21 @@ const searchShowReplaceIcon = registerIcon('search-show-replace', Codicon.chevro
|
|
|
15
15
|
'Icon to expand the replace section in the search view.'
|
|
16
16
|
)));
|
|
17
17
|
const searchReplaceAllIcon = registerIcon('search-replace-all', Codicon.replaceAll, ( localize('searchReplaceAllIcon', 'Icon for replace all in the search view.')));
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
registerIcon('search-replace', Codicon.replace, ( localize('searchReplaceIcon', 'Icon for replace in the search view.')));
|
|
19
|
+
registerIcon('search-remove', Codicon.close, ( localize('searchRemoveIcon', 'Icon to remove a search result.')));
|
|
20
20
|
const searchRefreshIcon = registerIcon('search-refresh', Codicon.refresh, ( localize('searchRefreshIcon', 'Icon for refresh in the search view.')));
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
registerIcon('search-collapse-results', Codicon.collapseAll, ( localize('searchCollapseAllIcon', 'Icon for collapse results in the search view.')));
|
|
22
|
+
registerIcon('search-expand-results', Codicon.expandAll, ( localize('searchExpandAllIcon', 'Icon for expand results in the search view.')));
|
|
23
|
+
registerIcon('search-tree', Codicon.listTree, ( localize(
|
|
24
24
|
'searchShowAsTree',
|
|
25
25
|
'Icon for viewing results as a tree in the search view.'
|
|
26
26
|
)));
|
|
27
|
-
|
|
27
|
+
registerIcon('search-list', Codicon.listFlat, ( localize(
|
|
28
28
|
'searchShowAsList',
|
|
29
29
|
'Icon for viewing results as a list in the search view.'
|
|
30
30
|
)));
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
registerIcon('search-clear-results', Codicon.clearAll, ( localize('searchClearIcon', 'Icon for clear results in the search view.')));
|
|
32
|
+
registerIcon('search-stop', Codicon.searchStop, ( localize('searchStopIcon', 'Icon for stop in the search view.')));
|
|
33
33
|
const searchViewIcon = registerIcon('search-view-icon', Codicon.search, ( localize('searchViewIcon', 'View icon of the search view.')));
|
|
34
34
|
const searchNewEditorIcon = registerIcon('search-new-editor', Codicon.newFile, ( localize('searchNewEditorIcon', 'Icon for the action to open a new search editor.')));
|
|
35
|
-
export {
|
|
35
|
+
export { searchDetailsIcon, searchHideReplaceIcon, searchNewEditorIcon, searchRefreshIcon, searchReplaceAllIcon, searchShowContextIcon, searchShowReplaceIcon, searchViewIcon };
|
|
@@ -33,7 +33,7 @@ import { NotebookCellsChangeType } from '../../notebook/common/notebookCommon.js
|
|
|
33
33
|
import { IReplaceService } from './replace.js';
|
|
34
34
|
import { isIFileMatchWithCells, contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches } from './searchNotebookHelpers.js';
|
|
35
35
|
import { ReplacePattern } from '../../../services/search/common/replace.js';
|
|
36
|
-
import {
|
|
36
|
+
import { resultIsMatch, OneLineRange, ISearchService } from '../../../services/search/common/search.js';
|
|
37
37
|
import { editorMatchesToTextSearchResults, addContextToEditorMatches } from '../../../services/search/common/searchHelpers.js';
|
|
38
38
|
class Match {
|
|
39
39
|
constructor(_parent, _fullPreviewLines, _fullPreviewRange, _documentRange) {
|
|
@@ -1186,37 +1186,6 @@ function compareNotebookPos(match1, match2) {
|
|
|
1186
1186
|
return 1;
|
|
1187
1187
|
}
|
|
1188
1188
|
}
|
|
1189
|
-
function searchComparer(elementA, elementB, sortOrder = "default" ) {
|
|
1190
|
-
const elemAParents = createParentList(elementA);
|
|
1191
|
-
const elemBParents = createParentList(elementB);
|
|
1192
|
-
let i = elemAParents.length - 1;
|
|
1193
|
-
let j = elemBParents.length - 1;
|
|
1194
|
-
while (i >= 0 && j >= 0) {
|
|
1195
|
-
if (elemAParents[i].id() !== elemBParents[j].id()) {
|
|
1196
|
-
return searchMatchComparer(elemAParents[i], elemBParents[j], sortOrder);
|
|
1197
|
-
}
|
|
1198
|
-
i--;
|
|
1199
|
-
j--;
|
|
1200
|
-
}
|
|
1201
|
-
const elemAAtEnd = i === 0;
|
|
1202
|
-
const elemBAtEnd = j === 0;
|
|
1203
|
-
if (elemAAtEnd && !elemBAtEnd) {
|
|
1204
|
-
return 1;
|
|
1205
|
-
}
|
|
1206
|
-
else if (!elemAAtEnd && elemBAtEnd) {
|
|
1207
|
-
return -1;
|
|
1208
|
-
}
|
|
1209
|
-
return 0;
|
|
1210
|
-
}
|
|
1211
|
-
function createParentList(element) {
|
|
1212
|
-
const parentArray = [];
|
|
1213
|
-
let currElement = element;
|
|
1214
|
-
while (!(currElement instanceof SearchResult)) {
|
|
1215
|
-
parentArray.push(currElement);
|
|
1216
|
-
currElement = currElement.parent();
|
|
1217
|
-
}
|
|
1218
|
-
return parentArray;
|
|
1219
|
-
}
|
|
1220
1189
|
let SearchResult = class SearchResult extends Disposable {
|
|
1221
1190
|
constructor(_searchModel, replaceService, instantiationService, modelService, uriIdentityService, notebookEditorService) {
|
|
1222
1191
|
super();
|
|
@@ -1870,4 +1839,4 @@ function getFileMatches(matches) {
|
|
|
1870
1839
|
});
|
|
1871
1840
|
return fileMatches.concat(( folderMatches.map(e => e.allDownstreamFileMatches())).flat());
|
|
1872
1841
|
}
|
|
1873
|
-
export { CellMatch, FileMatch, FolderMatch, FolderMatchNoRoot, FolderMatchWithResource, FolderMatchWorkspaceRoot, ISearchWorkbenchService, Match, MatchInNotebook, RangeHighlightDecorations, SearchModel, SearchResult, SearchWorkbenchService, arrayContainsElementOrParent, compareNotebookPos,
|
|
1842
|
+
export { CellMatch, FileMatch, FolderMatch, FolderMatchNoRoot, FolderMatchWithResource, FolderMatchWorkspaceRoot, ISearchWorkbenchService, Match, MatchInNotebook, RangeHighlightDecorations, SearchModel, SearchResult, SearchWorkbenchService, arrayContainsElementOrParent, compareNotebookPos, searchMatchComparer, textSearchMatchesToNotebookMatches };
|
|
@@ -1,44 +1,10 @@
|
|
|
1
1
|
import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
|
|
2
|
-
const FindInFilesActionId = 'workbench.action.findInFiles';
|
|
3
|
-
const FocusSearchFromResults = 'search.action.focusSearchFromResults';
|
|
4
|
-
const OpenMatch = 'search.action.openResult';
|
|
5
|
-
const OpenMatchToSide = 'search.action.openResultToSide';
|
|
6
|
-
const RemoveActionId = 'search.action.remove';
|
|
7
|
-
const CopyPathCommandId = 'search.action.copyPath';
|
|
8
|
-
const CopyMatchCommandId = 'search.action.copyMatch';
|
|
9
|
-
const CopyAllCommandId = 'search.action.copyAll';
|
|
10
2
|
const OpenInEditorCommandId = 'search.action.openInEditor';
|
|
11
|
-
const ClearSearchHistoryCommandId = 'search.action.clearHistory';
|
|
12
|
-
const FocusSearchListCommandID = 'search.action.focusSearchList';
|
|
13
|
-
const ReplaceActionId = 'search.action.replace';
|
|
14
|
-
const ReplaceAllInFileActionId = 'search.action.replaceAllInFile';
|
|
15
|
-
const ReplaceAllInFolderActionId = 'search.action.replaceAllInFolder';
|
|
16
|
-
const CloseReplaceWidgetActionId = 'closeReplaceInFilesWidget';
|
|
17
3
|
const ToggleCaseSensitiveCommandId = 'toggleSearchCaseSensitive';
|
|
18
4
|
const ToggleWholeWordCommandId = 'toggleSearchWholeWord';
|
|
19
5
|
const ToggleRegexCommandId = 'toggleSearchRegex';
|
|
20
6
|
const TogglePreserveCaseId = 'toggleSearchPreserveCase';
|
|
21
|
-
const AddCursorsAtSearchResults = 'addCursorsAtSearchResults';
|
|
22
|
-
const RevealInSideBarForSearchResults = 'search.action.revealInSideBar';
|
|
23
|
-
const ReplaceInFilesActionId = 'workbench.action.replaceInFiles';
|
|
24
7
|
const ShowAllSymbolsActionId = 'workbench.action.showAllSymbols';
|
|
25
|
-
const CancelSearchActionId = 'search.action.cancel';
|
|
26
|
-
const RefreshSearchResultsActionId = 'search.action.refreshSearchResults';
|
|
27
|
-
const FocusNextSearchResultActionId = 'search.action.focusNextSearchResult';
|
|
28
|
-
const FocusPreviousSearchResultActionId = 'search.action.focusPreviousSearchResult';
|
|
29
|
-
const ToggleSearchOnTypeActionId = 'workbench.action.toggleSearchOnType';
|
|
30
|
-
const CollapseSearchResultsActionId = 'search.action.collapseSearchResults';
|
|
31
|
-
const ExpandSearchResultsActionId = 'search.action.expandSearchResults';
|
|
32
|
-
const ClearSearchResultsActionId = 'search.action.clearSearchResults';
|
|
33
|
-
const ViewAsTreeActionId = 'search.action.viewAsTree';
|
|
34
|
-
const ViewAsListActionId = 'search.action.viewAsList';
|
|
35
|
-
const ToggleQueryDetailsActionId = 'workbench.action.search.toggleQueryDetails';
|
|
36
|
-
const ExcludeFolderFromSearchId = 'search.action.excludeFromSearch';
|
|
37
|
-
const FocusNextInputActionId = 'search.focus.nextInputBox';
|
|
38
|
-
const FocusPreviousInputActionId = 'search.focus.previousInputBox';
|
|
39
|
-
const RestrictSearchToFolderId = 'search.action.restrictSearchToFolder';
|
|
40
|
-
const FindInFolderId = 'filesExplorer.findInFolder';
|
|
41
|
-
const FindInWorkspaceId = 'filesExplorer.findInWorkspace';
|
|
42
8
|
const SearchViewVisibleKey = ( new RawContextKey('searchViewletVisible', true));
|
|
43
9
|
const SearchViewFocusedKey = ( new RawContextKey('searchViewletFocus', false));
|
|
44
10
|
const InputBoxFocusedKey = ( new RawContextKey('inputBoxFocus', false));
|
|
@@ -62,4 +28,4 @@ const ViewHasReplacePatternKey = ( new RawContextKey('viewHasReplacePattern', fa
|
|
|
62
28
|
const ViewHasFilePatternKey = ( new RawContextKey('viewHasFilePattern', false));
|
|
63
29
|
const ViewHasSomeCollapsibleKey = ( new RawContextKey('viewHasSomeCollapsibleResult', false));
|
|
64
30
|
const InTreeViewKey = ( new RawContextKey('inTreeView', false));
|
|
65
|
-
export {
|
|
31
|
+
export { FileFocusKey, FileMatchOrFolderMatchFocusKey, FileMatchOrFolderMatchWithResourceFocusKey, FileMatchOrMatchFocusKey, FirstMatchFocusKey, FolderFocusKey, HasSearchResults, InTreeViewKey, InputBoxFocusedKey, IsEditableItemKey, MatchFocusKey, OpenInEditorCommandId, PatternExcludesFocusedKey, PatternIncludesFocusedKey, ReplaceActiveKey, ReplaceInputBoxFocusedKey, ResourceFolderFocusKey, SearchInputBoxFocusedKey, SearchViewFocusedKey, SearchViewVisibleKey, ShowAllSymbolsActionId, ToggleCaseSensitiveCommandId, TogglePreserveCaseId, ToggleRegexCommandId, ToggleWholeWordCommandId, ViewHasFilePatternKey, ViewHasReplacePatternKey, ViewHasSearchPatternKey, ViewHasSomeCollapsibleKey };
|
|
@@ -6,7 +6,7 @@ import { untildify } from 'monaco-editor/esm/vs/base/common/labels.js';
|
|
|
6
6
|
import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
|
|
7
7
|
import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
|
|
8
8
|
import * as path from 'monaco-editor/esm/vs/base/common/path.js';
|
|
9
|
-
import {
|
|
9
|
+
import { isAbsolutePath, isEqual, basename } from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
10
10
|
import * as strings from 'monaco-editor/esm/vs/base/common/strings.js';
|
|
11
11
|
import { assertIsDefined, isDefined } from 'monaco-editor/esm/vs/base/common/types.js';
|
|
12
12
|
import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
@@ -449,46 +449,4 @@ function normalizeGlobPattern(pattern) {
|
|
|
449
449
|
.replace(/^\.\//, '')
|
|
450
450
|
.replace(/\/+$/g, '');
|
|
451
451
|
}
|
|
452
|
-
|
|
453
|
-
return path.replace(/([?*[\]])/g, '[$1]');
|
|
454
|
-
}
|
|
455
|
-
function resolveResourcesForSearchIncludes(resources, contextService) {
|
|
456
|
-
resources = arrays.distinct(resources, resource => ( resource.toString()));
|
|
457
|
-
const folderPaths = [];
|
|
458
|
-
const workspace = contextService.getWorkspace();
|
|
459
|
-
if (resources) {
|
|
460
|
-
resources.forEach(resource => {
|
|
461
|
-
let folderPath;
|
|
462
|
-
if (contextService.getWorkbenchState() === 2 ) {
|
|
463
|
-
folderPath = relativePath(workspace.folders[0].uri, resource);
|
|
464
|
-
if (folderPath && folderPath !== '.') {
|
|
465
|
-
folderPath = './' + folderPath;
|
|
466
|
-
}
|
|
467
|
-
}
|
|
468
|
-
else {
|
|
469
|
-
const owningFolder = contextService.getWorkspaceFolder(resource);
|
|
470
|
-
if (owningFolder) {
|
|
471
|
-
const owningRootName = owningFolder.name;
|
|
472
|
-
const isUniqueFolder = workspace.folders.filter(folder => folder.name === owningRootName).length === 1;
|
|
473
|
-
if (isUniqueFolder) {
|
|
474
|
-
const relPath = relativePath(owningFolder.uri, resource);
|
|
475
|
-
if (relPath === '') {
|
|
476
|
-
folderPath = `./${owningFolder.name}`;
|
|
477
|
-
}
|
|
478
|
-
else {
|
|
479
|
-
folderPath = `./${owningFolder.name}/${relPath}`;
|
|
480
|
-
}
|
|
481
|
-
}
|
|
482
|
-
else {
|
|
483
|
-
folderPath = resource.fsPath;
|
|
484
|
-
}
|
|
485
|
-
}
|
|
486
|
-
}
|
|
487
|
-
if (folderPath) {
|
|
488
|
-
folderPaths.push(escapeGlobPattern(folderPath));
|
|
489
|
-
}
|
|
490
|
-
});
|
|
491
|
-
}
|
|
492
|
-
return folderPaths;
|
|
493
|
-
}
|
|
494
|
-
export { QueryBuilder, resolveResourcesForSearchIncludes };
|
|
452
|
+
export { QueryBuilder };
|