@codingame/monaco-vscode-api 4.4.0 → 4.5.0-improve-code-splitting.1

package/vscode/src/vs/platform/storage/common/storage.d.ts

@@ -1,9 +1,9 @@
-import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
 import { Event } from '../../../base/common/event.js';
-import { DisposableStore, Disposable } from '../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { StorageValue, IStorageChangeEvent, IStorage } from '../../../base/parts/storage/common/storage.js';
 import { IUserDataProfile } from '../../userDataProfile/common/userDataProfile.js';
 import { IAnyWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { IStorageService } from './storage.service.js';
 
 declare enum WillSaveStateReason {
     /**
@@ -33,154 +33,6 @@ interface IProfileStorageValueChangeEvent extends IStorageValueChangeEvent {
 interface IApplicationStorageValueChangeEvent extends IStorageValueChangeEvent {
     readonly scope: StorageScope.APPLICATION;
 }
-declare const IStorageService: ServiceIdentifier<IStorageService>;
-interface IStorageService {
-    readonly _serviceBrand: undefined;
-    /**
-     * Emitted whenever data is updated or deleted on the given
-     * scope and optional key.
-     *
-     * @param scope the `StorageScope` to listen to changes
-     * @param key the optional key to filter for or all keys of
-     * the scope if `undefined`
-     */
-    onDidChangeValue(scope: StorageScope.WORKSPACE, key: string | undefined, disposable: DisposableStore): Event<IWorkspaceStorageValueChangeEvent>;
-    onDidChangeValue(scope: StorageScope.PROFILE, key: string | undefined, disposable: DisposableStore): Event<IProfileStorageValueChangeEvent>;
-    onDidChangeValue(scope: StorageScope.APPLICATION, key: string | undefined, disposable: DisposableStore): Event<IApplicationStorageValueChangeEvent>;
-    onDidChangeValue(scope: StorageScope, key: string | undefined, disposable: DisposableStore): Event<IStorageValueChangeEvent>;
-    /**
-     * Emitted whenever target of a storage entry changes.
-     */
-    readonly onDidChangeTarget: Event<IStorageTargetChangeEvent>;
-    /**
-     * Emitted when the storage is about to persist. This is the right time
-     * to persist data to ensure it is stored before the application shuts
-     * down.
-     *
-     * The will save state event allows to optionally ask for the reason of
-     * saving the state, e.g. to find out if the state is saved due to a
-     * shutdown.
-     *
-     * Note: this event may be fired many times, not only on shutdown to prevent
-     * loss of state in situations where the shutdown is not sufficient to
-     * persist the data properly.
-     */
-    readonly onWillSaveState: Event<IWillSaveStateEvent>;
-    /**
-     * Retrieve an element stored with the given key from storage. Use
-     * the provided `defaultValue` if the element is `null` or `undefined`.
-     *
-     * @param scope allows to define the scope of the storage operation
-     * to either the current workspace only, all workspaces or all profiles.
-     */
-    get(key: string, scope: StorageScope, fallbackValue: string): string;
-    get(key: string, scope: StorageScope, fallbackValue?: string): string | undefined;
-    /**
-     * Retrieve an element stored with the given key from storage. Use
-     * the provided `defaultValue` if the element is `null` or `undefined`.
-     * The element will be converted to a `boolean`.
-     *
-     * @param scope allows to define the scope of the storage operation
-     * to either the current workspace only, all workspaces or all profiles.
-     */
-    getBoolean(key: string, scope: StorageScope, fallbackValue: boolean): boolean;
-    getBoolean(key: string, scope: StorageScope, fallbackValue?: boolean): boolean | undefined;
-    /**
-     * Retrieve an element stored with the given key from storage. Use
-     * the provided `defaultValue` if the element is `null` or `undefined`.
-     * The element will be converted to a `number` using `parseInt` with a
-     * base of `10`.
-     *
-     * @param scope allows to define the scope of the storage operation
-     * to either the current workspace only, all workspaces or all profiles.
-     */
-    getNumber(key: string, scope: StorageScope, fallbackValue: number): number;
-    getNumber(key: string, scope: StorageScope, fallbackValue?: number): number | undefined;
-    /**
-     * Retrieve an element stored with the given key from storage. Use
-     * the provided `defaultValue` if the element is `null` or `undefined`.
-     * The element will be converted to a `object` using `JSON.parse`.
-     *
-     * @param scope allows to define the scope of the storage operation
-     * to either the current workspace only, all workspaces or all profiles.
-     */
-    getObject<T extends object>(key: string, scope: StorageScope, fallbackValue: T): T;
-    getObject<T extends object>(key: string, scope: StorageScope, fallbackValue?: T): T | undefined;
-    /**
-     * Store a value under the given key to storage. The value will be
-     * converted to a `string`. Storing either `undefined` or `null` will
-     * remove the entry under the key.
-     *
-     * @param scope allows to define the scope of the storage operation
-     * to either the current workspace only, all workspaces or all profiles.
-     *
-     * @param target allows to define the target of the storage operation
-     * to either the current machine or user.
-     */
-    store(key: string, value: StorageValue, scope: StorageScope, target: StorageTarget): void;
-    /**
-     * Allows to store multiple values in a bulk operation. Events will only
-     * be emitted when all values have been stored.
-     *
-     * @param external a hint to indicate the source of the operation is external,
-     * such as settings sync or profile changes.
-     */
-    storeAll(entries: Array<IStorageEntry>, external: boolean): void;
-    /**
-     * Delete an element stored under the provided key from storage.
-     *
-     * The scope argument allows to define the scope of the storage
-     * operation to either the current workspace only, all workspaces
-     * or all profiles.
-     */
-    remove(key: string, scope: StorageScope): void;
-    /**
-     * Returns all the keys used in the storage for the provided `scope`
-     * and `target`.
-     *
-     * Note: this will NOT return all keys stored in the storage layer.
-     * Some keys may not have an associated `StorageTarget` and thus
-     * will be excluded from the results.
-     *
-     * @param scope allows to define the scope for the keys
-     * to either the current workspace only, all workspaces or all profiles.
-     *
-     * @param target allows to define the target for the keys
-     * to either the current machine or user.
-     */
-    keys(scope: StorageScope, target: StorageTarget): string[];
-    /**
-     * Log the contents of the storage to the console.
-     */
-    log(): void;
-    /**
-     * Returns true if the storage service handles the provided scope.
-     */
-    hasScope(scope: IAnyWorkspaceIdentifier | IUserDataProfile): boolean;
-    /**
-     * Switch storage to another workspace or profile. Optionally preserve the
-     * current data to the new storage.
-     */
-    switch(to: IAnyWorkspaceIdentifier | IUserDataProfile, preserveData: boolean): Promise<void>;
-    /**
-     * Whether the storage for the given scope was created during this session or
-     * existed before.
-     */
-    isNew(scope: StorageScope): boolean;
-    /**
-     * Attempts to reduce the DB size via optimization commands if supported.
-     */
-    optimize(scope: StorageScope): Promise<void>;
-    /**
-     * Allows to flush state, e.g. in cases where a shutdown is
-     * imminent. This will send out the `onWillSaveState` to ask
-     * everyone for latest state.
-     *
-     * @returns a `Promise` that can be awaited on when all updates
-     * to the underlying storage have been flushed.
-     */
-    flush(reason?: WillSaveStateReason): Promise<void>;
-}
 declare const enum StorageScope {
     /**
      * The stored data will be scoped to all workspaces across all profiles.
@@ -300,4 +152,4 @@ declare abstract class AbstractStorageService extends Disposable implements ISto
     protected abstract switchToWorkspace(toWorkspace: IAnyWorkspaceIdentifier | IUserDataProfile, preserveData: boolean): Promise<void>;
 }
 
-export { AbstractStorageService, type IApplicationStorageValueChangeEvent, type IProfileStorageValueChangeEvent, type IStorageEntry, IStorageService, type IStorageServiceOptions, type IStorageTargetChangeEvent, type IStorageValueChangeEvent, type IWillSaveStateEvent, type IWorkspaceStorageValueChangeEvent, StorageScope, StorageTarget, WillSaveStateReason };
+export { AbstractStorageService, type IApplicationStorageValueChangeEvent, type IProfileStorageValueChangeEvent, type IStorageEntry, type IStorageServiceOptions, type IStorageTargetChangeEvent, type IStorageValueChangeEvent, type IWillSaveStateEvent, type IWorkspaceStorageValueChangeEvent, StorageScope, StorageTarget, WillSaveStateReason };

package/vscode/src/vs/platform/storage/common/storage.js

@@ -4,11 +4,9 @@ import { Disposable, MutableDisposable, dispose } from '../../../base/common/lif
 import { mark } from '../../../base/common/performance.js';
 import { isUndefinedOrNull } from '../../../base/common/types.js';
 import { Storage, InMemoryStorageDatabase, StorageHint } from '../../../base/parts/storage/common/storage.js';
-import { createDecorator } from '../../instantiation/common/instantiation.js';
 import { isUserDataProfile } from '../../userDataProfile/common/userDataProfile.js';
 const IS_NEW_KEY = '__$__isNewStorageMarker';
 const TARGET_KEY = '__$__targetStorageMarker';
-const IStorageService = ( createDecorator('storageService'));
 var WillSaveStateReason;
 ( (function(WillSaveStateReason) {
     WillSaveStateReason[WillSaveStateReason["NONE"] = 0] = "NONE";
@@ -384,4 +382,4 @@ async function logStorage(application, profile, workspace, applicationPath, prof
     console.groupEnd();
     console.log(workspaceItemsParsed);
 }
-export { AbstractStorageService, IS_NEW_KEY, IStorageService, InMemoryStorageService, StorageScope, StorageTarget, TARGET_KEY, WillSaveStateReason, isProfileUsingDefaultStorage, loadKeyTargets, logStorage };
+export { AbstractStorageService, IS_NEW_KEY, InMemoryStorageService, StorageScope, StorageTarget, TARGET_KEY, WillSaveStateReason, isProfileUsingDefaultStorage, loadKeyTargets, logStorage };

package/vscode/src/vs/platform/storage/common/storage.service.d.ts

@@ -0,0 +1,158 @@
+import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
+import { Event } from '../../../base/common/event.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { StorageValue } from '../../../base/parts/storage/common/storage.js';
+import { IUserDataProfile } from '../../userDataProfile/common/userDataProfile.js';
+import { IAnyWorkspaceIdentifier } from '../../workspace/common/workspace.js';
+import { StorageScope, IWorkspaceStorageValueChangeEvent, IProfileStorageValueChangeEvent, IApplicationStorageValueChangeEvent, IStorageValueChangeEvent, IStorageTargetChangeEvent, IWillSaveStateEvent, StorageTarget, IStorageEntry, WillSaveStateReason } from './storage.js';
+
+declare const IStorageService: ServiceIdentifier<IStorageService>;
+interface IStorageService {
+    readonly _serviceBrand: undefined;
+    /**
+    * Emitted whenever data is updated or deleted on the given
+    * scope and optional key.
+    *
+    * @param scope the `StorageScope` to listen to changes
+    * @param key the optional key to filter for or all keys of
+    * the scope if `undefined`
+    */
+    onDidChangeValue(scope: StorageScope.WORKSPACE, key: string | undefined, disposable: DisposableStore): Event<IWorkspaceStorageValueChangeEvent>;
+    onDidChangeValue(scope: StorageScope.PROFILE, key: string | undefined, disposable: DisposableStore): Event<IProfileStorageValueChangeEvent>;
+    onDidChangeValue(scope: StorageScope.APPLICATION, key: string | undefined, disposable: DisposableStore): Event<IApplicationStorageValueChangeEvent>;
+    onDidChangeValue(scope: StorageScope, key: string | undefined, disposable: DisposableStore): Event<IStorageValueChangeEvent>;
+    /**
+    * Emitted whenever target of a storage entry changes.
+    */
+    readonly onDidChangeTarget: Event<IStorageTargetChangeEvent>;
+    /**
+    * Emitted when the storage is about to persist. This is the right time
+    * to persist data to ensure it is stored before the application shuts
+    * down.
+    *
+    * The will save state event allows to optionally ask for the reason of
+    * saving the state, e.g. to find out if the state is saved due to a
+    * shutdown.
+    *
+    * Note: this event may be fired many times, not only on shutdown to prevent
+    * loss of state in situations where the shutdown is not sufficient to
+    * persist the data properly.
+    */
+    readonly onWillSaveState: Event<IWillSaveStateEvent>;
+    /**
+    * Retrieve an element stored with the given key from storage. Use
+    * the provided `defaultValue` if the element is `null` or `undefined`.
+    *
+    * @param scope allows to define the scope of the storage operation
+    * to either the current workspace only, all workspaces or all profiles.
+    */
+    get(key: string, scope: StorageScope, fallbackValue: string): string;
+    get(key: string, scope: StorageScope, fallbackValue?: string): string | undefined;
+    /**
+    * Retrieve an element stored with the given key from storage. Use
+    * the provided `defaultValue` if the element is `null` or `undefined`.
+    * The element will be converted to a `boolean`.
+    *
+    * @param scope allows to define the scope of the storage operation
+    * to either the current workspace only, all workspaces or all profiles.
+    */
+    getBoolean(key: string, scope: StorageScope, fallbackValue: boolean): boolean;
+    getBoolean(key: string, scope: StorageScope, fallbackValue?: boolean): boolean | undefined;
+    /**
+    * Retrieve an element stored with the given key from storage. Use
+    * the provided `defaultValue` if the element is `null` or `undefined`.
+    * The element will be converted to a `number` using `parseInt` with a
+    * base of `10`.
+    *
+    * @param scope allows to define the scope of the storage operation
+    * to either the current workspace only, all workspaces or all profiles.
+    */
+    getNumber(key: string, scope: StorageScope, fallbackValue: number): number;
+    getNumber(key: string, scope: StorageScope, fallbackValue?: number): number | undefined;
+    /**
+    * Retrieve an element stored with the given key from storage. Use
+    * the provided `defaultValue` if the element is `null` or `undefined`.
+    * The element will be converted to a `object` using `JSON.parse`.
+    *
+    * @param scope allows to define the scope of the storage operation
+    * to either the current workspace only, all workspaces or all profiles.
+    */
+    getObject<T extends object>(key: string, scope: StorageScope, fallbackValue: T): T;
+    getObject<T extends object>(key: string, scope: StorageScope, fallbackValue?: T): T | undefined;
+    /**
+    * Store a value under the given key to storage. The value will be
+    * converted to a `string`. Storing either `undefined` or `null` will
+    * remove the entry under the key.
+    *
+    * @param scope allows to define the scope of the storage operation
+    * to either the current workspace only, all workspaces or all profiles.
+    *
+    * @param target allows to define the target of the storage operation
+    * to either the current machine or user.
+    */
+    store(key: string, value: StorageValue, scope: StorageScope, target: StorageTarget): void;
+    /**
+    * Allows to store multiple values in a bulk operation. Events will only
+    * be emitted when all values have been stored.
+    *
+    * @param external a hint to indicate the source of the operation is external,
+    * such as settings sync or profile changes.
+    */
+    storeAll(entries: Array<IStorageEntry>, external: boolean): void;
+    /**
+    * Delete an element stored under the provided key from storage.
+    *
+    * The scope argument allows to define the scope of the storage
+    * operation to either the current workspace only, all workspaces
+    * or all profiles.
+    */
+    remove(key: string, scope: StorageScope): void;
+    /**
+    * Returns all the keys used in the storage for the provided `scope`
+    * and `target`.
+    *
+    * Note: this will NOT return all keys stored in the storage layer.
+    * Some keys may not have an associated `StorageTarget` and thus
+    * will be excluded from the results.
+    *
+    * @param scope allows to define the scope for the keys
+    * to either the current workspace only, all workspaces or all profiles.
+    *
+    * @param target allows to define the target for the keys
+    * to either the current machine or user.
+    */
+    keys(scope: StorageScope, target: StorageTarget): string[];
+    /**
+    * Log the contents of the storage to the console.
+    */
+    log(): void;
+    /**
+    * Returns true if the storage service handles the provided scope.
+    */
+    hasScope(scope: IAnyWorkspaceIdentifier | IUserDataProfile): boolean;
+    /**
+    * Switch storage to another workspace or profile. Optionally preserve the
+    * current data to the new storage.
+    */
+    switch(to: IAnyWorkspaceIdentifier | IUserDataProfile, preserveData: boolean): Promise<void>;
+    /**
+    * Whether the storage for the given scope was created during this session or
+    * existed before.
+    */
+    isNew(scope: StorageScope): boolean;
+    /**
+    * Attempts to reduce the DB size via optimization commands if supported.
+    */
+    optimize(scope: StorageScope): Promise<void>;
+    /**
+    * Allows to flush state, e.g. in cases where a shutdown is
+    * imminent. This will send out the `onWillSaveState` to ask
+    * everyone for latest state.
+    *
+    * @returns a `Promise` that can be awaited on when all updates
+    * to the underlying storage have been flushed.
+    */
+    flush(reason?: WillSaveStateReason): Promise<void>;
+}
+
+export { IStorageService };

package/vscode/src/vs/platform/storage/common/storage.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+const IStorageService = ( createDecorator('storageService'));
+export { IStorageService };

package/vscode/src/vs/platform/telemetry/common/telemetry.d.ts

@@ -1,41 +1,8 @@
-import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
-import { ClassifiedEvent, OmitMetadata, IGDPRProperty, StrictPropertyCheck } from './gdprTypings.js';
-
 interface ITelemetryData {
     from?: string;
     target?: string;
     [key: string]: any;
 }
-
-declare const ITelemetryService: ServiceIdentifier<ITelemetryService>;
-interface ITelemetryService {
-    readonly _serviceBrand: undefined;
-    readonly telemetryLevel: TelemetryLevel;
-    readonly sessionId: string;
-    readonly machineId: string;
-    readonly sqmId: string;
-    readonly firstSessionDate: string;
-    readonly msftInternal?: boolean;
-    /**
-     * Whether error telemetry will get sent. If false, `publicLogError` will no-op.
-     */
-    readonly sendErrorTelemetry: boolean;
-    /**
-     * @deprecated Use publicLog2 and the typescript GDPR annotation where possible
-     */
-    publicLog(eventName: string, data?: ITelemetryData): void;
-    /**
-     * Sends a telemetry event that has been privacy approved.
-     * Do not call this unless you have been given approval.
-     */
-    publicLog2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>): void;
-    /**
-     * @deprecated Use publicLogError2 and the typescript GDPR annotation where possible
-     */
-    publicLogError(errorEventName: string, data?: ITelemetryData): void;
-    publicLogError2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>): void;
-    setExperimentProperty(name: string, value: string): void;
-}
 interface ITelemetryEndpoint {
     id: string;
     aiKey: string;
@@ -48,4 +15,4 @@ declare const enum TelemetryLevel {
     USAGE = 3
 }
 
-export { type ITelemetryData, type ITelemetryEndpoint, ITelemetryService, TelemetryLevel };
+export { type ITelemetryData, type ITelemetryEndpoint, TelemetryLevel };

package/vscode/src/vs/platform/telemetry/common/telemetry.js

@@ -1,8 +1,5 @@
-import { createDecorator } from '../../instantiation/common/instantiation.js';
-const ITelemetryService = ( createDecorator('telemetryService'));
-const ICustomEndpointTelemetryService = ( createDecorator('customEndpointTelemetryService'));
 const firstSessionDateStorageKey = 'telemetry.firstSessionDate';
 const TELEMETRY_SETTING_ID = 'telemetry.telemetryLevel';
 const TELEMETRY_CRASH_REPORTER_SETTING_ID = 'telemetry.enableCrashReporter';
 const TELEMETRY_OLD_SETTING_ID = 'telemetry.enableTelemetry';
-export { ICustomEndpointTelemetryService, ITelemetryService, TELEMETRY_CRASH_REPORTER_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TELEMETRY_SETTING_ID, firstSessionDateStorageKey };
+export { TELEMETRY_CRASH_REPORTER_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TELEMETRY_SETTING_ID, firstSessionDateStorageKey };

package/vscode/src/vs/platform/telemetry/common/telemetry.service.d.ts

@@ -0,0 +1,35 @@
+import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
+import { ClassifiedEvent, OmitMetadata, IGDPRProperty, StrictPropertyCheck } from './gdprTypings.js';
+import { TelemetryLevel, ITelemetryData } from './telemetry.js';
+
+declare const ITelemetryService: ServiceIdentifier<ITelemetryService>;
+interface ITelemetryService {
+    readonly _serviceBrand: undefined;
+    readonly telemetryLevel: TelemetryLevel;
+    readonly sessionId: string;
+    readonly machineId: string;
+    readonly sqmId: string;
+    readonly firstSessionDate: string;
+    readonly msftInternal?: boolean;
+    /**
+    * Whether error telemetry will get sent. If false, `publicLogError` will no-op.
+    */
+    readonly sendErrorTelemetry: boolean;
+    /**
+    * @deprecated Use publicLog2 and the typescript GDPR annotation where possible
+    */
+    publicLog(eventName: string, data?: ITelemetryData): void;
+    /**
+    * Sends a telemetry event that has been privacy approved.
+    * Do not call this unless you have been given approval.
+    */
+    publicLog2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>): void;
+    /**
+    * @deprecated Use publicLogError2 and the typescript GDPR annotation where possible
+    */
+    publicLogError(errorEventName: string, data?: ITelemetryData): void;
+    publicLogError2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>): void;
+    setExperimentProperty(name: string, value: string): void;
+}
+
+export { ITelemetryService };

