forked from microsoft/vscode
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request microsoft#209258 from microsoft/tyriar/181900
Introduce ITerminalConfigurationService, move TerminalConfigHelper.config to it
- Loading branch information
Showing
20 changed files
with
300 additions
and
166 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.txt in the project root for license information. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import { Emitter, Event } from 'vs/base/common/event'; | ||
| import { Disposable } from 'vs/base/common/lifecycle'; | ||
| import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; | ||
| import { ITerminalConfigurationService } from 'vs/workbench/contrib/terminal/browser/terminal'; | ||
| import { DEFAULT_BOLD_FONT_WEIGHT, DEFAULT_FONT_WEIGHT, FontWeight, ITerminalConfiguration, MAXIMUM_FONT_WEIGHT, MINIMUM_FONT_WEIGHT, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal'; | ||
|
|
||
| export class TerminalConfigurationService extends Disposable implements ITerminalConfigurationService { | ||
| declare _serviceBrand: undefined; | ||
|
|
||
| private _config!: Readonly<ITerminalConfiguration>; | ||
| get config() { return this._config; } | ||
|
|
||
| private readonly _onConfigChanged = new Emitter<void>(); | ||
| get onConfigChanged(): Event<void> { return this._onConfigChanged.event; } | ||
|
|
||
| constructor( | ||
| @IConfigurationService private readonly _configurationService: IConfigurationService, | ||
| ) { | ||
| super(); | ||
| this._register(Event.runAndSubscribe(this._configurationService.onDidChangeConfiguration, e => { | ||
| if (!e || e.affectsConfiguration(TERMINAL_CONFIG_SECTION)) { | ||
| this._updateConfig(); | ||
| } | ||
| })); | ||
| } | ||
|
|
||
| private _updateConfig(): void { | ||
| const configValues = { ...this._configurationService.getValue<ITerminalConfiguration>(TERMINAL_CONFIG_SECTION) }; | ||
| configValues.fontWeight = this._normalizeFontWeight(configValues.fontWeight, DEFAULT_FONT_WEIGHT); | ||
| configValues.fontWeightBold = this._normalizeFontWeight(configValues.fontWeightBold, DEFAULT_BOLD_FONT_WEIGHT); | ||
| this._config = configValues; | ||
| this._onConfigChanged.fire(); | ||
| } | ||
|
|
||
| private _normalizeFontWeight(input: any, defaultWeight: FontWeight): FontWeight { | ||
| if (input === 'normal' || input === 'bold') { | ||
| return input; | ||
| } | ||
| return clampInt(input, MINIMUM_FONT_WEIGHT, MAXIMUM_FONT_WEIGHT, defaultWeight); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| function clampInt<T>(source: any, minimum: number, maximum: number, fallback: T): number | T { | ||
| let r = parseInt(source, 10); | ||
| if (isNaN(r)) { | ||
| return fallback; | ||
| } | ||
| if (typeof minimum === 'number') { | ||
| r = Math.max(minimum, r); | ||
| } | ||
| if (typeof maximum === 'number') { | ||
| r = Math.min(maximum, r); | ||
| } | ||
| return r; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.