Skip to content

Commit 3453bbc

Browse files
committed
Make font ligatures an option
1 parent 79a58c5 commit 3453bbc

File tree

8 files changed

+25
-2
lines changed

8 files changed

+25
-2
lines changed

packages/app/src/app/components/CodeEditor/Monaco/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1484,7 +1484,7 @@ class MonacoEditor extends React.Component<Props, State> implements Editor {
14841484
'Source Code Pro',
14851485
'monospace'
14861486
),
1487-
fontLigatures: true,
1487+
fontLigatures: settings.enableLigatures,
14881488
minimap: {
14891489
enabled: false,
14901490
},

packages/app/src/app/components/CodeEditor/types.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export type Settings = {
1616
lintEnabled: boolean,
1717
vimMode: boolean,
1818
tabWidth: number,
19+
enableLigatures: boolean,
1920
};
2021

2122
export interface Editor {

packages/app/src/app/pages/Sandbox/Editor/Content/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const settings = store =>
3030
tabWidth: store.preferences.settings.prettierConfig
3131
? store.preferences.settings.prettierConfig.tabWidth || 2
3232
: 2,
33+
enableLigatures: store.preferences.settings.enableLigatures,
3334
}: Settings);
3435

3536
type Props = {

packages/app/src/app/pages/common/Modals/PreferencesModal/EditorPageSettings/EditorSettings/index.js

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ function EditorSettings({ store, signals }) {
8080
{...bindValue('vimMode')}
8181
/>
8282
<SubDescription>
83-
This will override Use CodeMirror setting as Monaco doesn{"'"}t have a VIM mode yet.
83+
This will override Use CodeMirror setting as Monaco doesn{"'"}t have
84+
a VIM mode yet.
8485
</SubDescription>
8586
<Rule />
8687
<PaddedPreference
@@ -96,6 +97,22 @@ function EditorSettings({ store, signals }) {
9697
{...bindValue('fontFamily')}
9798
/>
9899
<Rule />
100+
<PaddedPreference
101+
title="Font ligatures enabled"
102+
type="boolean"
103+
{...bindValue('enableLigatures')}
104+
/>
105+
<SubDescription>
106+
Whether we should enable{' '}
107+
<a
108+
href="https://en.wikipedia.org/wiki/Typographic_ligature"
109+
target="_blank"
110+
rel="noopener noreferrer"
111+
>
112+
font ligatures
113+
</a>.
114+
</SubDescription>
115+
<Rule />
99116
<PaddedPreference
100117
title="Line height"
101118
type="number"

packages/app/src/app/store/modules/preferences/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export default Module({
3939
trailingComma: 'none',
4040
useTabs: false,
4141
vimMode: false,
42+
enableLigatures: false,
4243
},
4344
isLoadingPaymentDetails: true,
4445
paymentDetailError: null,

packages/app/src/app/store/modules/preferences/keys.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ export const autoDownloadTypes = 'settings.autoDownloadTypes';
1414
export const newPackagerExperiment = 'settings.newPackagerExperiment';
1515
export const zenMode = 'settings.zenMode';
1616
export const keybindings = 'settings.keybindings';
17+
export const enableLigatures = 'settings.enableLigatures';

packages/app/src/app/store/modules/preferences/model.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export default {
3939
useTabs: types.boolean,
4040
vimMode: types.boolean,
4141
zenMode: types.boolean,
42+
enableLigatures: types.boolean,
4243
}),
4344
isLoadingPaymentDetails: types.boolean,
4445
itemId: types.string,

packages/app/src/embed/components/Content/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ export default class Content extends React.PureComponent<Props, State> {
226226
autoCompleteEnabled: true,
227227
vimMode: false,
228228
tabWidth: 2,
229+
enableLigatures: false,
229230
});
230231

231232
setCurrentModule = (moduleId: string) => {

0 commit comments

Comments
 (0)