@codingame/monaco-vscode-api 17.2.1 → 18.0.0

package/vscode/src/vs/workbench/services/host/browser/host.service.d.ts

@@ -1,7 +1,6 @@
 import { VSBuffer } from "../../../../base/common/buffer.js";
-import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
-import { IElementData } from "../../../../platform/native/common/native.js";
+import { FocusMode } from "@codingame/monaco-vscode-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/platform/native/common/native";
 import { IOpenEmptyWindowOptions, IWindowOpenable, IOpenWindowOptions, IPoint, IRectangle } from "../../../../platform/window/common/window.js";
 export declare const IHostService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IHostService>;
 export interface IHostService {
@@ -10,7 +9,7 @@ export interface IHostService {
     readonly hasFocus: boolean;
     hadLastFocus(): Promise<boolean>;
     focus(targetWindow: Window, options?: {
-        force: boolean;
+        mode?: FocusMode;
     }): Promise<void>;
     readonly onDidChangeActiveWindow: Event<number>;
     readonly onDidChangeFullScreen: Event<{
@@ -32,6 +31,5 @@ export interface IHostService {
     close(): Promise<void>;
     withExpectedShutdown<T>(expectedShutdownTask: () => Promise<T>): Promise<T>;
     getScreenshot(rect?: IRectangle): Promise<VSBuffer | undefined>;
-    getElementData(rect: IRectangle, token: CancellationToken): Promise<IElementData | undefined>;
     getNativeWindowHandle(windowId: number): Promise<VSBuffer | undefined>;
 }

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

@@ -23,25 +23,25 @@ import { isString } from '../../../../base/common/types.js';
 const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'languages',
     jsonSchema: {
-        description: ( localize(12449, 'Contributes language declarations.')),
+        description: ( localize(12731, '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(12450, 'ID of the language.')),
+                    description: ( localize(12732, 'ID of the language.')),
                     type: 'string'
                 },
                 aliases: {
-                    description: ( localize(12451, 'Name aliases for the language.')),
+                    description: ( localize(12733, 'Name aliases for the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 extensions: {
-                    description: ( localize(12452, 'File extensions associated to the language.')),
+                    description: ( localize(12734, 'File extensions associated to the language.')),
                     default: ['.foo'],
                     type: 'array',
                     items: {
@@ -49,21 +49,21 @@ const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
                     }
                 },
                 filenames: {
-                    description: ( localize(12453, 'File names associated to the language.')),
+                    description: ( localize(12735, 'File names associated to the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 filenamePatterns: {
-                    description: ( localize(12454, 'File name glob patterns associated to the language.')),
+                    description: ( localize(12736, 'File name glob patterns associated to the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 mimetypes: {
-                    description: ( localize(12455, 'Mime types associated to the language.')),
+                    description: ( localize(12737, 'Mime types associated to the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
@@ -71,14 +71,14 @@ const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 firstLine: {
                     description: ( localize(
-                        12456,
+                        12738,
                         'A regular expression matching the first line of a file of the language.'
                     )),
                     type: 'string'
                 },
                 configuration: {
                     description: ( localize(
-                        12457,
+                        12739,
                         'A relative path to a file containing configuration options for the language.'
                     )),
                     type: 'string',
@@ -87,16 +87,16 @@ const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 icon: {
                     type: 'object',
                     description: ( localize(
-                        12458,
+                        12740,
                         'A icon to use as file icon, if no icon theme provides one for the language.'
                     )),
                     properties: {
                         light: {
-                            description: ( localize(12459, 'Icon path when a light theme is used')),
+                            description: ( localize(12741, 'Icon path when a light theme is used')),
                             type: 'string'
                         },
                         dark: {
-                            description: ( localize(12460, 'Icon path when a dark theme is used')),
+                            description: ( localize(12742, 'Icon path when a dark theme is used')),
                             type: 'string'
                         }
                     }
@@ -170,11 +170,11 @@ class LanguageTableRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(12461, "ID")),
-            ( localize(12462, "Name")),
-            ( localize(12463, "File Extensions")),
-            ( localize(12464, "Grammar")),
-            ( localize(12465, "Snippets"))
+            ( localize(12743, "ID")),
+            ( localize(12744, "Name")),
+            ( localize(12745, "File Extensions")),
+            ( localize(12746, "Grammar")),
+            ( localize(12747, "Snippets"))
         ];
         const rows = ( languages.sort((a, b) => a.id.localeCompare(b.id))
             .map(l => {
@@ -196,7 +196,7 @@ class LanguageTableRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languages',
-    label: ( localize(12466, "Programming Languages")),
+    label: ( localize(12748, "Programming Languages")),
     access: {
         canToggle: false
     },
@@ -214,7 +214,7 @@ let WorkbenchLanguageService = class WorkbenchLanguageService extends LanguageSe
                 const extension = extensions[i];
                 if (!Array.isArray(extension.value)) {
                     extension.collector.error(( localize(
-                        12467,
+                        12749,
                         "Invalid `contributes.{0}`. Expected an array.",
                         languagesExtPoint.name
                     )));
@@ -294,16 +294,16 @@ function isUndefinedOrStringArray(value) {
 }
 function isValidLanguageExtensionPoint(value, collector) {
     if (!value) {
-        collector?.error(( localize(12468, "Empty value for `contributes.{0}`", languagesExtPoint.name)));
+        collector?.error(( localize(12750, "Empty value for `contributes.{0}`", languagesExtPoint.name)));
         return false;
     }
     if (typeof value.id !== 'string') {
-        collector?.error(( localize(12469, "property `{0}` is mandatory and must be of type `string`", 'id')));
+        collector?.error(( localize(12751, "property `{0}` is mandatory and must be of type `string`", 'id')));
         return false;
     }
     if (!isUndefinedOrStringArray(value.extensions)) {
         collector?.error(( localize(
-            12470,
+            12752,
             "property `{0}` can be omitted and must be of type `string[]`",
             'extensions'
         )));
@@ -311,7 +311,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (!isUndefinedOrStringArray(value.filenames)) {
         collector?.error(( localize(
-            12471,
+            12753,
             "property `{0}` can be omitted and must be of type `string[]`",
             'filenames'
         )));
@@ -319,7 +319,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (typeof value.firstLine !== 'undefined' && typeof value.firstLine !== 'string') {
         collector?.error(( localize(
-            12472,
+            12754,
             "property `{0}` can be omitted and must be of type `string`",
             'firstLine'
         )));
@@ -327,7 +327,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (typeof value.configuration !== 'undefined' && typeof value.configuration !== 'string') {
         collector?.error(( localize(
-            12473,
+            12755,
             "property `{0}` can be omitted and must be of type `string`",
             'configuration'
         )));
@@ -335,7 +335,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (!isUndefinedOrStringArray(value.aliases)) {
         collector?.error(( localize(
-            12474,
+            12756,
             "property `{0}` can be omitted and must be of type `string[]`",
             'aliases'
         )));
@@ -343,7 +343,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (!isUndefinedOrStringArray(value.mimetypes)) {
         collector?.error(( localize(
-            12475,
+            12757,
             "property `{0}` can be omitted and must be of type `string[]`",
             'mimetypes'
         )));
@@ -352,7 +352,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(
-                12476,
+                12758,
                 "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/layout/browser/layoutService.js

@@ -1,7 +1,7 @@
 
 import { isWeb, isMacintosh, isNative } from '../../../../base/common/platform.js';
 import { isAuxiliaryWindow } from '../../../../base/browser/window.js';
-import { hasNativeTitlebar, TitleBarSetting, CustomTitleBarVisibility, getMenuBarVisibility } from '../../../../platform/window/common/window.js';
+import { hasNativeTitlebar, TitleBarSetting, CustomTitleBarVisibility, hasNativeMenu, getMenuBarVisibility } from '../../../../platform/window/common/window.js';
 import { isFullscreen, isWCOEnabled } from '../../../../base/browser/browser.js';
 
 var Parts;
@@ -120,7 +120,7 @@ function shouldShowCustomTitleBar(configurationService, window, menuBarToggled)
     if (!isTitleBarEmpty(configurationService)) {
         return true;
     }
-    if (nativeTitleBarEnabled) {
+    if (nativeTitleBarEnabled && hasNativeMenu(configurationService)) {
         return false;
     }
     if (isMacintosh && isNative) {

package/vscode/src/vs/workbench/services/localization/common/locale.service.d.ts

@@ -1,4 +1,4 @@
-import { ILanguagePackItem } from "@codingame/monaco-vscode-912ff6c1-e6aa-58cf-bd7f-50cf27bdb591-common/vscode/vs/platform/languagePacks/common/languagePacks";
+import { ILanguagePackItem } from "@codingame/monaco-vscode-93784a59-b4cf-520c-8339-f8104d3a4f3e-common/vscode/vs/platform/languagePacks/common/languagePacks";
 export declare const ILocaleService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ILocaleService>;
 export interface ILocaleService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/services/log/common/logConstants.js

@@ -2,7 +2,7 @@
 import { localize } from '../../../../nls.js';
 
 const windowLogId = 'rendererLog';
-const windowLogGroup = { id: windowLogId, name: ( localize(12483, "Window")) };
+const windowLogGroup = { id: windowLogId, name: ( localize(12765, "Window")) };
 const showWindowLogActionId = 'workbench.action.showWindowLog';
 
 export { showWindowLogActionId, windowLogGroup, windowLogId };

package/vscode/src/vs/workbench/services/outline/browser/outline.service.d.ts

@@ -2,7 +2,7 @@ import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { IEditorPane } from "../../../common/editor.js";
-import { OutlineTarget, IOutline, IOutlineCreator } from "@codingame/monaco-vscode-0f262ee3-cace-5644-818e-eba5fe007685-common/vscode/vs/workbench/services/outline/browser/outline";
+import { OutlineTarget, IOutline, IOutlineCreator } from "@codingame/monaco-vscode-0094ae09-a688-53e7-bacc-93e26f7f49db-common/vscode/vs/workbench/services/outline/browser/outline";
 export declare const IOutlineService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IOutlineService>;
 export interface IOutlineService {
     _serviceBrand: undefined;

package/vscode/src/vs/workbench/services/preferences/common/preferences.service.d.ts

@@ -3,7 +3,7 @@ import { URI } from "../../../../base/common/uri.js";
 import { ConfigurationTarget } from "../../../../platform/configuration/common/configuration.js";
 import { IEditorPane } from "../../../common/editor.js";
 import { EditorInput } from "../../../common/editor/editorInput.js";
-import { IPreferencesEditorModel, ISetting, IOpenSettingsOptions, IOpenKeybindingsEditorOptions } from "@codingame/monaco-vscode-4a0e04a7-c3bd-5fb7-9d3b-4fd047cc9e59-common/vscode/vs/workbench/services/preferences/common/preferences";
+import { IPreferencesEditorModel, ISetting, IOpenSettingsOptions, IOpenKeybindingsEditorOptions } from "@codingame/monaco-vscode-c87fff3a-2aa9-52ab-ba4d-17e8d1e5e185-common/vscode/vs/workbench/services/preferences/common/preferences";
 import { Settings2EditorModel } from "@codingame/monaco-vscode-preferences-service-override/vscode/vs/workbench/services/preferences/common/preferencesModels";
 export declare const IPreferencesService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IPreferencesService>;
 export interface IPreferencesService {
@@ -16,6 +16,7 @@ export interface IPreferencesService {
     getDefaultSettingsContent(uri: URI): string | undefined;
     hasDefaultSettingsContent(uri: URI): boolean;
     createSettings2EditorModel(): Settings2EditorModel;
+    openPreferences(): Promise<void>;
     openRawDefaultSettings(): Promise<IEditorPane | undefined>;
     openSettings(options?: IOpenSettingsOptions): Promise<IEditorPane | undefined>;
     openApplicationSettings(options?: IOpenSettingsOptions): Promise<IEditorPane | undefined>;

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

@@ -38,7 +38,7 @@ const getStartedWalkthrough = {
     required: ['id'],
     properties: {
         id: {
-            description: ( localize(12539, 'The ID of a Get Started walkthrough to open.')),
+            description: ( localize(12823, 'The ID of a Get Started walkthrough to open.')),
             type: 'string'
         },
     }
@@ -46,12 +46,12 @@ const getStartedWalkthrough = {
 const remoteHelpExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'remoteHelp',
     jsonSchema: {
-        description: ( localize(12540, 'Contributes help information for Remote')),
+        description: ( localize(12824, 'Contributes help information for Remote')),
         type: 'object',
         properties: {
             'getStarted': {
                 description: ( localize(
-                    12541,
+                    12825,
                     "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: [
@@ -61,29 +61,29 @@ const remoteHelpExtPoint = ExtensionsRegistry.registerExtensionPoint({
             },
             'documentation': {
                 description: ( localize(
-                    12542,
+                    12826,
                     "The url, or a command that returns the url, to your project's documentation page"
                 )),
                 type: 'string'
             },
             'feedback': {
                 description: ( localize(
-                    12543,
+                    12827,
                     "The url, or a command that returns the url, to your project's feedback reporter"
                 )),
                 type: 'string',
-                markdownDeprecationMessage: ( localize(12544, "Use {0} instead", '`reportIssue`'))
+                markdownDeprecationMessage: ( localize(12828, "Use {0} instead", '`reportIssue`'))
             },
             'reportIssue': {
                 description: ( localize(
-                    12545,
+                    12829,
                     "The url, or a command that returns the url, to your project's issue reporter"
                 )),
                 type: 'string'
             },
             'issues': {
                 description: ( localize(
-                    12546,
+                    12830,
                     "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

@@ -28,8 +28,8 @@ 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 forwardedPortsFeaturesEnabled = ( new RawContextKey('forwardedPortsViewEnabled', false, ( localize(12547, "Whether the Ports view is enabled."))));
-const forwardedPortsViewEnabled = ( new RawContextKey('forwardedPortsViewOnlyEnabled', false, ( localize(12547, "Whether the Ports view is enabled."))));
+const forwardedPortsFeaturesEnabled = ( new RawContextKey('forwardedPortsViewEnabled', false, ( localize(12831, "Whether the Ports view is enabled."))));
+const forwardedPortsViewEnabled = ( new RawContextKey('forwardedPortsViewOnlyEnabled', false, ( localize(12831, "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) {
@@ -51,11 +51,11 @@ var TunnelSource;
 })(TunnelSource || (TunnelSource = {}));
 const UserTunnelSource = {
     source: TunnelSource.User,
-    description: ( localize(12548, "User Forwarded"))
+    description: ( localize(12832, "User Forwarded"))
 };
 const AutoTunnelSource = {
     source: TunnelSource.Auto,
-    description: ( localize(12549, "Auto Forwarded"))
+    description: ( localize(12833, "Auto Forwarded"))
 };
 function mapHasAddress(map, host, port) {
     const initialAddress = map.get(makeAddress(host, port));
@@ -569,7 +569,7 @@ let TunnelModel = class TunnelModel extends Disposable {
         }
         this.mismatchCooldown = newCooldown;
         const mismatchString = ( localize(
-            12550,
+            12834,
             "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,
@@ -736,7 +736,7 @@ let TunnelModel = class TunnelModel extends Disposable {
                     privacy: TunnelPrivacyId.ConstantPrivate,
                     source: {
                         source: TunnelSource.Extension,
-                        description: ( localize(12551, "Statically Forwarded"))
+                        description: ( localize(12835, "Statically Forwarded"))
                     }
                 });
                 this.tunnelService.setEnvironmentTunnel(tunnel.remoteAddress.host, tunnel.remoteAddress.port, localAddress, TunnelPrivacyId.ConstantPrivate, TunnelProtocol.Http);

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

@@ -354,7 +354,7 @@ let QueryBuilder = class QueryBuilder {
             else {
                 const probableWorkspaceFolderNameMatch = searchPath.match(/\.[\/\\](.+)[\/\\]?/);
                 const probableWorkspaceFolderName = probableWorkspaceFolderNameMatch ? probableWorkspaceFolderNameMatch[1] : searchPath;
-                const searchPathNotFoundError = ( localize(12555, "Workspace folder does not exist: {0}", probableWorkspaceFolderName));
+                const searchPathNotFoundError = ( localize(12839, "Workspace folder does not exist: {0}", probableWorkspaceFolderName));
                 throw ( new Error(searchPathNotFoundError));
             }
         }

package/vscode/src/vs/workbench/services/search/common/search.d.ts

@@ -139,8 +139,9 @@ export declare function resultIsMatch(result: ITextSearchResult): result is ITex
 export interface IProgressMessage {
     message: string;
 }
-export type ISearchProgressItem = IFileMatch | IProgressMessage;
+export type ISearchProgressItem = IFileMatch | IProgressMessage | AISearchKeyword;
 export declare function isFileMatch(p: ISearchProgressItem): p is IFileMatch;
+export declare function isAIKeyword(p: ISearchProgressItem): p is AISearchKeyword;
 export declare function isProgressMessage(p: ISearchProgressItem | ISerializedSearchProgressItem): p is IProgressMessage;
 export interface ITextSearchCompleteMessage {
     text: string;
@@ -225,6 +226,11 @@ export declare enum SearchSortOrder {
     CountDescending = "countDescending",
     CountAscending = "countAscending"
 }
+export declare enum SemanticSearchBehavior {
+    Auto = "auto",
+    Manual = "manual",
+    RunOnEmpty = "runOnEmpty"
+}
 export interface ISearchConfigurationProperties {
     exclude: glob.IExpression;
     useRipgrep: boolean;
@@ -267,6 +273,10 @@ export interface ISearchConfigurationProperties {
     experimental: {
         closedNotebookRichContentResults: boolean;
     };
+    searchView: {
+        semanticSearchBehavior: string;
+        keywordSuggestions: boolean;
+    };
 }
 export interface ISearchConfiguration extends IFilesConfiguration {
     search: ISearchConfigurationProperties;

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

@@ -35,6 +35,9 @@ function resultIsMatch(result) {
 function isFileMatch(p) {
     return !!p.resource;
 }
+function isAIKeyword(p) {
+    return !!p.keyword;
+}
 function isProgressMessage(p) {
     return !!p.message;
 }
@@ -131,6 +134,12 @@ var SearchSortOrder;
     SearchSortOrder["CountDescending"] = "countDescending";
     SearchSortOrder["CountAscending"] = "countAscending";
 })(SearchSortOrder || (SearchSortOrder = {}));
+var SemanticSearchBehavior;
+(function (SemanticSearchBehavior) {
+    SemanticSearchBehavior["Auto"] = "auto";
+    SemanticSearchBehavior["Manual"] = "manual";
+    SemanticSearchBehavior["RunOnEmpty"] = "runOnEmpty";
+})(SemanticSearchBehavior || (SemanticSearchBehavior = {}));
 function getExcludes(configuration, includeSearchExcludes = true) {
     const fileExcludes = configuration && configuration.files && configuration.files.exclude;
     const searchExcludes = includeSearchExcludes && configuration && configuration.search && configuration.search.exclude;
@@ -342,4 +351,4 @@ const DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS = {
     charsPerLine: 10000
 };
 
-export { DEFAULT_MAX_SEARCH_RESULTS, DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS, FileMatch, OneLineRange, QueryGlobTester, QueryType, SEARCH_EXCLUDE_CONFIG, SEARCH_RESULT_LANGUAGE_ID, SearchCompletionExitCode, SearchError, SearchErrorCode, SearchProviderType, SearchRange, SearchSortOrder, TextSearchMatch, VIEWLET_ID, VIEW_ID, ViewMode, deserializeSearchError, excludeToGlobPattern, getExcludes, hasSiblingFn, hasSiblingPromiseFn, isFileMatch, isProgressMessage, pathIncludedInQuery, resolvePatternsForProvider, resultIsMatch };
+export { DEFAULT_MAX_SEARCH_RESULTS, DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS, FileMatch, OneLineRange, QueryGlobTester, QueryType, SEARCH_EXCLUDE_CONFIG, SEARCH_RESULT_LANGUAGE_ID, SearchCompletionExitCode, SearchError, SearchErrorCode, SearchProviderType, SearchRange, SearchSortOrder, SemanticSearchBehavior, TextSearchMatch, VIEWLET_ID, VIEW_ID, ViewMode, deserializeSearchError, excludeToGlobPattern, getExcludes, hasSiblingFn, hasSiblingPromiseFn, isAIKeyword, isFileMatch, isProgressMessage, pathIncludedInQuery, resolvePatternsForProvider, resultIsMatch };

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

@@ -303,7 +303,7 @@ class BatchedCollector {
             this.batchSize = 0;
             if (this.timeoutHandle) {
                 clearTimeout(this.timeoutHandle);
-                this.timeoutHandle = 0;
+                this.timeoutHandle = undefined;
             }
         }
     }

package/vscode/src/vs/workbench/services/statusbar/browser/statusbar.service.d.ts

@@ -1,9 +1,10 @@
 import { DisposableStore } from "../../../../base/common/lifecycle.js";
+import { type IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
 import { IStatusbarEntryContainer, IAuxiliaryStatusbarPart } from "@codingame/monaco-vscode-view-status-bar-service-override/vscode/vs/workbench/browser/parts/statusbar/statusbarPart";
 export declare const IStatusbarService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IStatusbarService>;
 export interface IStatusbarService extends IStatusbarEntryContainer {
     readonly _serviceBrand: undefined;
     getPart(container: HTMLElement): IStatusbarEntryContainer;
-    createAuxiliaryStatusbarPart(container: HTMLElement): IAuxiliaryStatusbarPart;
+    createAuxiliaryStatusbarPart(container: HTMLElement, instantiationService: IInstantiationService): IAuxiliaryStatusbarPart;
     createScoped(statusbarEntryContainer: IStatusbarEntryContainer, disposables: DisposableStore): IStatusbarService;
 }

package/vscode/src/vs/workbench/services/textfile/common/textfiles.d.ts

@@ -6,7 +6,7 @@ import { IBaseFileStatWithMetadata, IFileStatWithMetadata, IWriteFileOptions, Fi
 import { ITextEditorModel } from "@codingame/monaco-vscode-model-service-override/vscode/vs/editor/common/services/resolverService";
 import { ITextBufferFactory, ITextModel, ITextSnapshot } from "../../../../editor/common/model.js";
 import { VSBuffer, VSBufferReadable } from "../../../../base/common/buffer.js";
-import { IWorkingCopy, IWorkingCopySaveEvent } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopy, IWorkingCopySaveEvent } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { IProgress, IProgressStep } from "../../../../platform/progress/common/progress.js";
 export interface IReadTextFileEncodingOptions {