package/vscode/src/vs/platform/telemetry/common/telemetry.service.js

@@ -0,0 +1,4 @@
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+const ITelemetryService = ( createDecorator('telemetryService'));
+const ICustomEndpointTelemetryService = ( createDecorator('customEndpointTelemetryService'));
+export { ICustomEndpointTelemetryService, ITelemetryService };

package/vscode/src/vs/platform/terminal/common/terminal.d.ts

@@ -1,4 +1,3 @@
-import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
 import { Event } from '../../../base/common/event.js';
 import { OperatingSystem, IProcessEnvironment } from '../../../base/common/platform.js';
 import { URI } from '../../../base/common/uri.js';
@@ -8,7 +7,6 @@ import { ThemeIcon } from '../../../base/common/themables.js';
 import { ISerializableEnvironmentVariableCollections } from './environmentVariable.js';
 import { IWorkspaceFolder } from '../../workspace/common/workspace.js';
 import { PerformanceMark } from '../../../base/common/performance.js';
-import { ILogService } from '../../log/common/log.js';
 
 declare const enum PosixShellType {
     PowerShell = "pwsh",
@@ -584,14 +582,5 @@ interface ITerminalBackend {
     createProcess(shellLaunchConfig: IShellLaunchConfig, cwd: string, cols: number, rows: number, unicodeVersion: '6' | '11', env: IProcessEnvironment, options: ITerminalProcessOptions, shouldPersist: boolean): Promise<ITerminalChildProcess>;
     restartPtyHost(): void;
 }
-declare const ITerminalLogService: ServiceIdentifier<ITerminalLogService>;
-interface ITerminalLogService extends ILogService {
-    /**
-     * Similar to _serviceBrand but used to differentiate this service at compile time from
-     * ILogService; ITerminalLogService is an ILogService, but ILogService is not an
-     * ITerminalLogService.
-     */
-    readonly _logBrand: undefined;
-}
 
-export { type IBaseUnresolvedTerminalProfile, type IExtensionTerminalProfile, type IFixedTerminalDimensions, type IProcessDataEvent, type IProcessProperty, type IProcessPropertyMap, type IProcessReadyEvent, type IProcessReadyWindowsPty, type IPtyHostAttachTarget, type IPtyHostLatencyMeasurement, type IRawTerminalInstanceLayoutInfo, type IRawTerminalTabLayoutInfo, type IRawTerminalsLayoutInfo, type IReconnectionProperties, type IShellIntegration, type IShellLaunchConfig, type ITerminalBackend, type ITerminalChildProcess, type ITerminalDimensions, type ITerminalDimensionsOverride, type ITerminalEnvironment, type ITerminalExecutable, type ITerminalLaunchError, ITerminalLogService, type ITerminalOutputMatch, type ITerminalOutputMatcher, type ITerminalProcessOptions, type ITerminalProfile, type ITerminalProfileContribution, type ITerminalProfileObject, type ITerminalProfileSource, type ITerminalTabLayoutInfoById, type ITerminalUnsafePath, type ITerminalsLayoutInfo, type ITerminalsLayoutInfoById, PosixShellType, ProcessPropertyType, ProfileSource, ShellIntegrationStatus, TerminalExitReason, type TerminalIcon, TerminalLocation, TerminalLocationString, type TerminalShellType, type TerminalType, TitleEventSource, type WaitOnExitValue, WindowsShellType };
+export { type IBaseUnresolvedTerminalProfile, type IExtensionTerminalProfile, type IFixedTerminalDimensions, type IProcessDataEvent, type IProcessProperty, type IProcessPropertyMap, type IProcessReadyEvent, type IProcessReadyWindowsPty, type IPtyHostAttachTarget, type IPtyHostLatencyMeasurement, type IRawTerminalInstanceLayoutInfo, type IRawTerminalTabLayoutInfo, type IRawTerminalsLayoutInfo, type IReconnectionProperties, type IShellIntegration, type IShellLaunchConfig, type ITerminalBackend, type ITerminalChildProcess, type ITerminalDimensions, type ITerminalDimensionsOverride, type ITerminalEnvironment, type ITerminalExecutable, type ITerminalLaunchError, type ITerminalOutputMatch, type ITerminalOutputMatcher, type ITerminalProcessOptions, type ITerminalProfile, type ITerminalProfileContribution, type ITerminalProfileObject, type ITerminalProfileSource, type ITerminalTabLayoutInfoById, type ITerminalUnsafePath, type ITerminalsLayoutInfo, type ITerminalsLayoutInfoById, PosixShellType, ProcessPropertyType, ProfileSource, ShellIntegrationStatus, TerminalExitReason, type TerminalIcon, TerminalLocation, TerminalLocationString, type TerminalShellType, type TerminalType, TitleEventSource, type WaitOnExitValue, WindowsShellType };

package/vscode/src/vs/platform/terminal/common/terminal.js

@@ -1,4 +1,3 @@
-import { createDecorator } from '../../instantiation/common/instantiation.js';
 import '../../contextkey/common/contextkey.js';
 import { Registry } from '../../registry/common/platform.js';
 var TitleEventSource;
@@ -44,5 +43,4 @@ class TerminalBackendRegistry {
     }
 }
 Registry.add(TerminalExtensions.Backend, ( new TerminalBackendRegistry()));
