diff --git a/src/vs/workbench/contrib/terminal/terminal.all.ts b/src/vs/workbench/contrib/terminal/terminal.all.ts index a61db29612f..c586b200ef6 100644 --- a/src/vs/workbench/contrib/terminal/terminal.all.ts +++ b/src/vs/workbench/contrib/terminal/terminal.all.ts @@ -24,7 +24,7 @@ import '../terminalContrib/commandGuide/browser/terminal.commandGuide.contributi import '../terminalContrib/history/browser/terminal.history.contribution.js'; import '../terminalContrib/inlineHint/browser/terminal.initialHint.contribution.js'; import '../terminalContrib/links/browser/terminal.links.contribution.js'; -import '../terminalContrib/notifications/browser/terminal.notifications.contribution.js'; +import '../terminalContrib/notification/browser/terminal.notification.contribution.js'; import '../terminalContrib/zoom/browser/terminal.zoom.contribution.js'; import '../terminalContrib/stickyScroll/browser/terminal.stickyScroll.contribution.js'; import '../terminalContrib/quickAccess/browser/terminal.quickAccess.contribution.js'; diff --git a/src/vs/workbench/contrib/terminal/terminalContribExports.ts b/src/vs/workbench/contrib/terminal/terminalContribExports.ts index f6918c387ca..a24b204a899 100644 --- a/src/vs/workbench/contrib/terminal/terminalContribExports.ts +++ b/src/vs/workbench/contrib/terminal/terminalContribExports.ts @@ -14,7 +14,7 @@ import { terminalCommandGuideConfiguration } from '../terminalContrib/commandGui import { TerminalDeveloperCommandId } from '../terminalContrib/developer/common/terminal.developer.js'; import { defaultTerminalFindCommandToSkipShell } from '../terminalContrib/find/common/terminal.find.js'; import { defaultTerminalHistoryCommandsToSkipShell, terminalHistoryConfiguration } from '../terminalContrib/history/common/terminal.history.js'; -import { terminalOscNotificationsConfiguration } from '../terminalContrib/notifications/common/terminalNotificationsConfiguration.js'; +import { terminalOscNotificationsConfiguration } from '../terminalContrib/notification/common/terminalNotificationConfiguration.js'; import { TerminalStickyScrollSettingId, terminalStickyScrollConfiguration } from '../terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.js'; import { defaultTerminalSuggestCommandsToSkipShell } from '../terminalContrib/suggest/common/terminal.suggest.js'; import { TerminalSuggestSettingId, terminalSuggestConfiguration } from '../terminalContrib/suggest/common/terminalSuggestConfiguration.js'; diff --git a/src/vs/workbench/contrib/terminalContrib/notifications/browser/terminal.notifications.contribution.ts b/src/vs/workbench/contrib/terminalContrib/notification/browser/terminal.notification.contribution.ts similarity index 92% rename from src/vs/workbench/contrib/terminalContrib/notifications/browser/terminal.notifications.contribution.ts rename to src/vs/workbench/contrib/terminalContrib/notification/browser/terminal.notification.contribution.ts index 1ffe20afaf7..4cf58b88a2a 100644 --- a/src/vs/workbench/contrib/terminalContrib/notifications/browser/terminal.notifications.contribution.ts +++ b/src/vs/workbench/contrib/terminalContrib/notification/browser/terminal.notification.contribution.ts @@ -11,14 +11,14 @@ import { INotificationService } from '../../../../../platform/notification/commo import { ITerminalLogService } from '../../../../../platform/terminal/common/terminal.js'; import type { ITerminalContribution, ITerminalInstance, IXtermTerminal } from '../../../terminal/browser/terminal.js'; import { registerTerminalContribution, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js'; -import { TerminalOscNotificationsSettingId } from '../common/terminalNotificationsConfiguration.js'; -import { Osc99NotificationHandler } from './terminal.notifications.handler.js'; +import { TerminalOscNotificationsSettingId } from '../common/terminalNotificationConfiguration.js'; +import { TerminalNotificationHandler } from './terminalNotificationHandler.js'; class TerminalOscNotificationsContribution extends Disposable implements ITerminalContribution { static readonly ID = 'terminal.oscNotifications'; - private readonly _handler: Osc99NotificationHandler; + private readonly _handler: TerminalNotificationHandler; constructor( private readonly _ctx: ITerminalContributionContext, @@ -27,7 +27,7 @@ class TerminalOscNotificationsContribution extends Disposable implements ITermin @ITerminalLogService private readonly _logService: ITerminalLogService, ) { super(); - this._handler = this._register(new Osc99NotificationHandler({ + this._handler = this._register(new TerminalNotificationHandler({ isEnabled: () => this._configurationService.getValue(TerminalOscNotificationsSettingId.EnableNotifications), isWindowFocused: () => dom.getActiveWindow().document.hasFocus(), isTerminalVisible: () => this._ctx.instance.isVisible, diff --git a/src/vs/workbench/contrib/terminalContrib/notifications/browser/terminal.notifications.handler.ts b/src/vs/workbench/contrib/terminalContrib/notification/browser/terminalNotificationHandler.ts similarity index 99% rename from src/vs/workbench/contrib/terminalContrib/notifications/browser/terminal.notifications.handler.ts rename to src/vs/workbench/contrib/terminalContrib/notification/browser/terminalNotificationHandler.ts index 06a0ad0ab93..41bc22f7293 100644 --- a/src/vs/workbench/contrib/terminalContrib/notifications/browser/terminal.notifications.handler.ts +++ b/src/vs/workbench/contrib/terminalContrib/notification/browser/terminalNotificationHandler.ts @@ -55,7 +55,7 @@ export interface IOsc99NotificationHost { writeToProcess(data: string): void; } -export class Osc99NotificationHandler extends Disposable { +export class TerminalNotificationHandler extends Disposable { private readonly _osc99PendingNotifications = new Map(); private _osc99PendingAnonymous: IOsc99NotificationState | undefined; private readonly _osc99ActiveNotifications = new Map(); diff --git a/src/vs/workbench/contrib/terminalContrib/notifications/common/terminalNotificationsConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/notification/common/terminalNotificationConfiguration.ts similarity index 100% rename from src/vs/workbench/contrib/terminalContrib/notifications/common/terminalNotificationsConfiguration.ts rename to src/vs/workbench/contrib/terminalContrib/notification/common/terminalNotificationConfiguration.ts diff --git a/src/vs/workbench/contrib/terminalContrib/notifications/test/browser/terminalNotifications.test.ts b/src/vs/workbench/contrib/terminalContrib/notification/test/browser/terminalNotification.test.ts similarity index 96% rename from src/vs/workbench/contrib/terminalContrib/notifications/test/browser/terminalNotifications.test.ts rename to src/vs/workbench/contrib/terminalContrib/notification/test/browser/terminalNotification.test.ts index 27a210c3346..9b34d940448 100644 --- a/src/vs/workbench/contrib/terminalContrib/notifications/test/browser/terminalNotifications.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/notification/test/browser/terminalNotification.test.ts @@ -7,7 +7,7 @@ import { strictEqual } from 'assert'; import { Emitter, Event } from '../../../../../../base/common/event.js'; import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js'; import { NotificationPriority, Severity, type INotification, type INotificationActions, type INotificationHandle, type INotificationProgress, type NotificationMessage } from '../../../../../../platform/notification/common/notification.js'; -import { Osc99NotificationHandler, type IOsc99NotificationHost } from '../../browser/terminal.notifications.handler.js'; +import { TerminalNotificationHandler, type IOsc99NotificationHost } from '../../browser/terminalNotificationHandler.js'; class TestNotificationProgress implements INotificationProgress { infinite(): void { } @@ -124,11 +124,11 @@ suite('Terminal OSC 99 notifications', () => { const store = ensureNoDisposablesAreLeakedInTestSuite(); let host: TestOsc99Host; - let handler: Osc99NotificationHandler; + let handler: TerminalNotificationHandler; setup(() => { host = new TestOsc99Host(); - handler = store.add(new Osc99NotificationHandler(host)); + handler = store.add(new TerminalNotificationHandler(host)); }); teardown(() => {