From be9fbbcb6e77ef010a85170deda5ec4600d5eddf Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Wed, 9 Oct 2024 17:19:41 -0700 Subject: [PATCH] Fix content type detection --- src-web/lib/contentType.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src-web/lib/contentType.ts b/src-web/lib/contentType.ts index 32dbbaaa..cca144ef 100644 --- a/src-web/lib/contentType.ts +++ b/src-web/lib/contentType.ts @@ -10,19 +10,18 @@ export function languageFromContentType( } else if (justContentType.includes('xml')) { return 'xml'; } else if (justContentType.includes('html')) { - return detectFromContent(content); + return detectFromContent(content, 'html'); } else if (justContentType.includes('javascript')) { return 'javascript'; } - return detectFromContent(content); + return detectFromContent(content, 'text'); } -export function isJSON(text: string): boolean { - return text.startsWith('{') || text.startsWith('['); -} - -function detectFromContent(content: string | null): EditorProps['language'] { +function detectFromContent( + content: string | null, + fallback: EditorProps['language'], +): EditorProps['language'] { if (content == null) return 'text'; if (content.startsWith('{') || content.startsWith('[')) { @@ -30,5 +29,6 @@ function detectFromContent(content: string | null): EditorProps['language'] { } else if (content.startsWith('