{{ctx.Locale.Tr "repo.issues.new.no_assignees"}}
{{range $issueAssignees}}
-
+
{{ctx.AvatarUtils.Avatar . 20}} {{.GetDisplayName}}
{{end}}
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 82a301da2fe99..fb37d45ce8de2 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -10867,6 +10867,52 @@
}
}
},
+ "/repos/{owner}/{repo}/merge-upstream": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "repository"
+ ],
+ "summary": "Merge a branch from upstream",
+ "operationId": "repoMergeUpstream",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "owner of the repo",
+ "name": "owner",
+ "in": "path",
+ "required": true
+ },
+ {
+ "type": "string",
+ "description": "name of the repo",
+ "name": "repo",
+ "in": "path",
+ "required": true
+ },
+ {
+ "name": "body",
+ "in": "body",
+ "schema": {
+ "$ref": "#/definitions/MergeUpstreamRequest"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "$ref": "#/responses/MergeUpstreamResponse"
+ },
+ "400": {
+ "$ref": "#/responses/error"
+ },
+ "404": {
+ "$ref": "#/responses/notFound"
+ }
+ }
+ }
+ },
"/repos/{owner}/{repo}/milestones": {
"get": {
"produces": [
@@ -22827,6 +22873,26 @@
"x-go-name": "MergePullRequestForm",
"x-go-package": "code.gitea.io/gitea/services/forms"
},
+ "MergeUpstreamRequest": {
+ "type": "object",
+ "properties": {
+ "branch": {
+ "type": "string",
+ "x-go-name": "Branch"
+ }
+ },
+ "x-go-package": "code.gitea.io/gitea/modules/structs"
+ },
+ "MergeUpstreamResponse": {
+ "type": "object",
+ "properties": {
+ "merge_type": {
+ "type": "string",
+ "x-go-name": "MergeStyle"
+ }
+ },
+ "x-go-package": "code.gitea.io/gitea/modules/structs"
+ },
"MigrateRepoOptions": {
"description": "MigrateRepoOptions options for migrating repository's\nthis is used to interact with api v1",
"type": "object",
@@ -26008,6 +26074,18 @@
"type": "string"
}
},
+ "MergeUpstreamRequest": {
+ "description": "",
+ "schema": {
+ "$ref": "#/definitions/MergeUpstreamRequest"
+ }
+ },
+ "MergeUpstreamResponse": {
+ "description": "",
+ "schema": {
+ "$ref": "#/definitions/MergeUpstreamResponse"
+ }
+ },
"Milestone": {
"description": "Milestone",
"schema": {
diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go
index f18ad9e85d78c..2c76aa826f2ce 100644
--- a/tests/integration/actions_trigger_test.go
+++ b/tests/integration/actions_trigger_test.go
@@ -405,7 +405,7 @@ func TestCreateDeleteRefEvent(t *testing.T) {
assert.NotNil(t, run)
// delete the branch
- err = repo_service.DeleteBranch(db.DefaultContext, user2, repo, gitRepo, "test-create-branch")
+ err = repo_service.DeleteBranch(db.DefaultContext, user2, repo, gitRepo, "test-create-branch", nil)
assert.NoError(t, err)
run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
Title: "add workflow",
diff --git a/tests/integration/api_repo_get_contents_test.go b/tests/integration/api_repo_get_contents_test.go
index 68a8608117208..d0f61da0c0402 100644
--- a/tests/integration/api_repo_get_contents_test.go
+++ b/tests/integration/api_repo_get_contents_test.go
@@ -18,6 +18,7 @@ import (
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
repo_service "code.gitea.io/gitea/services/repository"
+ "code.gitea.io/gitea/tests"
"github.com/stretchr/testify/assert"
)
@@ -168,28 +169,37 @@ func testAPIGetContents(t *testing.T, u *url.URL) {
}
func TestAPIGetContentsRefFormats(t *testing.T) {
- onGiteaRun(t, func(t *testing.T, u *url.URL) {
- file := "README.md"
- sha := "65f1bf27bc3bf70f64657658635e66094edbcb4d"
- content := "# repo1\n\nDescription for repo1"
-
- noRef := setting.AppURL + "api/v1/repos/user2/repo1/raw/" + file
- refInPath := setting.AppURL + "api/v1/repos/user2/repo1/raw/" + sha + "/" + file
- refInQuery := setting.AppURL + "api/v1/repos/user2/repo1/raw/" + file + "?ref=" + sha
-
- resp := MakeRequest(t, NewRequest(t, http.MethodGet, noRef), http.StatusOK)
- raw, err := io.ReadAll(resp.Body)
- assert.NoError(t, err)
- assert.EqualValues(t, content, string(raw))
-
- resp = MakeRequest(t, NewRequest(t, http.MethodGet, refInPath), http.StatusOK)
- raw, err = io.ReadAll(resp.Body)
- assert.NoError(t, err)
- assert.EqualValues(t, content, string(raw))
-
- resp = MakeRequest(t, NewRequest(t, http.MethodGet, refInQuery), http.StatusOK)
- raw, err = io.ReadAll(resp.Body)
- assert.NoError(t, err)
- assert.EqualValues(t, content, string(raw))
- })
+ defer tests.PrepareTestEnv(t)()
+
+ file := "README.md"
+ sha := "65f1bf27bc3bf70f64657658635e66094edbcb4d"
+ content := "# repo1\n\nDescription for repo1"
+
+ resp := MakeRequest(t, NewRequest(t, http.MethodGet, "/api/v1/repos/user2/repo1/raw/"+file), http.StatusOK)
+ raw, err := io.ReadAll(resp.Body)
+ assert.NoError(t, err)
+ assert.EqualValues(t, content, string(raw))
+
+ resp = MakeRequest(t, NewRequest(t, http.MethodGet, "/api/v1/repos/user2/repo1/raw/"+sha+"/"+file), http.StatusOK)
+ raw, err = io.ReadAll(resp.Body)
+ assert.NoError(t, err)
+ assert.EqualValues(t, content, string(raw))
+
+ resp = MakeRequest(t, NewRequest(t, http.MethodGet, "/api/v1/repos/user2/repo1/raw/"+file+"?ref="+sha), http.StatusOK)
+ raw, err = io.ReadAll(resp.Body)
+ assert.NoError(t, err)
+ assert.EqualValues(t, content, string(raw))
+
+ resp = MakeRequest(t, NewRequest(t, http.MethodGet, "/api/v1/repos/user2/repo1/raw/"+file+"?ref=master"), http.StatusOK)
+ raw, err = io.ReadAll(resp.Body)
+ assert.NoError(t, err)
+ assert.EqualValues(t, content, string(raw))
+
+ _ = MakeRequest(t, NewRequest(t, http.MethodGet, "/api/v1/repos/user2/repo1/raw/docs/README.md?ref=main"), http.StatusNotFound)
+ _ = MakeRequest(t, NewRequest(t, http.MethodGet, "/api/v1/repos/user2/repo1/raw/README.md?ref=main"), http.StatusOK)
+ _ = MakeRequest(t, NewRequest(t, http.MethodGet, "/api/v1/repos/user2/repo1/raw/docs/README.md?ref=sub-home-md-img-check"), http.StatusOK)
+ _ = MakeRequest(t, NewRequest(t, http.MethodGet, "/api/v1/repos/user2/repo1/raw/README.md?ref=sub-home-md-img-check"), http.StatusNotFound)
+
+ // FIXME: this is an incorrect behavior, non-existing branch falls back to default branch
+ _ = MakeRequest(t, NewRequest(t, http.MethodGet, "/api/v1/repos/user2/repo1/raw/README.md?ref=no-such"), http.StatusOK)
}
diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go
index 2edc95d4c8d5b..169df8618e89d 100644
--- a/tests/integration/pull_merge_test.go
+++ b/tests/integration/pull_merge_test.go
@@ -585,6 +585,8 @@ func TestPullDontRetargetChildOnWrongRepo(t *testing.T) {
elemChildPR := strings.Split(test.RedirectURL(respChildPR), "/")
assert.EqualValues(t, "pulls", elemChildPR[3])
+ defer test.MockVariableValue(&setting.Repository.PullRequest.RetargetChildrenOnMerge, false)()
+
testPullMerge(t, session, elemBasePR[1], elemBasePR[2], elemBasePR[4], repo_model.MergeStyleMerge, true)
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: "repo1"})
@@ -736,12 +738,12 @@ func TestPullAutoMergeAfterCommitStatusSucceed(t *testing.T) {
session.MakeRequest(t, req, http.StatusSeeOther)
// first time insert automerge record, return true
- scheduled, err := automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test")
+ scheduled, err := automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test", false)
assert.NoError(t, err)
assert.True(t, scheduled)
// second time insert automerge record, return false because it does exist
- scheduled, err = automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test")
+ scheduled, err = automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test", false)
assert.Error(t, err)
assert.False(t, scheduled)
@@ -820,12 +822,12 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApproval(t *testing.T) {
session.MakeRequest(t, req, http.StatusSeeOther)
// first time insert automerge record, return true
- scheduled, err := automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test")
+ scheduled, err := automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test", false)
assert.NoError(t, err)
assert.True(t, scheduled)
// second time insert automerge record, return false because it does exist
- scheduled, err = automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test")
+ scheduled, err = automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test", false)
assert.Error(t, err)
assert.False(t, scheduled)
@@ -949,12 +951,12 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.
user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
// first time insert automerge record, return true
- scheduled, err := automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test")
+ scheduled, err := automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test", false)
assert.NoError(t, err)
assert.True(t, scheduled)
// second time insert automerge record, return false because it does exist
- scheduled, err = automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test")
+ scheduled, err = automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test", false)
assert.Error(t, err)
assert.False(t, scheduled)
diff --git a/tests/integration/repo_merge_upstream_test.go b/tests/integration/repo_merge_upstream_test.go
new file mode 100644
index 0000000000000..e3e423c51d5d2
--- /dev/null
+++ b/tests/integration/repo_merge_upstream_test.go
@@ -0,0 +1,122 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+ "fmt"
+ "net/http"
+ "net/url"
+ "strings"
+ "testing"
+ "time"
+
+ auth_model "code.gitea.io/gitea/models/auth"
+ "code.gitea.io/gitea/models/db"
+ git_model "code.gitea.io/gitea/models/git"
+ repo_model "code.gitea.io/gitea/models/repo"
+ "code.gitea.io/gitea/models/unittest"
+ user_model "code.gitea.io/gitea/models/user"
+ api "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/modules/util"
+
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+)
+
+func TestRepoMergeUpstream(t *testing.T) {
+ onGiteaRun(t, func(*testing.T, *url.URL) {
+ forkUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+
+ baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+ baseUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: baseRepo.OwnerID})
+
+ checkFileContent := func(branch, exp string) {
+ req := NewRequest(t, "GET", fmt.Sprintf("/%s/test-repo-fork/raw/branch/%s/new-file.txt", forkUser.Name, branch))
+ resp := MakeRequest(t, req, http.StatusOK)
+ require.Equal(t, exp, resp.Body.String())
+ }
+
+ session := loginUser(t, forkUser.Name)
+ token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
+
+ // create a fork
+ req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/forks", baseUser.Name, baseRepo.Name), &api.CreateForkOption{
+ Name: util.ToPointer("test-repo-fork"),
+ }).AddTokenAuth(token)
+ MakeRequest(t, req, http.StatusAccepted)
+ forkRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: forkUser.ID, Name: "test-repo-fork"})
+
+ // create fork-branch
+ req = NewRequestWithValues(t, "POST", fmt.Sprintf("/%s/test-repo-fork/branches/_new/branch/master", forkUser.Name), map[string]string{
+ "_csrf": GetUserCSRFToken(t, session),
+ "new_branch_name": "fork-branch",
+ })
+ session.MakeRequest(t, req, http.StatusSeeOther)
+
+ queryMergeUpstreamButtonLink := func(htmlDoc *HTMLDoc) string {
+ return htmlDoc.Find(`button[data-url*="merge-upstream"]`).AttrOr("data-url", "")
+ }
+
+ t.Run("HeadBeforeBase", func(t *testing.T) {
+ // add a file in base repo
+ require.NoError(t, createOrReplaceFileInBranch(baseUser, baseRepo, "new-file.txt", "master", "test-content-1"))
+
+ // the repo shows a prompt to "sync fork"
+ var mergeUpstreamLink string
+ require.Eventually(t, func() bool {
+ resp := session.MakeRequest(t, NewRequestf(t, "GET", "/%s/test-repo-fork/src/branch/fork-branch", forkUser.Name), http.StatusOK)
+ htmlDoc := NewHTMLParser(t, resp.Body)
+ mergeUpstreamLink = queryMergeUpstreamButtonLink(htmlDoc)
+ if mergeUpstreamLink == "" {
+ return false
+ }
+ respMsg, _ := htmlDoc.Find(".ui.message:not(.positive)").Html()
+ return strings.Contains(respMsg, `This branch is 1 commit behind
user2/repo1:master`)
+ }, 5*time.Second, 100*time.Millisecond)
+
+ // click the "sync fork" button
+ req = NewRequestWithValues(t, "POST", mergeUpstreamLink, map[string]string{"_csrf": GetUserCSRFToken(t, session)})
+ session.MakeRequest(t, req, http.StatusOK)
+ checkFileContent("fork-branch", "test-content-1")
+ })
+
+ t.Run("BaseChangeAfterHeadChange", func(t *testing.T) {
+ // update the files: base first, head later, and check the prompt
+ require.NoError(t, createOrReplaceFileInBranch(baseUser, baseRepo, "new-file.txt", "master", "test-content-2"))
+ require.NoError(t, createOrReplaceFileInBranch(forkUser, forkRepo, "new-file-other.txt", "fork-branch", "test-content-other"))
+
+ // make sure the base branch's update time is before the fork, to make it test the complete logic
+ baseBranch := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{RepoID: baseRepo.ID, Name: "master"})
+ forkBranch := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{RepoID: forkRepo.ID, Name: "fork-branch"})
+ _, err := db.GetEngine(db.DefaultContext).ID(forkBranch.ID).Update(&git_model.Branch{UpdatedUnix: baseBranch.UpdatedUnix + 1})
+ require.NoError(t, err)
+
+ // the repo shows a prompt to "sync fork"
+ require.Eventually(t, func() bool {
+ resp := session.MakeRequest(t, NewRequestf(t, "GET", "/%s/test-repo-fork/src/branch/fork-branch", forkUser.Name), http.StatusOK)
+ htmlDoc := NewHTMLParser(t, resp.Body)
+ respMsg, _ := htmlDoc.Find(".ui.message:not(.positive)").Html()
+ return strings.Contains(respMsg, `The base branch
user2/repo1:master has new changes`)
+ }, 5*time.Second, 100*time.Millisecond)
+
+ // and do the merge-upstream by API
+ req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/test-repo-fork/merge-upstream", forkUser.Name), &api.MergeUpstreamRequest{
+ Branch: "fork-branch",
+ }).AddTokenAuth(token)
+ resp := MakeRequest(t, req, http.StatusOK)
+ checkFileContent("fork-branch", "test-content-2")
+
+ var mergeResp api.MergeUpstreamResponse
+ DecodeJSON(t, resp, &mergeResp)
+ assert.Equal(t, "merge", mergeResp.MergeStyle)
+
+ // after merge, there should be no "sync fork" button anymore
+ require.Eventually(t, func() bool {
+ resp := session.MakeRequest(t, NewRequestf(t, "GET", "/%s/test-repo-fork/src/branch/fork-branch", forkUser.Name), http.StatusOK)
+ htmlDoc := NewHTMLParser(t, resp.Body)
+ return queryMergeUpstreamButtonLink(htmlDoc) == ""
+ }, 5*time.Second, 100*time.Millisecond)
+ })
+ })
+}
diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue
index bafeec6c97d07..3be7b802a321c 100644
--- a/web_src/js/components/PullRequestMergeForm.vue
+++ b/web_src/js/components/PullRequestMergeForm.vue
@@ -129,7 +129,7 @@ function clearMergeMessage() {
{{ mergeForm.textCancel }}
-
+
diff --git a/web_src/js/features/comp/EditorMarkdown.test.ts b/web_src/js/features/comp/EditorMarkdown.test.ts
index 7b4b44e83cb56..9f34d77348228 100644
--- a/web_src/js/features/comp/EditorMarkdown.test.ts
+++ b/web_src/js/features/comp/EditorMarkdown.test.ts
@@ -1,4 +1,166 @@
-import {initTextareaMarkdown} from './EditorMarkdown.ts';
+import {initTextareaMarkdown, markdownHandleIndention, textareaSplitLines} from './EditorMarkdown.ts';
+
+test('textareaSplitLines', () => {
+ let ret = textareaSplitLines('a\nbc\nd', 0);
+ expect(ret).toEqual({lines: ['a', 'bc', 'd'], lengthBeforePosLine: 0, posLineIndex: 0, inlinePos: 0});
+
+ ret = textareaSplitLines('a\nbc\nd', 1);
+ expect(ret).toEqual({lines: ['a', 'bc', 'd'], lengthBeforePosLine: 0, posLineIndex: 0, inlinePos: 1});
+
+ ret = textareaSplitLines('a\nbc\nd', 2);
+ expect(ret).toEqual({lines: ['a', 'bc', 'd'], lengthBeforePosLine: 2, posLineIndex: 1, inlinePos: 0});
+
+ ret = textareaSplitLines('a\nbc\nd', 3);
+ expect(ret).toEqual({lines: ['a', 'bc', 'd'], lengthBeforePosLine: 2, posLineIndex: 1, inlinePos: 1});
+
+ ret = textareaSplitLines('a\nbc\nd', 4);
+ expect(ret).toEqual({lines: ['a', 'bc', 'd'], lengthBeforePosLine: 2, posLineIndex: 1, inlinePos: 2});
+
+ ret = textareaSplitLines('a\nbc\nd', 5);
+ expect(ret).toEqual({lines: ['a', 'bc', 'd'], lengthBeforePosLine: 5, posLineIndex: 2, inlinePos: 0});
+
+ ret = textareaSplitLines('a\nbc\nd', 6);
+ expect(ret).toEqual({lines: ['a', 'bc', 'd'], lengthBeforePosLine: 5, posLineIndex: 2, inlinePos: 1});
+});
+
+test('markdownHandleIndention', () => {
+ const testInput = (input: string, expected?: string) => {
+ const inputPos = input.indexOf('|');
+ input = input.replace('|', '');
+ const ret = markdownHandleIndention({value: input, selStart: inputPos, selEnd: inputPos});
+ if (expected === null) {
+ expect(ret).toEqual({handled: false});
+ } else {
+ const expectedPos = expected.indexOf('|');
+ expected = expected.replace('|', '');
+ expect(ret).toEqual({
+ handled: true,
+ valueSelection: {value: expected, selStart: expectedPos, selEnd: expectedPos},
+ });
+ }
+ };
+
+ testInput(`
+ a|b
+`, `
+ a
+ |b
+`);
+
+ testInput(`
+1. a
+2. |
+`, `
+1. a
+|
+`);
+
+ testInput(`
+|1. a
+`, null); // let browser handle it
+
+ testInput(`
+1. a
+1. b|c
+`, `
+1. a
+2. b
+3. |c
+`);
+
+ testInput(`
+2. a
+2. b|
+
+1. x
+1. y
+`, `
+1. a
+2. b
+3. |
+
+1. x
+1. y
+`);
+
+ testInput(`
+2. a
+2. b
+
+1. x|
+1. y
+`, `
+2. a
+2. b
+
+1. x
+2. |
+3. y
+`);
+
+ testInput(`
+1. a
+2. b|
+3. c
+`, `
+1. a
+2. b
+3. |
+4. c
+`);
+
+ testInput(`
+1. a
+ 1. b
+ 2. b
+ 3. b
+ 4. b
+1. c|
+`, `
+1. a
+ 1. b
+ 2. b
+ 3. b
+ 4. b
+2. c
+3. |
+`);
+
+ testInput(`
+1. a
+2. a
+3. a
+4. a
+5. a
+6. a
+7. a
+8. a
+9. b|c
+`, `
+1. a
+2. a
+3. a
+4. a
+5. a
+6. a
+7. a
+8. a
+9. b
+10. |c
+`);
+
+ // this is a special case, it's difficult to re-format the parent level at the moment, so leave it to the future
+ testInput(`
+1. a
+ 2. b|
+3. c
+`, `
+1. a
+ 1. b
+ 2. |
+3. c
+`);
+});
test('EditorMarkdown', () => {
const textarea = document.createElement('textarea');
@@ -32,10 +194,10 @@ test('EditorMarkdown', () => {
testInput({value: '1. \n2. ', pos: 3}, {value: '\n2. ', pos: 0});
testInput('- x', '- x\n- ');
- testInput('1. foo', '1. foo\n1. ');
- testInput({value: '1. a\n2. b\n3. c', pos: 4}, {value: '1. a\n1. \n2. b\n3. c', pos: 8});
+ testInput('1. foo', '1. foo\n2. ');
+ testInput({value: '1. a\n2. b\n3. c', pos: 4}, {value: '1. a\n2. \n3. b\n4. c', pos: 8});
testInput('- [ ]', '- [ ]\n- ');
testInput('- [ ] foo', '- [ ] foo\n- [ ] ');
testInput('* [x] foo', '* [x] foo\n* [ ] ');
- testInput('1. [x] foo', '1. [x] foo\n1. [ ] ');
+ testInput('1. [x] foo', '1. [x] foo\n2. [ ] ');
});
diff --git a/web_src/js/features/comp/EditorMarkdown.ts b/web_src/js/features/comp/EditorMarkdown.ts
index 5e2ef121f5297..d3ed492396fef 100644
--- a/web_src/js/features/comp/EditorMarkdown.ts
+++ b/web_src/js/features/comp/EditorMarkdown.ts
@@ -14,7 +14,13 @@ export function textareaInsertText(textarea, value) {
triggerEditorContentChanged(textarea);
}
-function handleIndentSelection(textarea, e) {
+type TextareaValueSelection = {
+ value: string;
+ selStart: number;
+ selEnd: number;
+}
+
+function handleIndentSelection(textarea: HTMLTextAreaElement, e) {
const selStart = textarea.selectionStart;
const selEnd = textarea.selectionEnd;
if (selEnd === selStart) return; // do not process when no selection
@@ -56,53 +62,125 @@ function handleIndentSelection(textarea, e) {
triggerEditorContentChanged(textarea);
}
-function handleNewline(textarea: HTMLTextAreaElement, e: Event) {
- const selStart = textarea.selectionStart;
- const selEnd = textarea.selectionEnd;
- if (selEnd !== selStart) return; // do not process when there is a selection
+type MarkdownHandleIndentionResult = {
+ handled: boolean;
+ valueSelection?: TextareaValueSelection;
+}
+
+type TextLinesBuffer = {
+ lines: string[];
+ lengthBeforePosLine: number;
+ posLineIndex: number;
+ inlinePos: number
+}
+
+export function textareaSplitLines(value: string, pos: number): TextLinesBuffer {
+ const lines = value.split('\n');
+ let lengthBeforePosLine = 0, inlinePos = 0, posLineIndex = 0;
+ for (; posLineIndex < lines.length; posLineIndex++) {
+ const lineLength = lines[posLineIndex].length + 1;
+ if (lengthBeforePosLine + lineLength > pos) {
+ inlinePos = pos - lengthBeforePosLine;
+ break;
+ }
+ lengthBeforePosLine += lineLength;
+ }
+ return {lines, lengthBeforePosLine, posLineIndex, inlinePos};
+}
+
+function markdownReformatListNumbers(linesBuf: TextLinesBuffer, indention: string) {
+ const reDeeperIndention = new RegExp(`^${indention}\\s+`);
+ const reSameLevel = new RegExp(`^${indention}([0-9]+)\\.`);
+ let firstLineIdx: number;
+ for (firstLineIdx = linesBuf.posLineIndex - 1; firstLineIdx >= 0; firstLineIdx--) {
+ const line = linesBuf.lines[firstLineIdx];
+ if (!reDeeperIndention.test(line) && !reSameLevel.test(line)) break;
+ }
+ firstLineIdx++;
+ let num = 1;
+ for (let i = firstLineIdx; i < linesBuf.lines.length; i++) {
+ const oldLine = linesBuf.lines[i];
+ const sameLevel = reSameLevel.test(oldLine);
+ if (!sameLevel && !reDeeperIndention.test(oldLine)) break;
+ if (sameLevel) {
+ const newLine = `${indention}${num}.${oldLine.replace(reSameLevel, '')}`;
+ linesBuf.lines[i] = newLine;
+ num++;
+ if (linesBuf.posLineIndex === i) {
+ // need to correct the cursor inline position if the line length changes
+ linesBuf.inlinePos += newLine.length - oldLine.length;
+ linesBuf.inlinePos = Math.max(0, linesBuf.inlinePos);
+ linesBuf.inlinePos = Math.min(newLine.length, linesBuf.inlinePos);
+ }
+ }
+ }
+ recalculateLengthBeforeLine(linesBuf);
+}
+
+function recalculateLengthBeforeLine(linesBuf: TextLinesBuffer) {
+ linesBuf.lengthBeforePosLine = 0;
+ for (let i = 0; i < linesBuf.posLineIndex; i++) {
+ linesBuf.lengthBeforePosLine += linesBuf.lines[i].length + 1;
+ }
+}
- const value = textarea.value;
+export function markdownHandleIndention(tvs: TextareaValueSelection): MarkdownHandleIndentionResult {
+ const unhandled: MarkdownHandleIndentionResult = {handled: false};
+ if (tvs.selEnd !== tvs.selStart) return unhandled; // do not process when there is a selection
- // find the current line
- // * if selStart is 0, lastIndexOf(..., -1) is the same as lastIndexOf(..., 0)
- // * if lastIndexOf reruns -1, lineStart is 0 and it is still correct.
- const lineStart = value.lastIndexOf('\n', selStart - 1) + 1;
- let lineEnd = value.indexOf('\n', selStart);
- lineEnd = lineEnd < 0 ? value.length : lineEnd;
- let line = value.slice(lineStart, lineEnd);
- if (!line) return; // if the line is empty, do nothing, let the browser handle it
+ const linesBuf = textareaSplitLines(tvs.value, tvs.selStart);
+ const line = linesBuf.lines[linesBuf.posLineIndex] ?? '';
+ if (!line) return unhandled; // if the line is empty, do nothing, let the browser handle it
// parse the indention
- const indention = /^\s*/.exec(line)[0];
- line = line.slice(indention.length);
+ let lineContent = line;
+ const indention = /^\s*/.exec(lineContent)[0];
+ lineContent = lineContent.slice(indention.length);
+ if (linesBuf.inlinePos <= indention.length) return unhandled; // if cursor is at the indention, do nothing, let the browser handle it
// parse the prefixes: "1. ", "- ", "* ", there could also be " [ ] " or " [x] " for task lists
// there must be a space after the prefix because none of "1.foo" / "-foo" is a list item
- const prefixMatch = /^([0-9]+\.|[-*])(\s\[([ x])\])?\s/.exec(line);
+ const prefixMatch = /^([0-9]+\.|[-*])(\s\[([ x])\])?\s/.exec(lineContent);
let prefix = '';
if (prefixMatch) {
prefix = prefixMatch[0];
- if (lineStart + prefix.length > selStart) prefix = ''; // do not add new line if cursor is at prefix
+ if (prefix.length > linesBuf.inlinePos) prefix = ''; // do not add new line if cursor is at prefix
}
- line = line.slice(prefix.length);
- if (!indention && !prefix) return; // if no indention and no prefix, do nothing, let the browser handle it
+ lineContent = lineContent.slice(prefix.length);
+ if (!indention && !prefix) return unhandled; // if no indention and no prefix, do nothing, let the browser handle it
- e.preventDefault();
- if (!line) {
+ if (!lineContent) {
// clear current line if we only have i.e. '1. ' and the user presses enter again to finish creating a list
- textarea.value = value.slice(0, lineStart) + value.slice(lineEnd);
- textarea.setSelectionRange(selStart - prefix.length, selStart - prefix.length);
+ linesBuf.lines[linesBuf.posLineIndex] = '';
+ linesBuf.inlinePos = 0;
} else {
- // start a new line with the same indention and prefix
+ // start a new line with the same indention
let newPrefix = prefix;
- // a simple approach, otherwise it needs to parse the lines after the current line
if (/^\d+\./.test(prefix)) newPrefix = `1. ${newPrefix.slice(newPrefix.indexOf('.') + 2)}`;
newPrefix = newPrefix.replace('[x]', '[ ]');
- const newLine = `\n${indention}${newPrefix}`;
- textarea.value = value.slice(0, selStart) + newLine + value.slice(selEnd);
- textarea.setSelectionRange(selStart + newLine.length, selStart + newLine.length);
+
+ const inlinePos = linesBuf.inlinePos;
+ linesBuf.lines[linesBuf.posLineIndex] = line.substring(0, inlinePos);
+ const newLineLeft = `${indention}${newPrefix}`;
+ const newLine = `${newLineLeft}${line.substring(inlinePos)}`;
+ linesBuf.lines.splice(linesBuf.posLineIndex + 1, 0, newLine);
+ linesBuf.posLineIndex++;
+ linesBuf.inlinePos = newLineLeft.length;
+ recalculateLengthBeforeLine(linesBuf);
}
+
+ markdownReformatListNumbers(linesBuf, indention);
+ const newPos = linesBuf.lengthBeforePosLine + linesBuf.inlinePos;
+ return {handled: true, valueSelection: {value: linesBuf.lines.join('\n'), selStart: newPos, selEnd: newPos}};
+}
+
+function handleNewline(textarea: HTMLTextAreaElement, e: Event) {
+ const ret = markdownHandleIndention({value: textarea.value, selStart: textarea.selectionStart, selEnd: textarea.selectionEnd});
+ if (!ret.handled) return;
+ e.preventDefault();
+ textarea.value = ret.valueSelection.value;
+ textarea.setSelectionRange(ret.valueSelection.selStart, ret.valueSelection.selEnd);
triggerEditorContentChanged(textarea);
}