use monaco's eol detection

Author: silverwind

web_src/js/features/codeeditor.js

@@ -1,5 +1,5 @@
 import tinycolor from 'tinycolor2';
-import {basename, extname, isObject, isDarkTheme, detectEol} from '../utils.js';
+import {basename, extname, isObject, isDarkTheme} from '../utils.js';
 import {onInputDebounce} from '../utils/dom.js';
 
 const languagesByFilename = {};
@@ -119,8 +119,11 @@ export async function createMonaco(textarea, filename, editorOpts) {
 
   const model = editor.getModel();
 
-  // set eol mode to value from editorconfig or content-detected value
-  model.setEOL(monaco.editor.EndOfLineSequence[eol || detectEol(value) || 'LF']);
+  // monaco performs auto-detection of dominant EOL in the file, biased towards LF for
+  // empty files, if there is an editorconfig value, override this detected value
+  if (eol) {
+    model.setEOL(monaco.editor.EndOfLineSequence[eol]);
+  }
 
   model.onDidChangeContent(() => {
     textarea.value = editor.getValue();
@@ -197,6 +200,6 @@ function getEditorConfigOptions(ec) {
   opts.insertSpaces = ec.indent_style === 'space';
   opts.useTabStops = ec.indent_style === 'tab';
   const eol = ec.end_of_line?.toUpperCase();
-  if (['LF', 'CRLF'].includes(eol)) opts.eol = eol;
+  opts.eol = ['LF', 'CRLF'].includes(eol) ? eol : undefined;
   return opts;
 }

web_src/js/utils.js

@@ -128,14 +128,3 @@ export function decodeURLEncodedBase64(base64url) {
     .replace(/_/g, '/')
     .replace(/-/g, '+'));
 }
-
-// Detect dominant line ending in a string
-// based on https://github.com/sindresorhus/detect-newline
-export function detectEol(str) {
-  const newlines = (str || '').match(/\r?\n/g) || [];
-  if (newlines.length === 0) return undefined;
-  const crlf = newlines.filter((newline) => newline === '\r\n').length;
-  const lf = newlines.length - crlf;
-  if (crlf === lf) return undefined;
-  return crlf > lf ? 'CRLF' : 'LF';
-}

web_src/js/utils.test.js

@@ -3,7 +3,6 @@ import {
   basename, extname, isObject, stripTags, parseIssueHref,
   parseUrl, translateMonth, translateDay, blobToDataURI,
   toAbsoluteUrl, encodeURLEncodedBase64, decodeURLEncodedBase64,
-  detectEol,
 } from './utils.js';
 
 test('basename', () => {
@@ -114,11 +113,3 @@ test('encodeURLEncodedBase64, decodeURLEncodedBase64', () => {
   expect(Array.from(decodeURLEncodedBase64('YQ'))).toEqual(Array.from(uint8array('a')));
   expect(Array.from(decodeURLEncodedBase64('YQ=='))).toEqual(Array.from(uint8array('a')));
 });
-
-test('detectEol', () => {
-  expect(detectEol(undefined)).toEqual(undefined);
-  expect(detectEol('')).toEqual(undefined);
-  expect(detectEol('a\nb')).toEqual('LF');
-  expect(detectEol('a\nb\r\n')).toEqual(undefined);
-  expect(detectEol('a\nb\r\nc\r\n')).toEqual('CRLF');
-});