-const ITerminalLogService = ( createDecorator('terminalLogService'));
-export { ITerminalLogService, TerminalExitReason, TerminalExtensions, TerminalLocation, TitleEventSource };
+export { TerminalExitReason, TerminalExtensions, TerminalLocation, TitleEventSource };

package/vscode/src/vs/platform/terminal/common/terminal.service.d.ts

@@ -0,0 +1,14 @@
+import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
+import { ILogService } from '../../log/common/log.service.js';
+
+declare const ITerminalLogService: ServiceIdentifier<ITerminalLogService>;
+interface ITerminalLogService extends ILogService {
+    /**
+    * Similar to _serviceBrand but used to differentiate this service at compile time from
+    * ILogService; ITerminalLogService is an ILogService, but ILogService is not an
+    * ITerminalLogService.
+    */
+    readonly _logBrand: undefined;
+}
+
+export { ITerminalLogService };

package/vscode/src/vs/platform/terminal/common/terminal.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+const ITerminalLogService = ( createDecorator('terminalLogService'));
+export { ITerminalLogService };

package/vscode/src/vs/platform/theme/common/themeService.d.ts

@@ -1,10 +1,9 @@
-import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
 import { Color } from '../../../base/common/color.js';
-import { Event } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { ColorIdentifier } from './colorUtils.js';
 import { IconContribution, IconDefinition } from './iconRegistry.js';
 import { ColorScheme } from './theme.js';
