6
6
import { Color } from 'vs/base/common/color' ;
7
7
import { Emitter } from 'vs/base/common/event' ;
8
8
import { 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' ;
10
10
import { IConfigurationService } from 'vs/platform/configuration/common/configuration' ;
11
11
import { IThemeService } from 'vs/platform/theme/common/themeService' ;
12
12
import { IViewDescriptorService } from 'vs/workbench/common/views' ;
@@ -33,11 +33,12 @@ export interface IInteractiveSessionInputEditorOptions {
33
33
34
34
export interface IInteractiveSessionResultEditorOptions {
35
35
readonly fontSize : number ;
36
- readonly fontFamily : string ;
36
+ readonly fontFamily : string | undefined ;
37
37
readonly lineHeight : number ;
38
38
readonly fontWeight : string ;
39
39
readonly backgroundColor : Color | undefined ;
40
40
readonly bracketPairColorization : IBracketPairColorizationOptions ;
41
+ readonly fontLigatures : boolean | string | undefined ;
41
42
readonly wordWrap : 'off' | 'on' ;
42
43
43
44
// Bring these back if we make the editors editable
@@ -64,6 +65,7 @@ export class InteractiveSessionEditorOptions extends Disposable {
64
65
'interactiveSession.editor.fontWeight' ,
65
66
'interactiveSession.editor.wordWrap' ,
66
67
'editor.cursorBlinking' ,
68
+ 'editor.fontLigatures' ,
67
69
'editor.accessibilitySupport' ,
68
70
'editor.bracketPairColorization.enabled' ,
69
71
'editor.bracketPairColorization.independentColorPoolPerBracketType' ,
@@ -94,7 +96,7 @@ export class InteractiveSessionEditorOptions extends Disposable {
94
96
}
95
97
96
98
private update ( ) {
97
- const editorConfig = this . configurationService . getValue < any > ( 'editor' ) ;
99
+ const editorConfig = this . configurationService . getValue < IEditorOptions > ( 'editor' ) ;
98
100
99
101
// TODO shouldn't the setting keys be more specific?
100
102
const interactiveSessionEditorConfig = this . configurationService . getValue < IInteractiveSessionConfiguration > ( 'interactiveSession' ) . editor ;
@@ -114,7 +116,8 @@ export class InteractiveSessionEditorOptions extends Disposable {
114
116
enabled : this . configurationService . getValue < boolean > ( 'editor.bracketPairColorization.enabled' ) ,
115
117
independentColorPoolPerBracketType : this . configurationService . getValue < boolean > ( 'editor.bracketPairColorization.independentColorPoolPerBracketType' ) ,
116
118
} ,
117
- wordWrap : interactiveSessionEditorConfig . wordWrap
119
+ wordWrap : interactiveSessionEditorConfig . wordWrap ,
120
+ fontLigatures : editorConfig . fontLigatures ,
118
121
}
119
122
120
123
} ;
0 commit comments