@codingame/monaco-vscode-api 32.0.2 → 33.0.3

package/vscode/src/vs/workbench/api/common/extHostWorkspace.js

@@ -5,6 +5,7 @@ import { Barrier, AsyncIterableProducer } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Emitter, AsyncEmitter } from '../../../base/common/event.js';
 import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { StopWatch } from '../../../base/common/stopwatch.js';
 import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
 import { Schemas } from '../../../base/common/network.js';
 import { Counter } from '../../../base/common/numbers.js';
@@ -215,6 +216,7 @@ let ExtHostWorkspace = class ExtHostWorkspace {
         this._barrier = ( new Barrier());
         this._proxy = ( extHostRpc.getProxy(MainContext.MainThreadWorkspace));
         this._messageService = ( extHostRpc.getProxy(MainContext.MainThreadMessageService));
+        this._telemetryProxy = ( extHostRpc.getProxy(MainContext.MainThreadTelemetry));
         const data = initData.workspace;
         this._confirmedWorkspace = data ? ( new ExtHostWorkspaceImpl(
             data.id,
@@ -226,6 +228,15 @@ let ExtHostWorkspace = class ExtHostWorkspace {
             uri => ignorePathCasing(uri, extHostFileSystemInfo)
         )) : undefined;
     }
+    $setConfigProvider(provider) {
+        this._configProvider = provider;
+    }
+    _useIgnoreFilesInFindFiles() {
+        return this._configProvider?.getConfiguration("search").get("experimental.useIgnoreFilesInFindFiles") ?? false;
+    }
+    _userIgnoreFilesSetting() {
+        return this._configProvider?.getConfiguration("search").get("useIgnoreFiles") ?? true;
+    }
     $initializeWorkspace(data, trusted) {
         this._trusted = trusted;
         this.$acceptWorkspaceData(data);
@@ -333,7 +344,7 @@ let ExtHostWorkspace = class ExtHostWorkspace {
                     }
                 };
                 this._messageService.$showMessage(Severity$1.Error, ( localize(
-                    2801,
+                    2823,
                     "Extension '{0}' failed to update workspace folders: {1}",
                     extName,
                     (error.toString())
@@ -445,6 +456,8 @@ let ExtHostWorkspace = class ExtHostWorkspace {
                 excludeString = exclude.pattern;
             }
         }
+        const useIgnoreFilesOptIn = this._useIgnoreFilesInFindFiles();
+        const localIgnoreFiles = useIgnoreFilesOptIn && exclude !== null ? undefined : false;
         return this._findFilesImpl({
             type: "include",
             value: include
@@ -453,8 +466,11 @@ let ExtHostWorkspace = class ExtHostWorkspace {
             maxResults,
             useExcludeSettings: useFileExcludes ? ExcludeSettingOptions.FilesExclude : ExcludeSettingOptions.None,
             useIgnoreFiles: {
-                local: false
+                local: localIgnoreFiles
             }
+        }, extensionId, "findFiles", {
+            useIgnoreFilesLocal: undefined,
+            excludeWasNull: exclude === null
         }, token);
     }
     findFiles2(filePatterns, options = {}, extensionId, token = CancellationToken.None) {
@@ -464,49 +480,90 @@ let ExtHostWorkspace = class ExtHostWorkspace {
         return this._findFilesImpl({
             type: "filePatterns",
             value: filePatterns
-        }, options, token);
+        }, options, extensionId, "findFiles2", {
+            useIgnoreFilesLocal: options.useIgnoreFiles?.local,
+            excludeWasNull: false
+        }, token);
     }
     async _findFilesImpl(
         query,
         options,
+        extensionId,
+        apiKind,
+        intent,
         token
     ) {
-        if (token.isCancellationRequested) {
-            return Promise.resolve([]);
-        }
-        const filePatternsToUse = query.type === "include" ? [query.value] : query.value ?? [];
-        if (!Array.isArray(filePatternsToUse)) {
-            console.error("Invalid file pattern provided", filePatternsToUse);
-            throw ( new Error(`Invalid file pattern provided ${JSON.stringify(filePatternsToUse)}`));
-        }
-        const queryOptions = ( filePatternsToUse.map(filePattern => {
-            const excludePatterns = globsToISearchPatternBuilder(options.exclude);
-            const fileQueries = {
-                ignoreSymlinks: typeof options.followSymlinks === "boolean" ? !options.followSymlinks : undefined,
-                disregardIgnoreFiles: typeof options.useIgnoreFiles?.local === "boolean" ? !options.useIgnoreFiles.local : undefined,
-                disregardGlobalIgnoreFiles: typeof options.useIgnoreFiles?.global === "boolean" ? !options.useIgnoreFiles.global : undefined,
-                disregardParentIgnoreFiles: typeof options.useIgnoreFiles?.parent === "boolean" ? !options.useIgnoreFiles.parent : undefined,
-                disregardExcludeSettings: options.useExcludeSettings !== undefined && options.useExcludeSettings === ExcludeSettingOptions.None,
-                disregardSearchExcludeSettings: options.useExcludeSettings !== undefined && (options.useExcludeSettings !== ExcludeSettingOptions.SearchAndFilesExclude),
-                maxResults: options.maxResults,
-                excludePattern: excludePatterns.length > 0 ? excludePatterns : undefined,
-                ignoreGlobCase: options.caseInsensitive,
-                _reason: "startFileSearch",
-                shouldGlobSearch: query.type === "include" ? undefined : true
-            };
-            const parseInclude = parseSearchExcludeInclude(GlobPattern.from(filePattern));
-            const folderToUse = parseInclude?.folder;
-            if (query.type === "include") {
-                fileQueries.includePattern = parseInclude?.pattern;
-            } else {
-                fileQueries.filePattern = parseInclude?.pattern;
+        const useIgnoreFilesLocalRequested = intent.useIgnoreFilesLocal === true ? "true" : intent.useIgnoreFilesLocal === false ? "false" : "unspecified";
+        const sw = ( new StopWatch(true));
+        let queryCount = 0;
+        let respectedIgnoreFiles = this._userIgnoreFilesSetting();
+        let resultCount = 0;
+        let cancelled = false;
+        let errored = false;
+        try {
+            if (token.isCancellationRequested) {
+                cancelled = true;
+                return [];
             }
-            return {
-                folder: folderToUse,
-                options: fileQueries
-            };
-        }));
-        return this._findFilesBase(queryOptions, token);
+            const filePatternsToUse = query.type === "include" ? [query.value] : query.value ?? [];
+            if (!Array.isArray(filePatternsToUse)) {
+                console.error("Invalid file pattern provided", filePatternsToUse);
+                throw ( new Error(`Invalid file pattern provided ${JSON.stringify(filePatternsToUse)}`));
+            }
+            const queryOptions = ( filePatternsToUse.map(filePattern => {
+                const excludePatterns = globsToISearchPatternBuilder(options.exclude);
+                const fileQueries = {
+                    ignoreSymlinks: typeof options.followSymlinks === "boolean" ? !options.followSymlinks : undefined,
+                    disregardIgnoreFiles: typeof options.useIgnoreFiles?.local === "boolean" ? !options.useIgnoreFiles.local : undefined,
+                    disregardGlobalIgnoreFiles: typeof options.useIgnoreFiles?.global === "boolean" ? !options.useIgnoreFiles.global : undefined,
+                    disregardParentIgnoreFiles: typeof options.useIgnoreFiles?.parent === "boolean" ? !options.useIgnoreFiles.parent : undefined,
+                    disregardExcludeSettings: options.useExcludeSettings !== undefined && options.useExcludeSettings === ExcludeSettingOptions.None,
+                    disregardSearchExcludeSettings: options.useExcludeSettings !== undefined && (options.useExcludeSettings !== ExcludeSettingOptions.SearchAndFilesExclude),
+                    maxResults: options.maxResults,
+                    excludePattern: excludePatterns.length > 0 ? excludePatterns : undefined,
+                    ignoreGlobCase: options.caseInsensitive,
+                    _reason: "startFileSearch",
+                    shouldGlobSearch: query.type === "include" ? undefined : true
+                };
+                const parseInclude = parseSearchExcludeInclude(GlobPattern.from(filePattern));
+                const folderToUse = parseInclude?.folder;
+                if (query.type === "include") {
+                    fileQueries.includePattern = parseInclude?.pattern;
+                } else {
+                    fileQueries.filePattern = parseInclude?.pattern;
+                }
+                return {
+                    folder: folderToUse,
+                    options: fileQueries
+                };
+            }));
+            queryCount = queryOptions.length;
+            const userHonorsIgnore = this._userIgnoreFilesSetting();
+            respectedIgnoreFiles = queryOptions.every(
+                q => q.options.disregardIgnoreFiles === true ? false : q.options.disregardIgnoreFiles === false ? true : userHonorsIgnore
+            );
+            const result = await this._findFilesBase(queryOptions, token);
+            resultCount = result.length;
+            cancelled = token.isCancellationRequested;
+            return result;
+        } catch (err) {
+            errored = true;
+            cancelled = token.isCancellationRequested;
+            throw err;
+        } finally {
+            this._reportFindFilesTelemetry({
+                extensionId: extensionId.value,
+                apiKind,
+                respectedIgnoreFiles,
+                useIgnoreFilesLocalRequested,
+                excludeWasNull: intent.excludeWasNull,
+                resultCount,
+                durationMs: sw.elapsed(),
+                queryCount,
+                cancelled,
+                errored
+            });
+        }
     }
     async _findFilesBase(queryOptions, token) {
         const result = await Promise.all(queryOptions?.map(
@@ -523,6 +580,9 @@ let ExtHostWorkspace = class ExtHostWorkspace {
         }
         return Array.from(( uriMap.values()));
     }
+    _reportFindFilesTelemetry(event) {
+        this._telemetryProxy.$publicLog2("extHostFindFiles", event);
+    }
     findTextInFiles2(query, options, extensionId, token = CancellationToken.None) {
         this._logService.trace(
             `extHostWorkspace#findTextInFiles2: textSearch, extension: ${extensionId.value}, entryPoint: findTextInFiles2`

package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js

@@ -16,7 +16,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "jsonValidation",
     defaultExtensionKind: ["workspace", "web"],
     jsonSchema: {
-        description: ( localize(2802, "Contributes json schema configuration.")),
+        description: ( localize(2824, "Contributes json schema configuration.")),
         type: "array",
         defaultSnippets: [{
             body: [{
@@ -36,7 +36,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 fileMatch: {
                     type: ["string", "array"],
                     description: ( localize(
-                        2803,
+                        2825,
                         "The file pattern (or an array of patterns) to match, for example \"package.json\" or \"*.launch\". Exclusion patterns start with '!'"
                     )),
                     items: {
@@ -45,7 +45,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 url: {
                     description: ( localize(
-                        2804,
+                        2826,
                         "A schema URL ('http:', 'https:') or relative path to the extension folder ('./')."
                     )),
                     type: "string"
@@ -62,20 +62,20 @@ class JSONValidationExtensionPoint {
                 const collector = extension.collector;
                 const extensionLocation = extension.description.extensionLocation;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(2805, "'configuration.jsonValidation' must be a array")));
+                    collector.error(( localize(2827, "'configuration.jsonValidation' must be a array")));
                     return;
                 }
                 extensionValue.forEach(extension => {
                     if (!isString(extension.fileMatch) && !(Array.isArray(extension.fileMatch) && extension.fileMatch.every(isString))) {
                         collector.error(( localize(
-                            2806,
+                            2828,
                             "'configuration.jsonValidation.fileMatch' must be defined as a string or an array of strings."
                         )));
                         return;
                     }
                     const uri = extension.url;
                     if (!isString(uri)) {
-                        collector.error(( localize(2807, "'configuration.jsonValidation.url' must be a URL or relative path")));
+                        collector.error(( localize(2829, "'configuration.jsonValidation.url' must be a URL or relative path")));
                         return;
                     }
                     if (uri.startsWith("./")) {
@@ -83,7 +83,7 @@ class JSONValidationExtensionPoint {
                             const colorThemeLocation = joinPath(extensionLocation, uri);
                             if (!isEqualOrParent(colorThemeLocation, extensionLocation)) {
                                 collector.warn(( localize(
-                                    2808,
+                                    2830,
                                     "Expected `contributes.{0}.url` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
                                     configurationExtPoint.name,
                                     (colorThemeLocation.toString()),
@@ -92,14 +92,14 @@ class JSONValidationExtensionPoint {
                             }
                         } catch (e) {
                             collector.error(( localize(
-                                2809,
+                                2831,
                                 "'configuration.jsonValidation.url' is an invalid relative URL: {0}",
                                 e.message
                             )));
                         }
                     } else if (!/^[^:/?#]+:\/\//.test(uri)) {
                         collector.error(( localize(
-                            2810,
+                            2832,
                             "'configuration.jsonValidation.url' must be an absolute URL or start with './'  to reference schemas located in the extension."
                         )));
                         return;
@@ -128,7 +128,7 @@ class JSONValidationDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(2811, "File Match")), ( localize(2812, "Schema"))];
+        const headers = [( localize(2833, "File Match")), ( localize(2834, "Schema"))];
         const rows = ( contrib.map(v => {
             return [( new MarkdownString()).appendMarkdown(`\`${Array.isArray(v.fileMatch) ? v.fileMatch.join(", ") : v.fileMatch}\``), v.url];
         }));
@@ -143,7 +143,7 @@ class JSONValidationDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "jsonValidation",
-    label: ( localize(2813, "JSON Validation")),
+    label: ( localize(2835, "JSON Validation")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/browser/actions/developerActions.js

@@ -50,7 +50,7 @@ class InspectContextKeysAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.inspectContextKeys",
-            title: ( localize2(2814, "Inspect Context Keys")),
+            title: ( localize2(2836, "Inspect Context Keys")),
             category: Categories.Developer,
             f1: true
         });
@@ -96,7 +96,7 @@ class ToggleScreencastModeAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.toggleScreencastMode",
-            title: ( localize2(2815, "Toggle Screencast Mode")),
+            title: ( localize2(2837, "Toggle Screencast Mode")),
             category: Categories.Developer,
             f1: true
         });
@@ -341,7 +341,7 @@ class LogStorageAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.logStorage",
-            title: ( localize2(2816, "Log Storage Database Contents")),
+            title: ( localize2(2838, "Log Storage Database Contents")),
             category: Categories.Developer,
             f1: true
         });
@@ -351,16 +351,16 @@ class LogStorageAction extends Action2 {
         const dialogService = accessor.get(IDialogService);
         storageService.log();
         dialogService.info(( localize(
-            2817,
+            2839,
             "The storage database contents have been logged to the developer tools."
-        )), ( localize(2818, "Open developer tools from the menu and select the Console tab.")));
+        )), ( localize(2840, "Open developer tools from the menu and select the Console tab.")));
     }
 }
 class LogWorkingCopiesAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.logWorkingCopies",
-            title: ( localize2(2819, "Log Working Copies")),
+            title: ( localize2(2841, "Log Working Copies")),
             category: Categories.Developer,
             f1: true
         });
@@ -390,7 +390,7 @@ class RemoveLargeStorageEntriesAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.removeLargeStorageDatabaseEntries",
-            title: ( localize2(2820, "Remove Large Storage Database Entries...")),
+            title: ( localize2(2842, "Remove Large Storage Database Entries...")),
             category: Categories.Developer,
             f1: true
         });
@@ -418,10 +418,10 @@ class RemoveLargeStorageEntriesAction extends Action2 {
                             label: key,
                             description: ByteSize.formatSize(value.length),
                             detail: ( localize(
-                                2821,
+                                2843,
                                 "Scope: {0}, Target: {1}",
-                                scope === StorageScope.APPLICATION ? ( localize(2822, "Global")) : scope === StorageScope.PROFILE ? ( localize(2823, "Profile")) : ( localize(2824, "Workspace")),
-                                target === StorageTarget.MACHINE ? ( localize(2825, "Machine")) : ( localize(2826, "User"))
+                                scope === StorageScope.APPLICATION ? ( localize(2844, "Global")) : scope === StorageScope.PROFILE ? ( localize(2845, "Profile")) : ( localize(2846, "Workspace")),
+                                target === StorageTarget.MACHINE ? ( localize(2847, "Machine")) : ( localize(2848, "User"))
                             ))
                         });
                     }
@@ -437,10 +437,10 @@ class RemoveLargeStorageEntriesAction extends Action2 {
             picker.ok = false;
             picker.customButton = true;
             picker.hideCheckAll = true;
-            picker.customLabel = ( localize(2827, "Remove"));
-            picker.placeholder = ( localize(2828, "Select large entries to remove from storage"));
+            picker.customLabel = ( localize(2849, "Remove"));
+            picker.placeholder = ( localize(2850, "Select large entries to remove from storage"));
             if (items.length === 0) {
-                picker.description = ( localize(2829, "There are no large storage entries to remove."));
+                picker.description = ( localize(2851, "There are no large storage entries to remove."));
             }
             picker.show();
             disposables.add(picker.onDidCustom(() => {
@@ -457,15 +457,15 @@ class RemoveLargeStorageEntriesAction extends Action2 {
         } = await dialogService.confirm({
             type: "warning",
             message: ( localize(
-                2830,
+                2852,
                 "Do you want to remove the selected storage entries from the database?"
             )),
             detail: ( localize(
-                2831,
+                2853,
                 "{0}\n\nThis action is irreversible and may result in data loss!",
                 ( selectedItems.map(item => item.label)).join("\n")
             )),
-            primaryButton: ( localize(2832, "&&Remove"))
+            primaryButton: ( localize(2854, "&&Remove"))
         });
         if (!confirmed) {
             return;
@@ -487,7 +487,7 @@ class StartTrackDisposables extends Action2 {
     constructor() {
         super({
             id: "workbench.action.startTrackDisposables",
-            title: ( localize2(2833, "Start Tracking Disposables")),
+            title: ( localize2(2855, "Start Tracking Disposables")),
             category: Categories.Developer,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ( DisposablesSnapshotStateContext.isEqualTo("pending")).negate()), ( ( DisposablesSnapshotStateContext.isEqualTo("started")).negate())))
@@ -505,7 +505,7 @@ class SnapshotTrackedDisposables extends Action2 {
     constructor() {
         super({
             id: "workbench.action.snapshotTrackedDisposables",
-            title: ( localize2(2834, "Snapshot Tracked Disposables")),
+            title: ( localize2(2856, "Snapshot Tracked Disposables")),
             category: Categories.Developer,
             f1: true,
             precondition: ( DisposablesSnapshotStateContext.isEqualTo("started"))
@@ -523,7 +523,7 @@ class StopTrackDisposables extends Action2 {
     constructor() {
         super({
             id: "workbench.action.stopTrackDisposables",
-            title: ( localize2(2835, "Stop Tracking Disposables")),
+            title: ( localize2(2857, "Stop Tracking Disposables")),
             category: Categories.Developer,
             f1: true,
             precondition: ( DisposablesSnapshotStateContext.isEqualTo("pending"))
@@ -557,7 +557,7 @@ class PolicyDiagnosticsAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.showPolicyDiagnostics",
-            title: ( localize2(2836, "Policy Diagnostics")),
+            title: ( localize2(2858, "Policy Diagnostics")),
             category: Categories.Developer,
             f1: true
         });
@@ -791,7 +791,7 @@ class SyncAccountPolicyAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.syncAccountPolicy",
-            title: ( localize2(2837, "Sync Account Policy")),
+            title: ( localize2(2859, "Sync Account Policy")),
             category: Categories.Developer,
             f1: true
         });
@@ -805,10 +805,10 @@ class SyncAccountPolicyAction extends Action2 {
             await defaultAccountService.refresh({
                 forceRefresh: true
             });
-            await dialogService.info(( localize(2838, "Account policy has been synced.")));
+            await dialogService.info(( localize(2860, "Account policy has been synced.")));
         } catch (error) {
             logService.error("[DefaultAccount] Failed to sync account policy", error);
-            await dialogService.error(( localize(2839, "Failed to sync account policy.")), error instanceof Error ? error.message : String(error));
+            await dialogService.error(( localize(2861, "Failed to sync account policy.")), error instanceof Error ? error.message : String(error));
         }
     }
 }
@@ -828,7 +828,7 @@ const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: "screencastMode",
     order: 9,
-    title: ( localize(2840, "Screencast Mode")),
+    title: ( localize(2862, "Screencast Mode")),
     type: "object",
     properties: {
         "screencastMode.verticalOffset": {
@@ -837,7 +837,7 @@ configurationRegistry.registerConfiguration({
             minimum: 0,
             maximum: 90,
             description: ( localize(
-                2841,
+                2863,
                 "Controls the vertical offset of the screencast mode overlay from the bottom as a percentage of the workbench height."
             ))
         },
@@ -847,38 +847,38 @@ configurationRegistry.registerConfiguration({
             minimum: 20,
             maximum: 100,
             description: ( localize(
-                2842,
+                2864,
                 "Controls the font size (in pixels) of the screencast mode keyboard."
             ))
         },
         "screencastMode.keyboardOptions": {
             type: "object",
-            description: ( localize(2843, "Options for customizing the keyboard overlay in screencast mode.")),
+            description: ( localize(2865, "Options for customizing the keyboard overlay in screencast mode.")),
             properties: {
                 "showKeys": {
                     type: "boolean",
                     default: true,
-                    description: ( localize(2844, "Show raw keys."))
+                    description: ( localize(2866, "Show raw keys."))
                 },
                 "showKeybindings": {
                     type: "boolean",
                     default: true,
-                    description: ( localize(2845, "Show keyboard shortcuts."))
+                    description: ( localize(2867, "Show keyboard shortcuts."))
                 },
                 "showCommands": {
                     type: "boolean",
                     default: true,
-                    description: ( localize(2846, "Show command names."))
+                    description: ( localize(2868, "Show command names."))
                 },
                 "showCommandGroups": {
                     type: "boolean",
                     default: false,
-                    description: ( localize(2847, "Show command group names, when commands are also shown."))
+                    description: ( localize(2869, "Show command group names, when commands are also shown."))
                 },
                 "showSingleEditorCursorMoves": {
                     type: "boolean",
                     default: true,
-                    description: ( localize(2848, "Show single editor cursor move commands."))
+                    description: ( localize(2870, "Show single editor cursor move commands."))
                 }
             },
             default: {
@@ -896,7 +896,7 @@ configurationRegistry.registerConfiguration({
             minimum: 500,
             maximum: 5000,
             description: ( localize(
-                2849,
+                2871,
                 "Controls how long (in milliseconds) the keyboard overlay is shown in screencast mode."
             ))
         },
@@ -905,7 +905,7 @@ configurationRegistry.registerConfiguration({
             format: "color-hex",
             default: "#FF0000",
             description: ( localize(
-                2850,
+                2872,
                 "Controls the color in hex (#RGB, #RGBA, #RRGGBB or #RRGGBBAA) of the mouse indicator in screencast mode."
             ))
         },
@@ -915,7 +915,7 @@ configurationRegistry.registerConfiguration({
             minimum: 20,
             maximum: 100,
             description: ( localize(
-                2851,
+                2873,
                 "Controls the size (in pixels) of the mouse indicator in screencast mode."
             ))
         }