+import { IThemeService } from './themeService.service.js';
 
 interface ITokenStyle {
     readonly foreground: number | undefined;
@@ -54,17 +53,6 @@ interface IProductIconTheme {
      */
     getIcon(iconContribution: IconContribution): IconDefinition | undefined;
 }
-
-declare const IThemeService: ServiceIdentifier<IThemeService>;
-interface IThemeService {
-    readonly _serviceBrand: undefined;
-    getColorTheme(): IColorTheme;
-    readonly onDidColorThemeChange: Event<IColorTheme>;
-    getFileIconTheme(): IFileIconTheme;
-    readonly onDidFileIconThemeChange: Event<IFileIconTheme>;
-    getProductIconTheme(): IProductIconTheme;
-    readonly onDidProductIconThemeChange: Event<IProductIconTheme>;
-}
 /**
  * Utility base class for all themable components.
  */
@@ -77,4 +65,4 @@ declare class Themable extends Disposable {
     protected getColor(id: string, modify?: (color: Color, theme: IColorTheme) => Color): string | null;
 }
 
-export { type IColorTheme, type IFileIconTheme, type IProductIconTheme, IThemeService, type ITokenStyle, Themable };
+export { type IColorTheme, type IFileIconTheme, type IProductIconTheme, type ITokenStyle, Themable };

package/vscode/src/vs/platform/theme/common/themeService.js

@@ -1,10 +1,8 @@
 import { Codicon } from '../../../base/common/codicons.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
-import { createDecorator } from '../../instantiation/common/instantiation.js';
 import { Registry } from '../../registry/common/platform.js';
 import { ColorScheme } from './theme.js';
-const IThemeService = ( createDecorator('themeService'));
 function themeColorFromId(id) {
     return { id };
 }
@@ -68,4 +66,4 @@ class Themable extends Disposable {
         return color ? ( color.toString()) : null;
     }
 }
