Skip to content

Commit 6d0b5c4

Browse files
TyriarTyriar
authored
Merge pull request #198430 from microsoft/tyriar/config_helper
Move term config helper into browser
2 parents 1010cae + 14ced5d commit 6d0b5c4

6 files changed

Lines changed: 15 additions & 18 deletions

File tree

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { EditorInput } from 'vs/workbench/common/editor/editorInput';
2121
import { IEditableData } from 'vs/workbench/common/views';
2222
import { ITerminalStatusList } from 'vs/workbench/contrib/terminal/browser/terminalStatusList';
2323
import { XtermTerminal } from 'vs/workbench/contrib/terminal/browser/xterm/xtermTerminal';
24-
import { IRegisterContributedProfileArgs, IRemoteTerminalAttachTarget, IStartExtensionTerminalRequest, ITerminalConfigHelper, ITerminalFont, ITerminalProcessExtHostProxy, ITerminalProcessInfo } from 'vs/workbench/contrib/terminal/common/terminal';
24+
import { IRegisterContributedProfileArgs, IRemoteTerminalAttachTarget, IStartExtensionTerminalRequest, ITerminalConfiguration, ITerminalFont, ITerminalProcessExtHostProxy, ITerminalProcessInfo } from 'vs/workbench/contrib/terminal/common/terminal';
2525
import { EditorGroupColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
2626
import { ISimpleSelectedSuggestion } from 'vs/workbench/services/suggest/browser/simpleSuggestWidget';
2727
import type { IMarker, ITheme, Terminal as RawXtermTerminal } from '@xterm/xterm';
@@ -83,8 +83,13 @@ export interface ITerminalInstanceService {
8383
didRegisterBackend(remoteAuthority?: string): void;
8484
}
8585

86-
export interface IBrowserTerminalConfigHelper extends ITerminalConfigHelper {
86+
export interface ITerminalConfigHelper {
87+
config: ITerminalConfiguration;
8788
panelContainer: HTMLElement | undefined;
89+
90+
configFontIsMonospace(): boolean;
91+
getFont(w: Window): ITerminalFont;
92+
showRecommendations(shellLaunchConfig: IShellLaunchConfig): void;
8893
}
8994

9095
export const enum Direction {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import { ITerminalProfile, TerminalExitReason, TerminalIcon, TerminalLocation, T
3131
import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
3232
import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
3333
import { CLOSE_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
34-
import { Direction, ICreateTerminalOptions, IDetachedTerminalInstance, ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalInstanceService, ITerminalService, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
34+
import { Direction, ICreateTerminalOptions, IDetachedTerminalInstance, ITerminalConfigHelper, ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalInstanceService, ITerminalService, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
3535
import { TerminalQuickAccessProvider } from 'vs/workbench/contrib/terminal/browser/terminalQuickAccess';
36-
import { IRemoteTerminalAttachTarget, ITerminalConfigHelper, ITerminalProfileResolverService, ITerminalProfileService, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
36+
import { IRemoteTerminalAttachTarget, ITerminalProfileResolverService, ITerminalProfileService, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
3737
import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
3838
import { createProfileSchemaEnums } from 'vs/platform/terminal/common/terminalProfiles';
3939
import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings';

‎src/vs/workbench/contrib/terminal/browser/terminalConfigHelper.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
99
import { ITerminalConfiguration, TERMINAL_CONFIG_SECTION, DEFAULT_LETTER_SPACING, DEFAULT_LINE_HEIGHT, MINIMUM_LETTER_SPACING, MINIMUM_FONT_WEIGHT, MAXIMUM_FONT_WEIGHT, DEFAULT_FONT_WEIGHT, DEFAULT_BOLD_FONT_WEIGHT, FontWeight, ITerminalFont } from 'vs/workbench/contrib/terminal/common/terminal';
1010
import Severity from 'vs/base/common/severity';
1111
import { INotificationService, NeverShowAgainScope } from 'vs/platform/notification/common/notification';
12-
import { IBrowserTerminalConfigHelper, LinuxDistro } from 'vs/workbench/contrib/terminal/browser/terminal';
12+
import { ITerminalConfigHelper, LinuxDistro } from 'vs/workbench/contrib/terminal/browser/terminal';
1313
import { Emitter, Event } from 'vs/base/common/event';
1414
import { basename } from 'vs/base/common/path';
1515
import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
@@ -30,7 +30,7 @@ const enum FontConstants {
3030
* Encapsulates terminal configuration logic, the primary purpose of this file is so that platform
3131
* specific test cases can be written.
3232
*/
33-
export class TerminalConfigHelper extends Disposable implements IBrowserTerminalConfigHelper {
33+
export class TerminalConfigHelper extends Disposable implements ITerminalConfigHelper {
3434
panelContainer: HTMLElement | undefined;
3535

3636
private _charMeasureElement: HTMLElement | undefined;

‎src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import { FlowControlConstants, IProcessDataEvent, IProcessProperty, IProcessProp
2222
import { TerminalRecorder } from 'vs/platform/terminal/common/terminalRecorder';
2323
import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
2424
import { EnvironmentVariableInfoChangesActive, EnvironmentVariableInfoStale } from 'vs/workbench/contrib/terminal/browser/environmentVariableInfo';
25-
import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
25+
import { ITerminalConfigHelper, ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
2626
import { IEnvironmentVariableInfo, IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable';
2727
import { MergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariableCollection';
2828
import { serializeEnvironmentVariableCollections } from 'vs/platform/terminal/common/environmentVariableShared';
29-
import { IBeforeProcessDataEvent, ITerminalConfigHelper, ITerminalProcessManager, ITerminalProfileResolverService, ProcessState } from 'vs/workbench/contrib/terminal/common/terminal';
29+
import { IBeforeProcessDataEvent, ITerminalProcessManager, ITerminalProfileResolverService, ProcessState } from 'vs/workbench/contrib/terminal/common/terminal';
3030
import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
3131
import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
3232
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';

‎src/vs/workbench/contrib/terminal/browser/terminalService.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ import { ThemeIcon } from 'vs/base/common/themables';
2929
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
3030
import { VirtualWorkspaceContext } from 'vs/workbench/common/contextkeys';
3131
import { IEditableData, IViewsService } from 'vs/workbench/common/views';
32-
import { ICreateTerminalOptions, IDetachedTerminalInstance, IDetachedXTermOptions, IRequestAddInstanceToGroupEvent, ITerminalEditorService, ITerminalGroup, ITerminalGroupService, ITerminalInstance, ITerminalInstanceHost, ITerminalInstanceService, ITerminalLocationOptions, ITerminalService, ITerminalServiceNativeDelegate, TerminalConnectionState, TerminalEditorLocation } from 'vs/workbench/contrib/terminal/browser/terminal';
32+
import { ICreateTerminalOptions, IDetachedTerminalInstance, IDetachedXTermOptions, IRequestAddInstanceToGroupEvent, ITerminalConfigHelper, ITerminalEditorService, ITerminalGroup, ITerminalGroupService, ITerminalInstance, ITerminalInstanceHost, ITerminalInstanceService, ITerminalLocationOptions, ITerminalService, ITerminalServiceNativeDelegate, TerminalConnectionState, TerminalEditorLocation } from 'vs/workbench/contrib/terminal/browser/terminal';
3333
import { getCwdForSplit } from 'vs/workbench/contrib/terminal/browser/terminalActions';
3434
import { TerminalConfigHelper } from 'vs/workbench/contrib/terminal/browser/terminalConfigHelper';
3535
import { TerminalEditorInput } from 'vs/workbench/contrib/terminal/browser/terminalEditorInput';
3636
import { getColorStyleContent, getUriClasses } from 'vs/workbench/contrib/terminal/browser/terminalIcon';
3737
import { TerminalProfileQuickpick } from 'vs/workbench/contrib/terminal/browser/terminalProfileQuickpick';
3838
import { getInstanceFromResource, getTerminalUri, parseTerminalUri } from 'vs/workbench/contrib/terminal/browser/terminalUri';
3939
import { TerminalViewPane } from 'vs/workbench/contrib/terminal/browser/terminalView';
40-
import { IRemoteTerminalAttachTarget, IStartExtensionTerminalRequest, ITerminalConfigHelper, ITerminalProcessExtHostProxy, ITerminalProfileService, TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
40+
import { IRemoteTerminalAttachTarget, IStartExtensionTerminalRequest, ITerminalProcessExtHostProxy, ITerminalProfileService, TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
4141
import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
4242
import { columnToEditorGroup } from 'vs/workbench/services/editor/common/editorGroupColumn';
4343
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,6 @@ export interface ITerminalConfiguration {
209209

210210
export const DEFAULT_LOCAL_ECHO_EXCLUDE: ReadonlyArray<string> = ['vim', 'vi', 'nano', 'tmux'];
211211

212-
export interface ITerminalConfigHelper {
213-
config: ITerminalConfiguration;
214-
215-
configFontIsMonospace(): boolean;
216-
getFont(w: any): ITerminalFont;
217-
showRecommendations(shellLaunchConfig: IShellLaunchConfig): void;
218-
}
219-
220212
export interface ITerminalFont {
221213
fontFamily: string;
222214
fontSize: number;

0 commit comments

Comments
 (0)