6
6
import { DEFAULT_FONT_FAMILY } from '../../../../base/browser/fonts.js' ;
7
7
import { Emitter } from '../../../../base/common/event.js' ;
8
8
import { Disposable } from '../../../../base/common/lifecycle.js' ;
9
- import { EDITOR_FONT_DEFAULTS , IEditorOptions } from '../../../../editor/common/config/editorOptions.js' ;
9
+ import { EDITOR_FONT_DEFAULTS , IEditorOptions , EditorFontLigatures } from '../../../../editor/common/config/editorOptions.js' ;
10
10
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js' ;
11
11
import * as colorRegistry from '../../../../platform/theme/common/colorRegistry.js' ;
12
12
import { ColorScheme } from '../../../../platform/theme/common/theme.js' ;
@@ -37,7 +37,7 @@ export class WebviewThemeDataProvider extends Disposable {
37
37
this . _reset ( ) ;
38
38
} ) ) ;
39
39
40
- const webviewConfigurationKeys = [ 'editor.fontFamily' , 'editor.fontWeight' , 'editor.fontSize' , 'accessibility.underlineLinks' ] ;
40
+ const webviewConfigurationKeys = [ 'editor.fontFamily' , 'editor.fontWeight' , 'editor.fontSize' , 'editor.fontLigatures' , ' accessibility.underlineLinks'] ;
41
41
this . _register ( this . _configurationService . onDidChangeConfiguration ( e => {
42
42
if ( webviewConfigurationKeys . some ( key => e . affectsConfiguration ( key ) ) ) {
43
43
this . _reset ( ) ;
@@ -55,6 +55,7 @@ export class WebviewThemeDataProvider extends Disposable {
55
55
const editorFontFamily = configuration . fontFamily || EDITOR_FONT_DEFAULTS . fontFamily ;
56
56
const editorFontWeight = configuration . fontWeight || EDITOR_FONT_DEFAULTS . fontWeight ;
57
57
const editorFontSize = configuration . fontSize || EDITOR_FONT_DEFAULTS . fontSize ;
58
+ const editorFontLigatures = new EditorFontLigatures ( ) . validate ( configuration . fontLigatures ) ;
58
59
const linkUnderlines = this . _configurationService . getValue ( 'accessibility.underlineLinks' ) ;
59
60
60
61
const theme = this . _themeService . getColorTheme ( ) ;
@@ -73,6 +74,7 @@ export class WebviewThemeDataProvider extends Disposable {
73
74
'vscode-editor-font-family' : editorFontFamily ,
74
75
'vscode-editor-font-weight' : editorFontWeight ,
75
76
'vscode-editor-font-size' : editorFontSize + 'px' ,
77
+ 'vscode-editor-font-feature-settings' : editorFontLigatures ,
76
78
'text-link-decoration' : linkUnderlines ? 'underline' : 'none' ,
77
79
...exportedColors
78
80
} ;
0 commit comments