@codingame/monaco-vscode-api 8.0.4 → 9.0.2

package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js

@@ -45,26 +45,26 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
     static { this.DEFAULT_AUTO_SAVE_DELAY = 1000; }
     static { this.READONLY_MESSAGES = {
         providerReadonly: { value: ( localize(
-            615,
+            734,
             "Editor is read-only because the file system of the file is read-only."
         )), isTrusted: true },
         sessionReadonly: { value: ( localize(
-            616,
+            735,
             "Editor is read-only because the file was set read-only in this session. [Click here](command:{0}) to set writeable.",
             'workbench.action.files.setActiveEditorWriteableInSession'
         )), isTrusted: true },
         configuredReadonly: { value: ( localize(
-            617,
+            736,
             "Editor is read-only because the file was set read-only via settings. [Click here](command:{0}) to configure or [toggle for this session](command:{1}).",
             `workbench.action.openSettings?${encodeURIComponent('["files.readonly"]')}`,
             'workbench.action.files.toggleActiveEditorReadonlyInSession'
         )), isTrusted: true },
         fileLocked: { value: ( localize(
-            618,
+            737,
             "Editor is read-only because of file permissions. [Click here](command:{0}) to set writeable anyway.",
             'workbench.action.files.setActiveEditorWriteableInSession'
         )), isTrusted: true },
-        fileReadonly: { value: ( localize(619, "Editor is read-only because the file is read-only.")), isTrusted: true }
+        fileReadonly: { value: ( localize(738, "Editor is read-only because the file is read-only.")), isTrusted: true }
     }; }
     constructor(contextKeyService, configurationService, contextService, environmentService, uriIdentityService, fileService, markerService, textResourceConfigurationService) {
         super();

package/vscode/src/vs/workbench/services/language/common/languageService.js

@@ -21,25 +21,25 @@ import { isString } from '../../../../base/common/types.js';
 const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'languages',
     jsonSchema: {
-        description: ( localize(2464, 'Contributes language declarations.')),
+        description: ( localize(2451, 'Contributes language declarations.')),
         type: 'array',
         items: {
             type: 'object',
             defaultSnippets: [{ body: { id: '${1:languageId}', aliases: ['${2:label}'], extensions: ['${3:extension}'], configuration: './language-configuration.json' } }],
             properties: {
                 id: {
-                    description: ( localize(2465, 'ID of the language.')),
+                    description: ( localize(2452, 'ID of the language.')),
                     type: 'string'
                 },
                 aliases: {
-                    description: ( localize(2466, 'Name aliases for the language.')),
+                    description: ( localize(2453, 'Name aliases for the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 extensions: {
-                    description: ( localize(2467, 'File extensions associated to the language.')),
+                    description: ( localize(2454, 'File extensions associated to the language.')),
                     default: ['.foo'],
                     type: 'array',
                     items: {
@@ -47,21 +47,21 @@ const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
                     }
                 },
                 filenames: {
-                    description: ( localize(2468, 'File names associated to the language.')),
+                    description: ( localize(2455, 'File names associated to the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 filenamePatterns: {
-                    description: ( localize(2469, 'File name glob patterns associated to the language.')),
+                    description: ( localize(2456, 'File name glob patterns associated to the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 mimetypes: {
-                    description: ( localize(2470, 'Mime types associated to the language.')),
+                    description: ( localize(2457, 'Mime types associated to the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
@@ -69,14 +69,14 @@ const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 firstLine: {
                     description: ( localize(
-                        2471,
+                        2458,
                         'A regular expression matching the first line of a file of the language.'
                     )),
                     type: 'string'
                 },
                 configuration: {
                     description: ( localize(
-                        2472,
+                        2459,
                         'A relative path to a file containing configuration options for the language.'
                     )),
                     type: 'string',
@@ -85,16 +85,16 @@ const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 icon: {
                     type: 'object',
                     description: ( localize(
-                        2473,
+                        2460,
                         'A icon to use as file icon, if no icon theme provides one for the language.'
                     )),
                     properties: {
                         light: {
-                            description: ( localize(2474, 'Icon path when a light theme is used')),
+                            description: ( localize(2461, 'Icon path when a light theme is used')),
                             type: 'string'
                         },
                         dark: {
-                            description: ( localize(2475, 'Icon path when a dark theme is used')),
+                            description: ( localize(2462, 'Icon path when a dark theme is used')),
                             type: 'string'
                         }
                     }
@@ -168,11 +168,11 @@ class LanguageTableRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(2476, "ID")),
-            ( localize(2477, "Name")),
-            ( localize(2478, "File Extensions")),
-            ( localize(2479, "Grammar")),
-            ( localize(2480, "Snippets"))
+            ( localize(2463, "ID")),
+            ( localize(2464, "Name")),
+            ( localize(2465, "File Extensions")),
+            ( localize(2466, "Grammar")),
+            ( localize(2467, "Snippets"))
         ];
         const rows = ( (languages.sort((a, b) => a.id.localeCompare(b.id))
             .map(l => {
@@ -194,7 +194,7 @@ class LanguageTableRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'languages',
-    label: ( localize(2481, "Programming Languages")),
+    label: ( localize(2468, "Programming Languages")),
     access: {
         canToggle: false
     },
@@ -212,7 +212,7 @@ let WorkbenchLanguageService = class WorkbenchLanguageService extends LanguageSe
                 const extension = extensions[i];
                 if (!Array.isArray(extension.value)) {
                     extension.collector.error(( localize(
-                        2482,
+                        2469,
                         "Invalid `contributes.{0}`. Expected an array.",
                         languagesExtPoint.name
                     )));
@@ -292,16 +292,16 @@ function isUndefinedOrStringArray(value) {
 }
 function isValidLanguageExtensionPoint(value, collector) {
     if (!value) {
-        collector?.error(( localize(2483, "Empty value for `contributes.{0}`", languagesExtPoint.name)));
+        collector?.error(( localize(2470, "Empty value for `contributes.{0}`", languagesExtPoint.name)));
         return false;
     }
     if (typeof value.id !== 'string') {
-        collector?.error(( localize(2484, "property `{0}` is mandatory and must be of type `string`", 'id')));
+        collector?.error(( localize(2471, "property `{0}` is mandatory and must be of type `string`", 'id')));
         return false;
     }
     if (!isUndefinedOrStringArray(value.extensions)) {
         collector?.error(( localize(
-            2485,
+            2472,
             "property `{0}` can be omitted and must be of type `string[]`",
             'extensions'
         )));
@@ -309,7 +309,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (!isUndefinedOrStringArray(value.filenames)) {
         collector?.error(( localize(
-            2486,
+            2473,
             "property `{0}` can be omitted and must be of type `string[]`",
             'filenames'
         )));
@@ -317,7 +317,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (typeof value.firstLine !== 'undefined' && typeof value.firstLine !== 'string') {
         collector?.error(( localize(
-            2487,
+            2474,
             "property `{0}` can be omitted and must be of type `string`",
             'firstLine'
         )));
@@ -325,7 +325,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (typeof value.configuration !== 'undefined' && typeof value.configuration !== 'string') {
         collector?.error(( localize(
-            2488,
+            2475,
             "property `{0}` can be omitted and must be of type `string`",
             'configuration'
         )));
@@ -333,7 +333,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (!isUndefinedOrStringArray(value.aliases)) {
         collector?.error(( localize(
-            2489,
+            2476,
             "property `{0}` can be omitted and must be of type `string[]`",
             'aliases'
         )));
@@ -341,7 +341,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (!isUndefinedOrStringArray(value.mimetypes)) {
         collector?.error(( localize(
-            2490,
+            2477,
             "property `{0}` can be omitted and must be of type `string[]`",
             'mimetypes'
         )));
@@ -350,7 +350,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     if (typeof value.icon !== 'undefined') {
         if (typeof value.icon !== 'object' || typeof value.icon.light !== 'string' || typeof value.icon.dark !== 'string') {
             collector?.error(( localize(
-                2491,
+                2478,
                 "property `{0}` can be omitted and must be of type `object` with properties `{1}` and `{2}` of type `string`",
                 'icon',
                 'light',

package/vscode/src/vs/workbench/services/lifecycle/common/lifecycleService.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Barrier } from '../../../../base/common/async.js';
 import { Emitter } from '../../../../base/common/event.js';
+import { Barrier } from '../../../../base/common/async.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { mark } from '../../../../base/common/performance.js';
+import { LifecyclePhase, StartupKind, LifecyclePhaseToString, ShutdownReason } from './lifecycle.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
+import { mark } from '../../../../base/common/performance.js';
 import { WillSaveStateReason, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
-import { LifecyclePhase, StartupKind, LifecyclePhaseToString, ShutdownReason } from './lifecycle.js';
 var AbstractLifecycleService_1;
 let AbstractLifecycleService = class AbstractLifecycleService extends Disposable {
     static { AbstractLifecycleService_1 = this; }

package/vscode/src/vs/workbench/services/output/common/output.js

@@ -2,7 +2,6 @@ import { Emitter } from '../../../../base/common/event.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 const OUTPUT_MIME = 'text/x-code-output';
-const OUTPUT_SCHEME = 'output';
 const OUTPUT_MODE_ID = 'Log';
 const LOG_MIME = 'text/x-code-log-output';
 const LOG_MODE_ID = 'log';
@@ -51,4 +50,4 @@ class OutputChannelRegistry {
 }
 Registry.add(Extensions.OutputChannels, ( new OutputChannelRegistry()));
 const ACTIVE_OUTPUT_CHANNEL_CONTEXT = ( new RawContextKey('activeOutputChannel', ''));
-export { ACTIVE_OUTPUT_CHANNEL_CONTEXT, CONTEXT_ACTIVE_FILE_OUTPUT, CONTEXT_ACTIVE_OUTPUT_LEVEL, CONTEXT_ACTIVE_OUTPUT_LEVEL_IS_DEFAULT, CONTEXT_ACTIVE_OUTPUT_LEVEL_SETTABLE, CONTEXT_IN_OUTPUT, CONTEXT_OUTPUT_SCROLL_LOCK, Extensions, LOG_MIME, LOG_MODE_ID, OUTPUT_MIME, OUTPUT_MODE_ID, OUTPUT_SCHEME, OUTPUT_VIEW_ID, OutputChannelUpdateMode };
+export { ACTIVE_OUTPUT_CHANNEL_CONTEXT, CONTEXT_ACTIVE_FILE_OUTPUT, CONTEXT_ACTIVE_OUTPUT_LEVEL, CONTEXT_ACTIVE_OUTPUT_LEVEL_IS_DEFAULT, CONTEXT_ACTIVE_OUTPUT_LEVEL_SETTABLE, CONTEXT_IN_OUTPUT, CONTEXT_OUTPUT_SCROLL_LOCK, Extensions, LOG_MIME, LOG_MODE_ID, OUTPUT_MIME, OUTPUT_MODE_ID, OUTPUT_VIEW_ID, OutputChannelUpdateMode };

package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.js

@@ -7,7 +7,7 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { KeybindingsEditorModel } from './keybindingsEditorModel.js';
 var KeybindingsEditorInput_1;
-const KeybindingsEditorIcon = registerIcon('keybindings-editor-label-icon', Codicon.keyboard, ( localize(6229, 'Icon of the keybindings editor label.')));
+const KeybindingsEditorIcon = registerIcon('keybindings-editor-label-icon', Codicon.keyboard, ( localize(6237, 'Icon of the keybindings editor label.')));
 let KeybindingsEditorInput = class KeybindingsEditorInput extends EditorInput {
     static { KeybindingsEditorInput_1 = this; }
     static { this.ID = 'workbench.input.keybindings'; }
@@ -21,7 +21,7 @@ let KeybindingsEditorInput = class KeybindingsEditorInput extends EditorInput {
         return KeybindingsEditorInput_1.ID;
     }
     getName() {
-        return ( localize(6230, "Keyboard Shortcuts"));
+        return ( localize(6238, "Keyboard Shortcuts"));
     }
     getIcon() {
         return KeybindingsEditorIcon;

package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.js

@@ -16,9 +16,9 @@ import { ExtensionIdentifier, ExtensionIdentifierMap } from '../../../../platfor
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 var KeybindingsEditorModel_1;
 const KEYBINDING_ENTRY_TEMPLATE_ID = 'keybinding.entry.template';
-const SOURCE_SYSTEM = ( localize(4636, "System"));
-const SOURCE_EXTENSION = ( localize(4637, "Extension"));
-const SOURCE_USER = ( localize(4638, "User"));
+const SOURCE_SYSTEM = ( localize(4607, "System"));
+const SOURCE_EXTENSION = ( localize(4608, "Extension"));
+const SOURCE_USER = ( localize(4609, "User"));
 function createKeybindingCommandQuery(commandId, when) {
     const whenPart = when ? ` +when:${when}` : '';
     return `@command:${commandId}${whenPart}`;
@@ -264,7 +264,7 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
             if (menuCommand && menuCommand.title && menuCommand.title.original) {
                 const category = menuCommand.category ? menuCommand.category.original : undefined;
                 const title = menuCommand.title.original;
-                return category ? ( localize(4639, "{0}: {1}", category, title)) : title;
+                return category ? ( localize(4610, "{0}: {1}", category, title)) : title;
             }
         }
         return null;
@@ -273,7 +273,7 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         if (menuCommand) {
             const category = menuCommand.category ? typeof menuCommand.category === 'string' ? menuCommand.category : menuCommand.category.value : undefined;
             const title = typeof menuCommand.title === 'string' ? menuCommand.title : menuCommand.title.value;
-            return category ? ( localize(4639, "{0}: {1}", category, title)) : title;
+            return category ? ( localize(4610, "{0}: {1}", category, title)) : title;
         }
         if (editorActionLabel) {
             return editorActionLabel;
@@ -553,7 +553,7 @@ class KeybindingItemMatches {
         if (equalsIgnoreCase(this.modifierLabels.user.altKey, word)) {
             return true;
         }
-        if (equalsIgnoreCase(( localize(4640, "option")), word)) {
+        if (equalsIgnoreCase(( localize(4611, "option")), word)) {
             return true;
         }
         return false;
@@ -580,7 +580,7 @@ class KeybindingItemMatches {
         if (equalsIgnoreCase(this.modifierLabels.user.metaKey, word)) {
             return true;
         }
-        if (equalsIgnoreCase(( localize(4641, "meta")), word)) {
+        if (equalsIgnoreCase(( localize(4612, "meta")), word)) {
             return true;
         }
         return false;

package/vscode/src/vs/workbench/services/preferences/common/preferencesEditorInput.js

@@ -7,7 +7,7 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { IPreferencesService } from './preferences.service.js';
 var SettingsEditor2Input_1;
-const SettingsEditorIcon = registerIcon('settings-editor-label-icon', Codicon.settings, ( localize(6232, 'Icon of the settings editor label.')));
+const SettingsEditorIcon = registerIcon('settings-editor-label-icon', Codicon.settings, ( localize(6239, 'Icon of the settings editor label.')));
 let SettingsEditor2Input = class SettingsEditor2Input extends EditorInput {
     static { SettingsEditor2Input_1 = this; }
     static { this.ID = 'workbench.input.settings2'; }
@@ -26,7 +26,7 @@ let SettingsEditor2Input = class SettingsEditor2Input extends EditorInput {
         return SettingsEditor2Input_1.ID;
     }
     getName() {
-        return ( localize(6233, "Settings"));
+        return ( localize(6240, "Settings"));
     }
     getIcon() {
         return SettingsEditorIcon;

package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js

@@ -36,7 +36,7 @@ const getStartedWalkthrough = {
     required: ['id'],
     properties: {
         id: {
-            description: ( localize(3557, 'The ID of a Get Started walkthrough to open.')),
+            description: ( localize(3555, 'The ID of a Get Started walkthrough to open.')),
             type: 'string'
         },
     }
@@ -44,12 +44,12 @@ const getStartedWalkthrough = {
 const remoteHelpExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'remoteHelp',
     jsonSchema: {
-        description: ( localize(3558, 'Contributes help information for Remote')),
+        description: ( localize(3556, 'Contributes help information for Remote')),
         type: 'object',
         properties: {
             'getStarted': {
                 description: ( localize(
-                    3559,
+                    3557,
                     "The url, or a command that returns the url, to your project's Getting Started page, or a walkthrough ID contributed by your project's extension"
                 )),
                 oneOf: [
@@ -59,29 +59,29 @@ const remoteHelpExtPoint = ExtensionsRegistry.registerExtensionPoint({
             },
             'documentation': {
                 description: ( localize(
-                    3560,
+                    3558,
                     "The url, or a command that returns the url, to your project's documentation page"
                 )),
                 type: 'string'
             },
             'feedback': {
                 description: ( localize(
-                    3561,
+                    3559,
                     "The url, or a command that returns the url, to your project's feedback reporter"
                 )),
                 type: 'string',
-                markdownDeprecationMessage: ( localize(3562, "Use {0} instead", '`reportIssue`'))
+                markdownDeprecationMessage: ( localize(3560, "Use {0} instead", '`reportIssue`'))
             },
             'reportIssue': {
                 description: ( localize(
-                    3563,
+                    3561,
                     "The url, or a command that returns the url, to your project's issue reporter"
                 )),
                 type: 'string'
             },
             'issues': {
                 description: ( localize(
-                    3564,
+                    3562,
                     "The url, or a command that returns the url, to your project's issues list"
                 )),
                 type: 'string'

package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js

@@ -26,7 +26,7 @@ const TUNNELS_TO_RESTORE = 'remote.tunnels.toRestore';
 const TUNNELS_TO_RESTORE_EXPIRATION = 'remote.tunnels.toRestoreExpiration';
 const RESTORE_EXPIRATION_TIME = 1000 * 60 * 60 * 24 * 14;
 const ACTIVATION_EVENT = 'onTunnel';
-const forwardedPortsViewEnabled = ( (new RawContextKey('forwardedPortsViewEnabled', false, ( localize(8676, "Whether the Ports view is enabled.")))));
+const forwardedPortsViewEnabled = ( (new RawContextKey('forwardedPortsViewEnabled', false, ( localize(8727, "Whether the Ports view is enabled.")))));
 function parseAddress(address) {
     const matches = address.match(/^([a-zA-Z0-9_-]+(?:\.[a-zA-Z0-9_-]+)*:)?([0-9]+)$/);
     if (!matches) {
@@ -48,11 +48,11 @@ var TunnelSource;
 })(TunnelSource || (TunnelSource = {}))));
 const UserTunnelSource = {
     source: TunnelSource.User,
-    description: ( localize(8677, "User Forwarded"))
+    description: ( localize(8728, "User Forwarded"))
 };
 const AutoTunnelSource = {
     source: TunnelSource.Auto,
-    description: ( localize(8678, "Auto Forwarded"))
+    description: ( localize(8729, "Auto Forwarded"))
 };
 function mapHasAddress(map, host, port) {
     const initialAddress = map.get(makeAddress(host, port));
@@ -558,7 +558,7 @@ let TunnelModel = class TunnelModel extends Disposable {
         }
         this.mismatchCooldown = newCooldown;
         const mismatchString = ( localize(
-            8679,
+            8730,
             "Local port {0} could not be used for forwarding to remote port {1}.\n\nThis usually happens when there is already another process using local port {0}.\n\nPort number {2} has been used instead.",
             expectedLocal,
             tunnel.tunnelRemotePort,
@@ -725,7 +725,7 @@ let TunnelModel = class TunnelModel extends Disposable {
                     privacy: TunnelPrivacyId.ConstantPrivate,
                     source: {
                         source: TunnelSource.Extension,
-                        description: ( localize(8680, "Statically Forwarded"))
+                        description: ( localize(8731, "Statically Forwarded"))
                     }
                 });
                 this.tunnelService.setEnvironmentTunnel(tunnel.remoteAddress.host, tunnel.remoteAddress.port, localAddress, TunnelPrivacyId.ConstantPrivate, TunnelProtocol.Http);

package/vscode/src/vs/workbench/services/search/common/fileSearchManager.js

@@ -4,12 +4,15 @@ import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { parse } from '../../../../base/common/glob.js';
 import { joinPath } from '../../../../base/common/resources.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
-import { resolvePatternsForProvider, QueryGlobTester, hasSiblingFn } from './search.js';
+import { resolvePatternsForProvider, excludeToGlobPattern, DEFAULT_MAX_SEARCH_RESULTS, QueryGlobTester, hasSiblingFn } from './search.js';
+import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { OldFileSearchProviderConverter } from './searchExtConversionTypes.js';
 class FileSearchEngine {
-    constructor(config, provider, sessionToken) {
+    constructor(config, provider, sessionLifecycle) {
         this.config = config;
         this.provider = provider;
-        this.sessionToken = sessionToken;
+        this.sessionLifecycle = sessionLifecycle;
         this.isLimitHit = false;
         this.resultCount = 0;
         this.isCanceled = false;
@@ -46,31 +49,36 @@ class FileSearchEngine {
                     this.matchFile(onResult, { base: extraFile, basename: basename$1 });
                 });
             }
-            Promise.all(( folderQueries.map(fq => {
-                return this.searchInFolder(fq, onResult);
-            }))).then(stats => {
+            this.doSearch(folderQueries, onResult).then(stats => {
                 resolve({
                     limitHit: this.isLimitHit,
-                    stats: stats[0] || undefined
+                    stats: stats || undefined
                 });
             }, (err) => {
                 reject(( new Error(toErrorMessage(err))));
             });
         }));
     }
-    async searchInFolder(fq, onResult) {
+    async doSearch(fqs, onResult) {
         const cancellation = ( new CancellationTokenSource());
-        const options = this.getSearchOptionsForFolder(fq);
-        const tree = this.initDirectoryTree();
-        const queryTester = ( new QueryGlobTester(this.config, fq));
-        const noSiblingsClauses = !queryTester.hasSiblingExcludeClauses();
+        const folderOptions = ( fqs.map(fq => this.getSearchOptionsForFolder(fq)));
+        const session = this.provider instanceof OldFileSearchProviderConverter ? this.sessionLifecycle?.tokenSource.token : this.sessionLifecycle?.obj;
+        const options = {
+            folderOptions,
+            maxResults: this.config.maxResults ?? DEFAULT_MAX_SEARCH_RESULTS,
+            session
+        };
+        const folderMappings = TernarySearchTree.forUris();
+        fqs.forEach(fq => {
+            const queryTester = ( new QueryGlobTester(this.config, fq));
+            const noSiblingsClauses = !queryTester.hasSiblingExcludeClauses();
+            folderMappings.set(fq.folder, { queryTester, noSiblingsClauses, folder: fq.folder, tree: this.initDirectoryTree() });
+        });
         let providerSW;
         try {
             this.activeCancellationTokens.add(cancellation);
             providerSW = StopWatch.create();
-            const results = await this.provider.provideFileSearchResults({
-                pattern: this.config.filePattern || ''
-            }, options, cancellation.token);
+            const results = await this.provider.provideFileSearchResults(this.config.filePattern || '', options, cancellation.token);
             const providerTime = providerSW.elapsed();
             const postProcessSW = StopWatch.create();
             if (this.isCanceled && !this.isLimitHit) {
@@ -78,19 +86,22 @@ class FileSearchEngine {
             }
             if (results) {
                 results.forEach(result => {
-                    const relativePath = posix.relative(fq.folder.path, result.path);
-                    if (noSiblingsClauses) {
+                    const fqFolderInfo = folderMappings.findSubstr(result);
+                    const relativePath = posix.relative(fqFolderInfo.folder.path, result.path);
+                    if (fqFolderInfo.noSiblingsClauses) {
                         const basename$1 = basename(result.path);
-                        this.matchFile(onResult, { base: fq.folder, relativePath, basename: basename$1 });
+                        this.matchFile(onResult, { base: fqFolderInfo.folder, relativePath, basename: basename$1 });
                         return;
                     }
-                    this.addDirectoryEntries(tree, fq.folder, relativePath, onResult);
+                    this.addDirectoryEntries(fqFolderInfo.tree, fqFolderInfo.folder, relativePath, onResult);
                 });
             }
             if (this.isCanceled && !this.isLimitHit) {
                 return null;
             }
-            this.matchDirectoryTree(tree, queryTester, onResult);
+            folderMappings.forEach(e => {
+                this.matchDirectoryTree(e.tree, e.queryTester, onResult);
+            });
             return {
                 providerTime,
                 postProcessTime: postProcessSW.elapsed()
@@ -103,17 +114,27 @@ class FileSearchEngine {
     }
     getSearchOptionsForFolder(fq) {
         const includes = resolvePatternsForProvider(this.config.includePattern, fq.includePattern);
-        const excludes = resolvePatternsForProvider(this.config.excludePattern, fq.excludePattern);
+        let excludePattern = fq.excludePattern?.map(e => ({
+            folder: e.folder,
+            patterns: resolvePatternsForProvider(this.config.excludePattern, e.pattern)
+        }));
+        if (!excludePattern?.length) {
+            excludePattern = [{
+                    folder: undefined,
+                    patterns: resolvePatternsForProvider(this.config.excludePattern, undefined)
+                }];
+        }
+        const excludes = excludeToGlobPattern(excludePattern);
         return {
             folder: fq.folder,
             excludes,
             includes,
-            useIgnoreFiles: !fq.disregardIgnoreFiles,
-            useGlobalIgnoreFiles: !fq.disregardGlobalIgnoreFiles,
-            useParentIgnoreFiles: !fq.disregardParentIgnoreFiles,
+            useIgnoreFiles: {
+                local: !fq.disregardIgnoreFiles,
+                parent: !fq.disregardParentIgnoreFiles,
+                global: !fq.disregardGlobalIgnoreFiles
+            },
             followSymlinks: !fq.ignoreSymlinks,
-            maxResults: this.config.maxResults,
-            session: this.sessionToken
         };
     }
     initDirectoryTree() {
@@ -185,6 +206,17 @@ class FileSearchEngine {
         }
     }
 }
+class SessionLifecycle extends Disposable {
+    constructor() {
+        super();
+        this.obj = ( new Object());
+        this.tokenSource = ( new CancellationTokenSource());
+    }
+    dispose() {
+        this.tokenSource.cancel();
+        super.dispose();
+    }
+}
 class FileSearchManager {
     constructor() {
         this.sessions = ( new Map());
@@ -192,7 +224,7 @@ class FileSearchManager {
     static { this.BATCH_SIZE = 512; }
     fileSearch(config, provider, onBatch, token) {
         const sessionTokenSource = this.getSessionTokenSource(config.cacheKey);
-        const engine = ( new FileSearchEngine(config, provider, sessionTokenSource && sessionTokenSource.token));
+        const engine = ( new FileSearchEngine(config, provider, sessionTokenSource));
         let resultCount = 0;
         const onInternalResult = (batch) => {
             resultCount += batch.length;
@@ -212,15 +244,15 @@ class FileSearchManager {
         });
     }
     clearCache(cacheKey) {
-        const sessionTokenSource = this.getSessionTokenSource(cacheKey);
-        sessionTokenSource?.cancel();
+        this.sessions.get(cacheKey)?.dispose();
+        this.sessions.delete(cacheKey);
     }
     getSessionTokenSource(cacheKey) {
         if (!cacheKey) {
             return undefined;
         }
         if (!( this.sessions.has(cacheKey))) {
-            this.sessions.set(cacheKey, ( new CancellationTokenSource()));
+            this.sessions.set(cacheKey, ( new SessionLifecycle()));
         }
         return this.sessions.get(cacheKey);
     }