From 40a0ecbc6f75f1b7ee9cba5a9453b6932b83c76c Mon Sep 17 00:00:00 2001
From: Andrew Simachev <andrew.simachev@gmail.com>
Date: Mon, 14 Apr 2025 09:20:31 +0200
Subject: [PATCH] code fix

---
 src/ts/component/block/text.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/ts/component/block/text.tsx b/src/ts/component/block/text.tsx
index d4bc7732f9..2687fdcc50 100644
--- a/src/ts/component/block/text.tsx
+++ b/src/ts/component/block/text.tsx
@@ -738,7 +738,12 @@ const BlockText = observer(class BlockText extends React.Component<Props> {
 					continue;
 				};
 
-				const reg = new RegExp(`^(${k}\\s)`);
+				let space = '\\s';
+				if (newStyle == I.TextStyle.Code) {
+					space = '';
+				};
+
+				const reg = new RegExp(`^(${k})${space}`);
 				const match = value.match(reg);
 
 				if (!match) {
@@ -766,9 +771,11 @@ const BlockText = observer(class BlockText extends React.Component<Props> {
 						S.Block.toggle(rootId, id, true);
 					};
 
-					if ((newStyle == I.TextStyle.Code) && match[2]) {
+					if (newStyle == I.TextStyle.Code) {
+						const lang = match[2] || Storage.get('codeLang') || J.Constant.default.codeLang;
+
 						C.BlockListSetFields(rootId, [ 
-							{ blockId: block.id, fields: { ...block.fields, lang: match[2] } } 
+							{ blockId: block.id, fields: { ...block.fields, lang } } 
 						]);
 					};
 				});