mirror of
https://github.com/go-gitea/gitea.git
synced 2026-05-04 23:33:04 +02:00
e2e8509239
- Replace monaco-editor with CodeMirror 6 - Add `--color-syntax-*` CSS variables for all syntax token types, shared by CodeMirror, Chroma and EasyMDE - Consolidate chroma CSS into a single theme-independent file (`modules/chroma.css`) - Syntax colors in the code editor now match the code view and light/dark themes - Code editor is now 12px instead of 14px font size to match code view and GitHub - Use a global style for kbd elements - When editing existing files, focus will be on codemirror instead of filename input. - Keyboard shortcuts are roughtly the same as VSCode - Add a "Find" button, useful for mobile - Add context menu similar to Monaco - Add a command palette (Ctrl/Cmd+Shift+P or F1) or via button - Add clickable URLs via Ctrl/Cmd+click - Add e2e test for the code editor - Remove `window.codeEditors` global - The main missing Monaco features are hover types and semantic rename but these were not fully working because monaco operated only on single files and only for JS/TS/HTML/CSS/JSON. | | Monaco (main) | CodeMirror (cm) | Delta | |---|---|---|---| | **Build time** | 7.8s | 5.3s | **-32%** | | **JS output** | 25 MB | 14 MB | **-44%** | | **CSS output** | 1.2 MB | 1012 KB | **-17%** | | **Total (no maps)** | 23.3 MB | 12.1 MB | **-48%** | Fixes: #36311 Fixes: #14776 Fixes: #12171 <img width="1333" height="555" alt="image" src="https://github.com/user-attachments/assets/f0fe3a28-1ed9-4f22-bf25-2b161501d7ce" /> --------- Signed-off-by: silverwind <me@silverwind.io> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: Giteabot <teabot@gitea.io> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
136 lines
5.4 KiB
Go
136 lines
5.4 KiB
Go
// Copyright 2025 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package repo
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"path"
|
|
"strconv"
|
|
"strings"
|
|
|
|
git_model "code.gitea.io/gitea/models/git"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/gitrepo"
|
|
"code.gitea.io/gitea/modules/log"
|
|
"code.gitea.io/gitea/modules/markup"
|
|
repo_module "code.gitea.io/gitea/modules/repository"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
"code.gitea.io/gitea/modules/util"
|
|
context_service "code.gitea.io/gitea/services/context"
|
|
)
|
|
|
|
// getUniquePatchBranchName Gets a unique branch name for a new patch branch
|
|
// It will be in the form of <username>-patch-<num> where <num> is the first branch of this format
|
|
// that doesn't already exist. If we exceed 1000 tries or an error is thrown, we just return "" so the user has to
|
|
// type in the branch name themselves (will be an empty field)
|
|
func getUniquePatchBranchName(ctx context.Context, prefixName string, repo *repo_model.Repository) string {
|
|
prefix := prefixName + "-patch-"
|
|
for i := 1; i <= 1000; i++ {
|
|
branchName := fmt.Sprintf("%s%d", prefix, i)
|
|
if exist, err := git_model.IsBranchExist(ctx, repo.ID, branchName); err != nil {
|
|
log.Error("getUniquePatchBranchName: %v", err)
|
|
return ""
|
|
} else if !exist {
|
|
return branchName
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// getClosestParentWithFiles Recursively gets the closest path of parent in a tree that has files when a file in a tree is
|
|
// deleted. It returns "" for the tree root if no parents other than the root have files.
|
|
func getClosestParentWithFiles(gitRepo *git.Repository, branchName, originTreePath string) string {
|
|
var f func(treePath string, commit *git.Commit) string
|
|
f = func(treePath string, commit *git.Commit) string {
|
|
if treePath == "" || treePath == "." {
|
|
return ""
|
|
}
|
|
// see if the tree has entries
|
|
if tree, err := commit.SubTree(treePath); err != nil {
|
|
return f(path.Dir(treePath), commit) // failed to get the tree, going up a dir
|
|
} else if entries, err := tree.ListEntries(); err != nil || len(entries) == 0 {
|
|
return f(path.Dir(treePath), commit) // no files in this dir, going up a dir
|
|
}
|
|
return treePath
|
|
}
|
|
commit, err := gitRepo.GetBranchCommit(branchName) // must get the commit again to get the latest change
|
|
if err != nil {
|
|
log.Error("GetBranchCommit: %v", err)
|
|
return ""
|
|
}
|
|
return f(originTreePath, commit)
|
|
}
|
|
|
|
// CodeEditorConfig is also used by frontend, defined in "codeeditor" module
|
|
type CodeEditorConfig struct {
|
|
Filename string `json:"filename"` // the base name, not full path
|
|
Autofocus bool `json:"autofocus"`
|
|
PreviewableExtensions []string `json:"previewableExtensions,omitempty"`
|
|
LineWrapExtensions []string `json:"lineWrapExtensions,omitempty"`
|
|
LineWrap bool `json:"lineWrap"`
|
|
Previewable bool `json:"previewable,omitempty"`
|
|
|
|
// the following can be read from .editorconfig if exists, or use default value
|
|
IndentStyle string `json:"indentStyle"` // in most cases, keep it empty by default, detected by the source code
|
|
IndentSize int `json:"indentSize"`
|
|
TabWidth int `json:"tabWidth"`
|
|
TrimTrailingWhitespace *bool `json:"trimTrailingWhitespace,omitempty"`
|
|
}
|
|
|
|
func getCodeEditorConfigByEditorconfig(ctx *context_service.Context, treePath string) CodeEditorConfig {
|
|
ret := CodeEditorConfig{Filename: path.Base(treePath)}
|
|
ret.PreviewableExtensions = markup.PreviewableExtensions()
|
|
ret.LineWrapExtensions = setting.Repository.Editor.LineWrapExtensions
|
|
ret.LineWrap = util.SliceContainsString(ret.LineWrapExtensions, path.Ext(treePath), true)
|
|
ret.Previewable = util.SliceContainsString(ret.PreviewableExtensions, path.Ext(treePath), true)
|
|
ec, _, err := ctx.Repo.GetEditorconfig()
|
|
if err == nil {
|
|
def, err := ec.GetDefinitionForFilename(treePath)
|
|
if err == nil {
|
|
ret.IndentStyle = util.IfZero(def.IndentStyle, ret.IndentStyle)
|
|
ret.IndentSize, _ = strconv.Atoi(def.IndentSize)
|
|
ret.TabWidth = def.TabWidth
|
|
ret.TrimTrailingWhitespace = def.TrimTrailingWhitespace
|
|
}
|
|
}
|
|
return ret
|
|
}
|
|
|
|
// getParentTreeFields returns list of parent tree names and corresponding tree paths based on given treePath.
|
|
// eg: []{"a", "b", "c"}, []{"a", "a/b", "a/b/c"}
|
|
// or: []{""}, []{""} for the root treePath
|
|
func getParentTreeFields(treePath string) (treeNames, treePaths []string) {
|
|
treeNames = strings.Split(treePath, "/")
|
|
treePaths = make([]string, len(treeNames))
|
|
for i := range treeNames {
|
|
treePaths[i] = strings.Join(treeNames[:i+1], "/")
|
|
}
|
|
return treeNames, treePaths
|
|
}
|
|
|
|
// getUniqueRepositoryName Gets a unique repository name for a user
|
|
// It will append a -<num> postfix if the name is already taken
|
|
func getUniqueRepositoryName(ctx context.Context, ownerID int64, name string) string {
|
|
uniqueName := name
|
|
for i := 1; i < 1000; i++ {
|
|
_, err := repo_model.GetRepositoryByName(ctx, ownerID, uniqueName)
|
|
if err != nil || repo_model.IsErrRepoNotExist(err) {
|
|
return uniqueName
|
|
}
|
|
uniqueName = fmt.Sprintf("%s-%d", name, i)
|
|
i++
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func editorPushBranchToForkedRepository(ctx context.Context, doer *user_model.User, baseRepo *repo_model.Repository, baseBranchName string, targetRepo *repo_model.Repository, targetBranchName string) error {
|
|
return gitrepo.Push(ctx, baseRepo, targetRepo, git.PushOptions{
|
|
Branch: baseBranchName + ":" + targetBranchName,
|
|
Env: repo_module.PushingEnvironment(doer, targetRepo),
|
|
})
|
|
}
|