1 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/lib/editor_options.js b/app/assets/javascripts/ide/lib/editor_options.js
index 525afcb2083..289027c3054 100644
--- a/app/assets/javascripts/ide/lib/editor_options.js
+++ b/app/assets/javascripts/ide/lib/editor_options.js
@@ -1,3 +1,12 @@
+import { useNewFonts } from '~/lib/utils/common_utils';
+import { getCssVariable } from '~/lib/utils/css_utils';
+
+const fontOptions = {};
+
+if (useNewFonts()) {
+  fontOptions.fontFamily = getCssVariable('--code-editor-font');
+}
+
 export const defaultEditorOptions = {
   model: null,
   readOnly: false,
@@ -9,6 +18,7 @@ export const defaultEditorOptions = {
   wordWrap: 'on',
   glyphMargin: true,
   automaticLayout: true,
+  ...fontOptions,
 };
 
 export const defaultDiffOptions = {
@@ -27,7 +37,6 @@ export const defaultDiffEditorOptions = {
 };
 
 export const defaultModelOptions = {
-  endOfLine: 0,
   insertFinalNewline: true,
   trimTrailingWhitespace: false,
 };