Merge pull request microsoft#202757 from microsoft/merogge/voice

terminal `speech -> voice`

Author: meganrogge

src/vs/workbench/contrib/terminal/browser/media/terminalSpeechToText.css renamed to src/vs/workbench/contrib/terminal/browser/media/terminalVoice.css

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.terminal-speech-to-text {
+.terminal-voice {
 	background-color: var(--vscode-terminal-background, var(--vscode-panel-background));
 	padding: 2px;
 	border-radius: 8px;
@@ -13,14 +13,14 @@
 	z-index: 1000;
 }
 
-.terminal-speech-to-text.codicon.codicon-mic-filled {
+.terminal-voice.codicon.codicon-mic-filled {
 	display: flex;
 	align-items: center;
 	width: 16px;
 	height: 16px;
 }
 
-.terminal-speech-to-text.recording.codicon.codicon-mic-filled {
+.terminal-voice.recording.codicon.codicon-mic-filled {
 	color: var(--vscode-activityBarBadge-background);
 	animation: ani-terminal-speech 1s infinite;
 }
@@ -39,7 +39,7 @@
 	}
 }
 
-.terminal-speech-progress-text {
+.terminal-voice-progress-text {
 	font-style: italic;
 	color: var(--vscode-editorGhostText-foreground) !important;
 	border: 1px solid var(--vscode-editorGhostText-border);

src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts

@@ -8,7 +8,7 @@ import 'vs/css!./media/scrollbar';
 import 'vs/css!./media/widgets';
 import 'vs/css!./media/xterm';
 import 'vs/css!./media/terminal';
-import 'vs/css!./media/terminalSpeechToText';
+import 'vs/css!./media/terminalVoice';
 import * as nls from 'vs/nls';
 import { URI } from 'vs/base/common/uri';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';

src/vs/workbench/contrib/terminal/browser/terminalActions.ts

@@ -64,7 +64,7 @@ import { AccessibleViewProviderId, accessibleViewCurrentProviderId, accessibleVi
 import { isKeyboardEvent, isMouseEvent, isPointerEvent } from 'vs/base/browser/dom';
 import { editorGroupToColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
 import { InstanceContext } from 'vs/workbench/contrib/terminal/browser/terminalContextMenu';
-import { TerminalSpeechToTextSession } from 'vs/workbench/contrib/terminal/browser/terminalSpeechToText';
+import { TerminalVoiceSession } from 'vs/workbench/contrib/terminal/browser/terminalVoice';
 import { HasSpeechProvider } from 'vs/workbench/contrib/speech/common/speechService';
 
 export const switchTerminalActionViewItemSeparator = '\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500';
@@ -1645,30 +1645,30 @@ export function registerTerminalActions() {
 	});
 
 	registerActiveInstanceAction({
-		id: TerminalCommandId.StartSpeechToText,
+		id: TerminalCommandId.StartVoice,
 		title: {
-			value: localize('workbench.action.startTerminalSpeechToText', "Start Terminal Speech To Text"),
-			original: 'Start Terminal Speech To Text'
+			value: localize('workbench.action.startTerminalVoice', "Start Terminal Voice"),
+			original: 'Start Terminal Voice'
 		},
 		precondition: ContextKeyExpr.and(HasSpeechProvider, sharedWhenClause.terminalAvailable),
 		f1: true,
 		run: (activeInstance, c, accessor) => {
 			const instantiationService = accessor.get(IInstantiationService);
-			TerminalSpeechToTextSession.getInstance(instantiationService).start();
+			TerminalVoiceSession.getInstance(instantiationService).start();
 		}
 	});
 
 	registerActiveInstanceAction({
-		id: TerminalCommandId.StopSpeechToText,
+		id: TerminalCommandId.StopVoice,
 		title: {
-			value: localize('workbench.action.stopTerminalSpeechToText', "Stop Terminal Speech To Text"),
-			original: 'Stop Terminal Speech To Text'
+			value: localize('workbench.action.stopTerminalVoice', "Stop Terminal Voice"),
+			original: 'Stop Terminal Voice'
 		},
 		precondition: ContextKeyExpr.and(HasSpeechProvider, sharedWhenClause.terminalAvailable),
 		f1: true,
 		run: (activeInstance, c, accessor) => {
 			const instantiationService = accessor.get(IInstantiationService);
-			TerminalSpeechToTextSession.getInstance(instantiationService).stop(true);
+			TerminalVoiceSession.getInstance(instantiationService).stop(true);
 		}
 	});
 }

src/vs/workbench/contrib/terminal/browser/terminalSpeechToText.ts renamed to src/vs/workbench/contrib/terminal/browser/terminalVoice.ts

@@ -46,20 +46,20 @@ const symbolMap: { [key: string]: string } = {
 	'Double quote': '"',
 };
 
-export class TerminalSpeechToTextSession extends Disposable {
+export class TerminalVoiceSession extends Disposable {
 	private _input: string = '';
 	private _ghostText: IDecoration | undefined;
 	private _decoration: IDecoration | undefined;
 	private _marker: IXtermMarker | undefined;
 	private _ghostTextMarker: IXtermMarker | undefined;
-	private static _instance: TerminalSpeechToTextSession | undefined = undefined;
+	private static _instance: TerminalVoiceSession | undefined = undefined;
 	private _acceptTranscriptionScheduler: RunOnceScheduler | undefined;
-	static getInstance(instantiationService: IInstantiationService): TerminalSpeechToTextSession {
-		if (!TerminalSpeechToTextSession._instance) {
-			TerminalSpeechToTextSession._instance = instantiationService.createInstance(TerminalSpeechToTextSession);
+	static getInstance(instantiationService: IInstantiationService): TerminalVoiceSession {
+		if (!TerminalVoiceSession._instance) {
+			TerminalVoiceSession._instance = instantiationService.createInstance(TerminalVoiceSession);
 		}
 
-		return TerminalSpeechToTextSession._instance;
+		return TerminalVoiceSession._instance;
 	}
 	private _cancellationTokenSource: CancellationTokenSource | undefined;
 	private readonly _disposables: DisposableStore;
@@ -163,7 +163,7 @@ export class TerminalSpeechToTextSession extends Disposable {
 			x: xterm.buffer.active.cursorX ?? 0,
 		});
 		this._decoration?.onRender((e: HTMLElement) => {
-			e.classList.add(...ThemeIcon.asClassNameArray(Codicon.micFilled), 'terminal-speech-to-text', 'recording');
+			e.classList.add(...ThemeIcon.asClassNameArray(Codicon.micFilled), 'terminal-voice', 'recording');
 			e.style.transform = 'translate(-5px, -5px)';
 		});
 	}
@@ -193,7 +193,7 @@ export class TerminalSpeechToTextSession extends Disposable {
 			x: xterm.buffer.active.cursorX + 1 ?? 0,
 		});
 		this._ghostText?.onRender((e: HTMLElement) => {
-			e.classList.add('terminal-speech-progress-text');
+			e.classList.add('terminal-voice-progress-text');
 			e.textContent = text;
 			e.style.width = 'fit-content';
 		});

src/vs/workbench/contrib/terminal/common/terminal.ts

@@ -495,8 +495,8 @@ export const enum TerminalCommandId {
 	FocusHover = 'workbench.action.terminal.focusHover',
 	ShowEnvironmentContributions = 'workbench.action.terminal.showEnvironmentContributions',
 	ToggleStickyScroll = 'workbench.action.terminal.toggleStickyScroll',
-	StartSpeechToText = 'workbench.action.startTerminalSpeechToText',
-	StopSpeechToText = 'workbench.action.stopTerminalSpeechToText',
+	StartVoice = 'workbench.action.startTerminalVoice',
+	StopVoice = 'workbench.action.stopTerminalVoice',
 
 	// Developer commands