github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

pref: default code block indentation from Tab to 2 Spaces in editor (#6090) 

#### What type of PR is this?

/kind improvement
/area editor
/milestone 2.17.x

#### What this PR does / why we need it:

将默认编辑器中代码块的缩进由一个制表符(\t)，更改为两个空格` {2}`。

#### How to test it?

测试使用 `Tab` 即 `Shift + Tab` 缩进时，是否每次缩进两个空格而不是一个制表符。

#### Does this PR introduce a user-facing change?
```release-note
优化默认编辑器代码块缩进为两个空格。
```
pull/6081/head
Takagi 2024-06-18 14:02:53 +08:00 committed by GitHub
parent 1e37768b35
commit c956533160
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/packages/editor/src/extensions/code-block/code-block.ts
View File

@ -50,7 +50,7 @@ const updateIndent = (tr: Transaction, type: IndentType): Transaction => {
const { from, to } = selection; const { from, to } = selection;
doc.nodesBetween(from, to, (node, pos) => { doc.nodesBetween(from, to, (node, pos) => {
if (from - to == 0 && type === "indent") { if (from - to == 0 && type === "indent") {
tr.insertText("\t", from, to); tr.insertText(" ", from, to);
return false; return false;
} }
@ -60,17 +60,17 @@ const updateIndent = (tr: Transaction, type: IndentType): Transaction => {
precedeLineBreakPos === -1 ? pos + 1 : pos + precedeLineBreakPos + 1; precedeLineBreakPos === -1 ? pos + 1 : pos + precedeLineBreakPos + 1;
const text = doc.textBetween(startBetWeenIndex, to, "\n"); const text = doc.textBetween(startBetWeenIndex, to, "\n");
if (type === "indent") { if (type === "indent") {
let replacedStr = text.replace(/\n/g, "\n\t"); let replacedStr = text.replace(/\n/g, "\n ");
if (startBetWeenIndex === pos + 1) { if (startBetWeenIndex === pos + 1) {
replacedStr = "\t" + replacedStr; replacedStr = " " + replacedStr;
} }
tr.insertText(replacedStr, startBetWeenIndex, to); tr.insertText(replacedStr, startBetWeenIndex, to);
} else { } else {
let replacedStr = text.replace(/\n\t/g, "\n"); let replacedStr = text.replace(/\n {2}/g, "\n");
if (startBetWeenIndex === pos + 1) { if (startBetWeenIndex === pos + 1) {
const firstNewLineIndex = replacedStr.indexOf("\t"); const firstNewLineIndex = replacedStr.indexOf(" ");
if (firstNewLineIndex == 0) { if (firstNewLineIndex == 0) {
replacedStr = replacedStr.replace("\t", ""); replacedStr = replacedStr.replace(" ", "");
} }
} }
tr.insertText(replacedStr, startBetWeenIndex, to); tr.insertText(replacedStr, startBetWeenIndex, to);