66import { Color } from 'vs/base/common/color' ;
77import { Emitter } from 'vs/base/common/event' ;
88import { Disposable } from 'vs/base/common/lifecycle' ;
9- import { IBracketPairColorizationOptions } from 'vs/editor/common/config/editorOptions' ;
9+ import { IBracketPairColorizationOptions , IEditorOptions } from 'vs/editor/common/config/editorOptions' ;
1010import { IConfigurationService } from 'vs/platform/configuration/common/configuration' ;
1111import { IThemeService } from 'vs/platform/theme/common/themeService' ;
1212import { IViewDescriptorService } from 'vs/workbench/common/views' ;
@@ -33,11 +33,12 @@ export interface IInteractiveSessionInputEditorOptions {
3333
3434export interface IInteractiveSessionResultEditorOptions {
3535 readonly fontSize : number ;
36- readonly fontFamily : string ;
36+ readonly fontFamily : string | undefined ;
3737 readonly lineHeight : number ;
3838 readonly fontWeight : string ;
3939 readonly backgroundColor : Color | undefined ;
4040 readonly bracketPairColorization : IBracketPairColorizationOptions ;
41+ readonly fontLigatures : boolean | string | undefined ;
4142 readonly wordWrap : 'off' | 'on' ;
4243
4344 // Bring these back if we make the editors editable
@@ -64,6 +65,7 @@ export class InteractiveSessionEditorOptions extends Disposable {
6465 'interactiveSession.editor.fontWeight' ,
6566 'interactiveSession.editor.wordWrap' ,
6667 'editor.cursorBlinking' ,
68+ 'editor.fontLigatures' ,
6769 'editor.accessibilitySupport' ,
6870 'editor.bracketPairColorization.enabled' ,
6971 'editor.bracketPairColorization.independentColorPoolPerBracketType' ,
@@ -94,7 +96,7 @@ export class InteractiveSessionEditorOptions extends Disposable {
9496 }
9597
9698 private update ( ) {
97- const editorConfig = this . configurationService . getValue < any > ( 'editor' ) ;
99+ const editorConfig = this . configurationService . getValue < IEditorOptions > ( 'editor' ) ;
98100
99101 // TODO shouldn't the setting keys be more specific?
100102 const interactiveSessionEditorConfig = this . configurationService . getValue < IInteractiveSessionConfiguration > ( 'interactiveSession' ) . editor ;
@@ -114,7 +116,8 @@ export class InteractiveSessionEditorOptions extends Disposable {
114116 enabled : this . configurationService . getValue < boolean > ( 'editor.bracketPairColorization.enabled' ) ,
115117 independentColorPoolPerBracketType : this . configurationService . getValue < boolean > ( 'editor.bracketPairColorization.independentColorPoolPerBracketType' ) ,
116118 } ,
117- wordWrap : interactiveSessionEditorConfig . wordWrap
119+ wordWrap : interactiveSessionEditorConfig . wordWrap ,
120+ fontLigatures : editorConfig . fontLigatures ,
118121 }
119122
120123 } ;
0 commit comments