-export { Extensions, FileThemeIcon, FolderThemeIcon, IThemeService, Themable, getThemeTypeSelector, registerThemingParticipant, themeColorFromId };
+export { Extensions, FileThemeIcon, FolderThemeIcon, Themable, getThemeTypeSelector, registerThemingParticipant, themeColorFromId };

package/vscode/src/vs/platform/theme/common/themeService.service.d.ts

@@ -0,0 +1,16 @@
+import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
+import { Event } from '../../../base/common/event.js';
+import { IColorTheme, IFileIconTheme, IProductIconTheme } from './themeService.js';
+
+declare const IThemeService: ServiceIdentifier<IThemeService>;
+interface IThemeService {
+    readonly _serviceBrand: undefined;
+    getColorTheme(): IColorTheme;
+    readonly onDidColorThemeChange: Event<IColorTheme>;
+    getFileIconTheme(): IFileIconTheme;
+    readonly onDidFileIconThemeChange: Event<IFileIconTheme>;
+    getProductIconTheme(): IProductIconTheme;
+    readonly onDidProductIconThemeChange: Event<IProductIconTheme>;
+}
+
+export { IThemeService };

package/vscode/src/vs/platform/theme/common/themeService.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+const IThemeService = ( createDecorator('themeService'));
+export { IThemeService };

