Skip to content

Commit 4412eee

Browse files
silverwindsilverwind
committed
Merge remote-tracking branch 'origin/main' into fontsize
* origin/main: Replace all simple inline styles with tailwind (go-gitea#30032) Migrate font-weight helpers to tailwind (go-gitea#30027) Remove jQuery from the issue "go to" button (go-gitea#30028) Determine fuzziness of bleve indexer by keyword length (go-gitea#29706) Escape paths for find file correctly (go-gitea#30026)
2 parents f36433f + 0bef9a2 commit 4412eee

File tree

25 files changed

+75
-81
lines changed

25 files changed

+75
-81
lines changed

‎modules/indexer/code/bleve/bleve.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ import (
3939
const (
4040
unicodeNormalizeName = "unicodeNormalize"
4141
maxBatchSize = 16
42+
// fuzzyDenominator determines the levenshtein distance per each character of a keyword
43+
fuzzyDenominator = 4
4244
)
4345

4446
func addUnicodeNormalizeTokenFilter(m *mapping.IndexMappingImpl) error {
@@ -239,15 +241,12 @@ func (b *Indexer) Search(ctx context.Context, opts *internal.SearchOptions) (int
239241
keywordQuery query.Query
240242
)
241243

244+
phraseQuery := bleve.NewMatchPhraseQuery(opts.Keyword)
245+
phraseQuery.FieldVal = "Content"
246+
phraseQuery.Analyzer = repoIndexerAnalyzer
247+
keywordQuery = phraseQuery
242248
if opts.IsKeywordFuzzy {
243-
phraseQuery := bleve.NewMatchPhraseQuery(opts.Keyword)
244-
phraseQuery.FieldVal = "Content"
245-
phraseQuery.Analyzer = repoIndexerAnalyzer
246-
keywordQuery = phraseQuery
247-
} else {
248-
prefixQuery := bleve.NewPrefixQuery(opts.Keyword)
249-
prefixQuery.FieldVal = "Content"
250-
keywordQuery = prefixQuery
249+
phraseQuery.Fuzziness = len(opts.Keyword) / fuzzyDenominator
251250
}
252251

253252
if len(opts.RepoIDs) > 0 {

‎modules/indexer/internal/bleve/query.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,11 @@ func NumericEqualityQuery(value int64, field string) *query.NumericRangeQuery {
2020
}
2121

2222
// MatchPhraseQuery generates a match phrase query for the given phrase, field and analyzer
23-
func MatchPhraseQuery(matchPhrase, field, analyzer string) *query.MatchPhraseQuery {
23+
func MatchPhraseQuery(matchPhrase, field, analyzer string, fuzziness int) *query.MatchPhraseQuery {
2424
q := bleve.NewMatchPhraseQuery(matchPhrase)
2525
q.FieldVal = field
2626
q.Analyzer = analyzer
27-
return q
28-
}
29-
30-
// PrefixQuery generates a match prefix query for the given prefix and field
31-
func PrefixQuery(matchPrefix, field string) *query.PrefixQuery {
32-
q := bleve.NewPrefixQuery(matchPrefix)
33-
q.FieldVal = field
27+
q.Fuzziness = fuzziness
3428
return q
3529
}
3630

‎modules/indexer/issues/bleve/bleve.go

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ func addUnicodeNormalizeTokenFilter(m *mapping.IndexMappingImpl) error {
3535
})
3636
}
3737

38-
const maxBatchSize = 16
38+
const (
39+
maxBatchSize = 16
40+
// fuzzyDenominator determines the levenshtein distance per each character of a keyword
41+
fuzzyDenominator = 4
42+
)
3943

4044
// IndexerData an update to the issue indexer
4145
type IndexerData internal.IndexerData
@@ -156,19 +160,16 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
156160
var queries []query.Query
157161

158162
if options.Keyword != "" {
163+
fuzziness := 0
159164
if options.IsFuzzyKeyword {
160-
queries = append(queries, bleve.NewDisjunctionQuery([]query.Query{
161-
inner_bleve.MatchPhraseQuery(options.Keyword, "title", issueIndexerAnalyzer),
162-
inner_bleve.MatchPhraseQuery(options.Keyword, "content", issueIndexerAnalyzer),
163-
inner_bleve.MatchPhraseQuery(options.Keyword, "comments", issueIndexerAnalyzer),
164-
}...))
165-
} else {
166-
queries = append(queries, bleve.NewDisjunctionQuery([]query.Query{
167-
inner_bleve.PrefixQuery(options.Keyword, "title"),
168-
inner_bleve.PrefixQuery(options.Keyword, "content"),
169-
inner_bleve.PrefixQuery(options.Keyword, "comments"),
170-
}...))
165+
fuzziness = len(options.Keyword) / fuzzyDenominator
171166
}
167+
168+
queries = append(queries, bleve.NewDisjunctionQuery([]query.Query{
169+
inner_bleve.MatchPhraseQuery(options.Keyword, "title", issueIndexerAnalyzer, fuzziness),
170+
inner_bleve.MatchPhraseQuery(options.Keyword, "content", issueIndexerAnalyzer, fuzziness),
171+
inner_bleve.MatchPhraseQuery(options.Keyword, "comments", issueIndexerAnalyzer, fuzziness),
172+
}...))
172173
}
173174

174175
if len(options.RepoIDs) > 0 || options.AllPublic {

‎tailwind.config.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@ export default {
6666
'3xl': '24px',
6767
'full': 'var(--border-radius-circle)', // 50%
6868
},
69+
fontWeight: {
70+
light: 'var(--font-weight-light)',
71+
normal: 'var(--font-weight-normal)',
72+
medium: 'var(--font-weight-medium)',
73+
semibold: 'var(--font-weight-semibold)',
74+
bold: 'var(--font-weight-bold)',
75+
},
6976
fontSize: { // not using `rem` units because our root is currently 14px
7077
'xs': '12px',
7178
'sm': '14px',

‎templates/admin/notice.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<td><div class="ui checkbox tw-flex" data-id="{{.ID}}"><input type="checkbox"></div></td>
2121
<td>{{.ID}}</td>
2222
<td>{{ctx.Locale.Tr .TrStr}}</td>
23-
<td class="view-detail auto-ellipsis" style="width: 80%;"><span class="notice-description">{{.Description}}</span></td>
23+
<td class="view-detail auto-ellipsis tw-w-4/5"><span class="notice-description">{{.Description}}</span></td>
2424
<td nowrap>{{DateTime "short" .CreatedUnix}}</td>
2525
<td class="view-detail"><a href="#">{{svg "octicon-note" 16}}</a></td>
2626
</tr>

‎templates/devtest/flex-list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</div>
7474
<div class="flex-item-trailing">
7575
<a class="muted" href="{{$.Link}}">
76-
<span class="flex-text-inline"><i class="color-icon gt-mr-3" style="background-color: aqua"></i>Go</span>
76+
<span class="flex-text-inline"><i class="color-icon gt-mr-3 tw-bg-blue"></i>Go</span>
7777
</a>
7878
<a class="text grey flex-text-inline" href="{{$.Link}}">{{svg "octicon-star" 16}}45000</a>
7979
<a class="text grey flex-text-inline" href="{{$.Link}}">{{svg "octicon-git-branch" 16}}1234</a>

‎templates/devtest/tmplerr.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{{template "base/head" .}}
22
<div class="page-content devtest">
33
<div class="tw-flex">
4-
<div style="width: 80%; ">
4+
<div class="tw-w-4/5">
55
hello hello hello hello hello hello hello hello hello hello
66
</div>
7-
<div style="width: 20%;">
7+
<div class="tw-w-1/5">
88
{{template "devtest/tmplerr-sub" .}}
99
</div>
1010
</div>

‎templates/repo/diff/box.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
{{svg "octicon-chevron-down" 18}}
120120
{{end}}
121121
</button>
122-
<div class="gt-font-semibold tw-flex tw-items-center gt-mono">
122+
<div class="tw-font-semibold tw-flex tw-items-center gt-mono">
123123
{{if $file.IsBin}}
124124
<span class="gt-ml-1 gt-mr-3">
125125
{{ctx.Locale.Tr "repo.diff.bin"}}
@@ -178,7 +178,7 @@
178178
<div class="diff-file-body ui attached unstackable table segment" {{if and $file.IsViewed $.IsShowingAllCommits}}data-folded="true"{{end}}>
179179
<div id="diff-source-{{$file.NameHash}}" class="file-body file-code unicode-escaped code-diff{{if $.IsSplitStyle}} code-diff-split{{else}} code-diff-unified{{end}}{{if $showFileViewToggle}} gt-hidden{{end}}">
180180
{{if or $file.IsIncomplete $file.IsBin}}
181-
<div class="diff-file-body binary" style="padding: 5px 10px;">
181+
<div class="diff-file-body binary">
182182
{{if $file.IsIncomplete}}
183183
{{if $file.IsIncompleteLineTooLong}}
184184
{{ctx.Locale.Tr "repo.diff.file_suppressed_line_too_long"}}

‎templates/repo/diff/comments.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="ui top attached header comment-header tw-flex tw-items-center tw-justify-between">
1212
<div class="comment-header-left tw-flex tw-items-center">
1313
{{if .OriginalAuthor}}
14-
<span class="text black gt-font-semibold gt-mr-2">
14+
<span class="text black tw-font-semibold gt-mr-2">
1515
{{svg (MigrationIcon $.root.Repository.GetOriginalURLHostname)}}
1616
{{.OriginalAuthor}}
1717
</span>

‎templates/repo/header.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</div>
99
<div class="flex-item-main">
1010
<div class="flex-item-title tw-text-18">
11-
<a class="muted gt-font-normal" href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>/<a class="muted" href="{{$.RepoLink}}">{{.Name}}</a>
11+
<a class="muted tw-font-normal" href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>/<a class="muted" href="{{$.RepoLink}}">{{.Name}}</a>
1212
</div>
1313
</div>
1414
<div class="flex-item-trailing">

‎templates/repo/issue/view_content.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<div class="ui top attached header comment-header tw-flex tw-items-center tw-justify-between" role="heading" aria-level="3">
2424
<div class="comment-header-left tw-flex tw-items-center">
2525
{{if .Issue.OriginalAuthor}}
26-
<span class="text black gt-font-semibold">
26+
<span class="text black tw-font-semibold">
2727
{{svg (MigrationIcon .Repository.GetOriginalURLHostname)}}
2828
{{.Issue.OriginalAuthor}}
2929
</span>

‎templates/repo/issue/view_content/comments.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<div class="ui top attached header comment-header tw-flex tw-items-center tw-justify-between" role="heading" aria-level="3">
2929
<div class="comment-header-left tw-flex tw-items-center">
3030
{{if .OriginalAuthor}}
31-
<span class="text black gt-font-semibold gt-mr-2">
31+
<span class="text black tw-font-semibold gt-mr-2">
3232
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
3333
{{.OriginalAuthor}}
3434
</span>
@@ -411,7 +411,7 @@
411411
{{end}}
412412
<span class="text grey muted-links">
413413
{{if .OriginalAuthor}}
414-
<span class="text black gt-font-semibold">
414+
<span class="text black tw-font-semibold">
415415
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
416416
{{.OriginalAuthor}}
417417
</span>

‎templates/repo/issue/view_content/reference_issue_dialog.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="header">
33
{{ctx.Locale.Tr "repo.issues.context.reference_issue"}}
44
</div>
5-
<div class="content" style="text-align:left">
5+
<div class="content tw-text-left">
66
<form class="ui form form-fetch-action" action="{{printf "%s/issues/new" .Repository.Link}}" method="post">
77
{{.CsrfTokenHtml}}
88
<div class="ui segment content">

‎templates/repo/pulls/tab_menu.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{{ctx.Locale.Tr "repo.pulls.tab_files"}}
1616
<span class="ui small label">{{if .NumFiles}}{{.NumFiles}}{{else}}-{{end}}</span>
1717
</a>
18-
<span class="item tw-ml-auto gt-pr-0 gt-font-bold tw-flex tw-items-center gt-gap-3">
18+
<span class="item tw-ml-auto gt-pr-0 tw-font-bold tw-flex tw-items-center gt-gap-3">
1919
<span><span class="text green">{{if .Diff.TotalAddition}}+{{.Diff.TotalAddition}}{{end}}</span> <span class="text red">{{if .Diff.TotalDeletion}}-{{.Diff.TotalDeletion}}{{end}}</span></span>
2020
<span class="diff-stats-bar">
2121
<div class="diff-stats-add-bar" style="width: {{Eval 100 "*" .Diff.TotalAddition "/" "(" .Diff.TotalAddition "+" .Diff.TotalDeletion "+" 0.0 ")"}}%"></div>

‎templates/repo/settings/deploy_keys.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<label for="is_writable">
3232
{{ctx.Locale.Tr "repo.settings.is_writable"}}
3333
</label>
34-
<small style="padding-left: 26px;">{{ctx.Locale.Tr "repo.settings.is_writable_info"}}</small>
34+
<small class="tw-pl-[26px]">{{ctx.Locale.Tr "repo.settings.is_writable_info"}}</small>
3535
</div>
3636
</div>
3737
<button class="ui primary button">

‎templates/repo/settings/options.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<table class="ui table">
111111
<thead>
112112
<tr>
113-
<th style="width:40%">{{ctx.Locale.Tr "repo.settings.mirror_settings.mirrored_repository"}}</th>
113+
<th class="tw-w-2/5">{{ctx.Locale.Tr "repo.settings.mirror_settings.mirrored_repository"}}</th>
114114
<th>{{ctx.Locale.Tr "repo.settings.mirror_settings.direction"}}</th>
115115
<th>{{ctx.Locale.Tr "repo.settings.mirror_settings.last_update"}}</th>
116116
<th></th>
@@ -207,7 +207,7 @@
207207
<table class="ui table">
208208
<thead>
209209
<tr>
210-
<th style="width:40%">{{ctx.Locale.Tr "repo.settings.mirror_settings.pushed_repository"}}</th>
210+
<th class="tw-w-2/5">{{ctx.Locale.Tr "repo.settings.mirror_settings.pushed_repository"}}</th>
211211
<th>{{ctx.Locale.Tr "repo.settings.mirror_settings.direction"}}</th>
212212
<th>{{ctx.Locale.Tr "repo.settings.mirror_settings.last_update"}}</th>
213213
<th></th>

‎templates/repo/sub_menu.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
{{range .LanguageStats}}
2626
<div class="item">
2727
<i class="color-icon" style="background-color: {{.Color}}"></i>
28-
<span class="gt-font-semibold">
28+
<span class="tw-font-semibold">
2929
{{if eq .Language "other"}}
3030
{{ctx.Locale.Tr "repo.language_other"}}
3131
{{else}}

‎templates/shared/user/authorlink.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<a class="author text black gt-font-semibold muted"{{if gt .ID 0}} href="{{.HomeLink}}"{{end}}>{{.GetDisplayName}}</a>{{if .IsBot}}<span class="ui basic label gt-p-2">bot</span>{{end}}
1+
<a class="author text black tw-font-semibold muted"{{if gt .ID 0}} href="{{.HomeLink}}"{{end}}>{{.GetDisplayName}}</a>{{if .IsBot}}<span class="ui basic label gt-p-2">bot</span>{{end}}

‎templates/user/auth/webauthn.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<p>{{ctx.Locale.Tr "webauthn_sign_in"}}</p>
1212
</div>
1313
<div class="ui attached segment tw-flex tw-items-center tw-justify-center gt-gap-2 gt-py-3">
14-
<div class="is-loading" style="width: 40px; height: 40px"></div>
14+
<div class="is-loading tw-w-[40px] tw-h-[40px]"></div>
1515
{{ctx.Locale.Tr "webauthn_press_button"}}
1616
</div>
1717
{{if .HasTwoFactor}}

‎templates/user/settings/account.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<div class="ui red message">
137137
<p class="text left">{{svg "octicon-alert"}} {{ctx.Locale.Tr "settings.delete_prompt"}}</p>
138138
{{if .UserDeleteWithComments}}
139-
<p class="text left gt-font-semibold">{{ctx.Locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime}}</p>
139+
<p class="text left tw-font-semibold">{{ctx.Locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime}}</p>
140140
{{end}}
141141
</div>
142142
<form class="ui form ignore-dirty" id="delete-form" action="{{AppSubUrl}}/user/settings/account/delete" method="post">

‎tests/integration/repo_search_test.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestSearchRepo(t *testing.T) {
3232
repo, err := repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, "user2", "repo1")
3333
assert.NoError(t, err)
3434

35-
executeIndexer(t, repo, code_indexer.UpdateRepoIndexer)
35+
code_indexer.UpdateRepoIndexer(repo)
3636

3737
testSearch(t, "/user2/repo1/search?q=Description&page=1", []string{"README.md"})
3838

@@ -42,12 +42,14 @@ func TestSearchRepo(t *testing.T) {
4242
repo, err = repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, "user2", "glob")
4343
assert.NoError(t, err)
4444

45-
executeIndexer(t, repo, code_indexer.UpdateRepoIndexer)
45+
code_indexer.UpdateRepoIndexer(repo)
4646

4747
testSearch(t, "/user2/glob/search?q=loren&page=1", []string{"a.txt"})
48-
testSearch(t, "/user2/glob/search?q=file3&page=1", []string{"x/b.txt"})
49-
testSearch(t, "/user2/glob/search?q=file4&page=1", []string{})
50-
testSearch(t, "/user2/glob/search?q=file5&page=1", []string{})
48+
testSearch(t, "/user2/glob/search?q=loren&page=1&t=match", []string{"a.txt"})
49+
testSearch(t, "/user2/glob/search?q=file3&page=1", []string{"x/b.txt", "a.txt"})
50+
testSearch(t, "/user2/glob/search?q=file3&page=1&t=match", []string{"x/b.txt", "a.txt"})
51+
testSearch(t, "/user2/glob/search?q=file4&page=1&t=match", []string{"x/b.txt", "a.txt"})
52+
testSearch(t, "/user2/glob/search?q=file5&page=1&t=match", []string{"x/b.txt", "a.txt"})
5153
}
5254

5355
func testSearch(t *testing.T, url string, expected []string) {
@@ -57,7 +59,3 @@ func testSearch(t *testing.T, url string, expected []string) {
5759
filenames := resultFilenames(t, NewHTMLParser(t, resp.Body))
5860
assert.EqualValues(t, expected, filenames)
5961
}
60-
61-
func executeIndexer(t *testing.T, repo *repo_model.Repository, op func(*repo_model.Repository)) {
62-
op(repo)
63-
}

‎web_src/css/helpers.css

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ Gitea's private styles use `g-` prefix.
3636
text-overflow: ellipsis;
3737
}
3838

39-
.gt-font-light { font-weight: var(--font-weight-light) !important; }
40-
.gt-font-normal { font-weight: var(--font-weight-normal) !important; }
41-
.gt-font-medium { font-weight: var(--font-weight-medium) !important; }
42-
.gt-font-semibold { font-weight: var(--font-weight-semibold) !important; }
43-
.gt-font-bold { font-weight: var(--font-weight-bold) !important; }
44-
4539
.interact-fg { color: inherit !important; }
4640
.interact-fg:hover { color: var(--color-primary) !important; }
4741
.interact-fg:active { color: var(--color-primary-active) !important; }

‎web_src/css/review.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,10 @@
194194
margin: 0 0 0 3em;
195195
}
196196

197+
.diff-file-body.binary {
198+
padding: 5px 10px;
199+
}
200+
197201
.file-comment {
198202
color: var(--color-text);
199203
}

‎web_src/js/components/DiffFileList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default {
3838
<template>
3939
<ol class="diff-stats gt-m-0" ref="root" v-if="store.fileListIsVisible">
4040
<li v-for="file in store.files" :key="file.NameHash">
41-
<div class="gt-font-semibold tw-flex tw-items-center pull-right">
41+
<div class="tw-font-semibold tw-flex tw-items-center pull-right">
4242
<span v-if="file.IsBin" class="gt-ml-1 gt-mr-3">{{ store.binaryFileMessage }}</span>
4343
{{ file.IsBin ? '' : file.Addition + file.Deletion }}
4444
<span v-if="!file.IsBin" class="diff-stats-bar gt-mx-3" :data-tooltip-content="store.statisticsMessage.replace('%d', (file.Addition + file.Deletion)).replace('%d', file.Addition).replace('%d', file.Deletion)">

0 commit comments

Comments
 (0)