package/vscode/src/vs/platform/tunnel/common/tunnel.d.ts

@@ -1,9 +1,4 @@
-import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
-import { Event } from '../../../base/common/event.js';
-import { IDisposable } from '../../../base/common/lifecycle.js';
-import { URI } from '../../../base/common/uri.js';
-import { IAddressProvider } from '../../remote/common/remoteAgentConnection.js';
 import { TunnelPrivacy } from '../../remote/common/remoteAuthorityResolver.js';
 
 interface RemoteTunnel {
@@ -66,29 +61,4 @@ interface PortAttributesProvider {
     providePortAttributes(ports: number[], pid: number | undefined, commandLine: string | undefined, token: CancellationToken): Promise<ProvidedPortAttributes[]>;
 }
 
-declare const ITunnelService: ServiceIdentifier<ITunnelService>;
-interface ITunnelService {
-    readonly _serviceBrand: undefined;
-    readonly tunnels: Promise<readonly RemoteTunnel[]>;
-    readonly canChangePrivacy: boolean;
-    readonly privacyOptions: TunnelPrivacy[];
-    readonly onTunnelOpened: Event<RemoteTunnel>;
-    readonly onTunnelClosed: Event<{
-        host: string;
-        port: number;
-    }>;
-    readonly canElevate: boolean;
-    readonly canChangeProtocol: boolean;
-    readonly hasTunnelProvider: boolean;
-    readonly onAddedTunnelProvider: Event<void>;
-    canTunnel(uri: URI): boolean;
-    openTunnel(addressProvider: IAddressProvider | undefined, remoteHost: string | undefined, remotePort: number, localHost?: string, localPort?: number, elevateIfNeeded?: boolean, privacy?: string, protocol?: string): Promise<RemoteTunnel | string | undefined> | undefined;
-    getExistingTunnel(remoteHost: string, remotePort: number): Promise<RemoteTunnel | string | undefined>;
-    setEnvironmentTunnel(remoteHost: string, remotePort: number, localAddress: string, privacy: string, protocol: string): void;
-    closeTunnel(remoteHost: string, remotePort: number): Promise<void>;
-    setTunnelProvider(provider: ITunnelProvider | undefined): IDisposable;
-    setTunnelFeatures(features: TunnelProviderFeatures): void;
-    isPortPrivileged(port: number): boolean;
-}
-
-export { type ITunnelProvider, ITunnelService, type PortAttributesProvider, ProvidedOnAutoForward, type ProvidedPortAttributes, type RemoteTunnel, type TunnelCreationOptions, type TunnelOptions, TunnelPrivacyId, TunnelProtocol, type TunnelProviderFeatures };
+export { type ITunnelProvider, type PortAttributesProvider, ProvidedOnAutoForward, type ProvidedPortAttributes, type RemoteTunnel, type TunnelCreationOptions, type TunnelOptions, TunnelPrivacyId, TunnelProtocol, type TunnelProviderFeatures };