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)

modules/indexer/code/bleve/bleve.go

@@ -39,6 +39,8 @@ import (
 const (
  unicodeNormalizeName = "unicodeNormalize"
  maxBatchSize = 16
+ // fuzzyDenominator determines the levenshtein distance per each character of a keyword
+ fuzzyDenominator = 4
 )
 
 func addUnicodeNormalizeTokenFilter(m *mapping.IndexMappingImpl) error {
@@ -239,15 +241,12 @@ func (b *Indexer) Search(ctx context.Context, opts *internal.SearchOptions) (int
  keywordQuery query.Query
  )
 
+ phraseQuery := bleve.NewMatchPhraseQuery(opts.Keyword)
+ phraseQuery.FieldVal = "Content"
+ phraseQuery.Analyzer = repoIndexerAnalyzer
+ keywordQuery = phraseQuery
  if opts.IsKeywordFuzzy {
- phraseQuery := bleve.NewMatchPhraseQuery(opts.Keyword)
- phraseQuery.FieldVal = "Content"
- phraseQuery.Analyzer = repoIndexerAnalyzer
- keywordQuery = phraseQuery
- } else {
- prefixQuery := bleve.NewPrefixQuery(opts.Keyword)
- prefixQuery.FieldVal = "Content"
- keywordQuery = prefixQuery
+ phraseQuery.Fuzziness = len(opts.Keyword) / fuzzyDenominator
  }
 
  if len(opts.RepoIDs) > 0 {

modules/indexer/internal/bleve/query.go

@@ -20,17 +20,11 @@ func NumericEqualityQuery(value int64, field string) *query.NumericRangeQuery {
 }
 
 // MatchPhraseQuery generates a match phrase query for the given phrase, field and analyzer
-func MatchPhraseQuery(matchPhrase, field, analyzer string) *query.MatchPhraseQuery {
+func MatchPhraseQuery(matchPhrase, field, analyzer string, fuzziness int) *query.MatchPhraseQuery {
  q := bleve.NewMatchPhraseQuery(matchPhrase)
  q.FieldVal = field
  q.Analyzer = analyzer
- return q
-}
-
-// PrefixQuery generates a match prefix query for the given prefix and field
-func PrefixQuery(matchPrefix, field string) *query.PrefixQuery {
- q := bleve.NewPrefixQuery(matchPrefix)
- q.FieldVal = field
+ q.Fuzziness = fuzziness
  return q
 }
 

modules/indexer/issues/bleve/bleve.go

@@ -35,7 +35,11 @@ func addUnicodeNormalizeTokenFilter(m *mapping.IndexMappingImpl) error {
  })
 }
 
-const maxBatchSize = 16
+const (
+ maxBatchSize = 16
+ // fuzzyDenominator determines the levenshtein distance per each character of a keyword
+ fuzzyDenominator = 4
+)
 
 // IndexerData an update to the issue indexer
 type IndexerData internal.IndexerData
@@ -156,19 +160,16 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
  var queries []query.Query
 
  if options.Keyword != "" {
+ fuzziness := 0
  if options.IsFuzzyKeyword {
- queries = append(queries, bleve.NewDisjunctionQuery([]query.Query{
- inner_bleve.MatchPhraseQuery(options.Keyword, "title", issueIndexerAnalyzer),
- inner_bleve.MatchPhraseQuery(options.Keyword, "content", issueIndexerAnalyzer),
- inner_bleve.MatchPhraseQuery(options.Keyword, "comments", issueIndexerAnalyzer),
- }...))
- } else {
- queries = append(queries, bleve.NewDisjunctionQuery([]query.Query{
- inner_bleve.PrefixQuery(options.Keyword, "title"),
- inner_bleve.PrefixQuery(options.Keyword, "content"),
- inner_bleve.PrefixQuery(options.Keyword, "comments"),
- }...))
+ fuzziness = len(options.Keyword) / fuzzyDenominator
  }
+
+ queries = append(queries, bleve.NewDisjunctionQuery([]query.Query{
+ inner_bleve.MatchPhraseQuery(options.Keyword, "title", issueIndexerAnalyzer, fuzziness),
+ inner_bleve.MatchPhraseQuery(options.Keyword, "content", issueIndexerAnalyzer, fuzziness),
+ inner_bleve.MatchPhraseQuery(options.Keyword, "comments", issueIndexerAnalyzer, fuzziness),
+ }...))
  }
 
  if len(options.RepoIDs) > 0 || options.AllPublic {

tailwind.config.js

@@ -66,6 +66,13 @@ export default {
  '3xl': '24px',
  'full': 'var(--border-radius-circle)', // 50%
  },
+ fontWeight: {
+ light: 'var(--font-weight-light)',
+ normal: 'var(--font-weight-normal)',
+ medium: 'var(--font-weight-medium)',
+ semibold: 'var(--font-weight-semibold)',
+ bold: 'var(--font-weight-bold)',
+ },
  fontSize: { // not using `rem` units because our root is currently 14px
  'xs': '12px',
  'sm': '14px',

templates/admin/notice.tmpl

@@ -20,7 +20,7 @@
  <td><div class="ui checkbox tw-flex" data-id="{{.ID}}"><input type="checkbox"></div></td>
  <td>{{.ID}}</td>
  <td>{{ctx.Locale.Tr .TrStr}}</td>
- <td class="view-detail auto-ellipsis" style="width: 80%;"><span class="notice-description">{{.Description}}</span></td>
+ <td class="view-detail auto-ellipsis tw-w-4/5"><span class="notice-description">{{.Description}}</span></td>
  <td nowrap>{{DateTime "short" .CreatedUnix}}</td>
  <td class="view-detail"><a href="#">{{svg "octicon-note" 16}}</a></td>
  </tr>

templates/devtest/flex-list.tmpl

@@ -73,7 +73,7 @@
  </div>
  <div class="flex-item-trailing">
  <a class="muted" href="{{$.Link}}">
- <span class="flex-text-inline"><i class="color-icon gt-mr-3" style="background-color: aqua"></i>Go</span>
+ <span class="flex-text-inline"><i class="color-icon gt-mr-3 tw-bg-blue"></i>Go</span>
  </a>
  <a class="text grey flex-text-inline" href="{{$.Link}}">{{svg "octicon-star" 16}}45000</a>
  <a class="text grey flex-text-inline" href="{{$.Link}}">{{svg "octicon-git-branch" 16}}1234</a>

templates/devtest/tmplerr.tmpl

@@ -1,10 +1,10 @@
 {{template "base/head" .}}
 <div class="page-content devtest">
  <div class="tw-flex">
- <div style="width: 80%; ">
+ <div class="tw-w-4/5">
  hello hello hello hello hello hello hello hello hello hello
  </div>
- <div style="width: 20%;">
+ <div class="tw-w-1/5">
  {{template "devtest/tmplerr-sub" .}}
  </div>
  </div>

templates/repo/diff/box.tmpl

@@ -119,7 +119,7 @@
  {{svg "octicon-chevron-down" 18}}
  {{end}}
  </button>
- <div class="gt-font-semibold tw-flex tw-items-center gt-mono">
+ <div class="tw-font-semibold tw-flex tw-items-center gt-mono">
  {{if $file.IsBin}}
  <span class="gt-ml-1 gt-mr-3">
  {{ctx.Locale.Tr "repo.diff.bin"}}
@@ -178,7 +178,7 @@
  <div class="diff-file-body ui attached unstackable table segment" {{if and $file.IsViewed $.IsShowingAllCommits}}data-folded="true"{{end}}>
  <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}}">
  {{if or $file.IsIncomplete $file.IsBin}}
- <div class="diff-file-body binary" style="padding: 5px 10px;">
+ <div class="diff-file-body binary">
  {{if $file.IsIncomplete}}
  {{if $file.IsIncompleteLineTooLong}}
  {{ctx.Locale.Tr "repo.diff.file_suppressed_line_too_long"}}

templates/repo/diff/comments.tmpl

@@ -11,7 +11,7 @@
  <div class="ui top attached header comment-header tw-flex tw-items-center tw-justify-between">
  <div class="comment-header-left tw-flex tw-items-center">
  {{if .OriginalAuthor}}
- <span class="text black gt-font-semibold gt-mr-2">
+ <span class="text black tw-font-semibold gt-mr-2">
  {{svg (MigrationIcon $.root.Repository.GetOriginalURLHostname)}}
  {{.OriginalAuthor}}
  </span>

templates/repo/header.tmpl

@@ -8,7 +8,7 @@
  </div>
  <div class="flex-item-main">
  <div class="flex-item-title tw-text-18">
- <a class="muted gt-font-normal" href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>/<a class="muted" href="{{$.RepoLink}}">{{.Name}}</a>
+ <a class="muted tw-font-normal" href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>/<a class="muted" href="{{$.RepoLink}}">{{.Name}}</a>
  </div>
  </div>
  <div class="flex-item-trailing">

templates/repo/issue/view_content.tmpl

@@ -23,7 +23,7 @@
  <div class="ui top attached header comment-header tw-flex tw-items-center tw-justify-between" role="heading" aria-level="3">
  <div class="comment-header-left tw-flex tw-items-center">
  {{if .Issue.OriginalAuthor}}
- <span class="text black gt-font-semibold">
+ <span class="text black tw-font-semibold">
  {{svg (MigrationIcon .Repository.GetOriginalURLHostname)}}
  {{.Issue.OriginalAuthor}}
  </span>

templates/repo/issue/view_content/comments.tmpl

@@ -28,7 +28,7 @@
  <div class="ui top attached header comment-header tw-flex tw-items-center tw-justify-between" role="heading" aria-level="3">
  <div class="comment-header-left tw-flex tw-items-center">
  {{if .OriginalAuthor}}
- <span class="text black gt-font-semibold gt-mr-2">
+ <span class="text black tw-font-semibold gt-mr-2">
  {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
  {{.OriginalAuthor}}
  </span>
@@ -411,7 +411,7 @@
  {{end}}
  <span class="text grey muted-links">
  {{if .OriginalAuthor}}
- <span class="text black gt-font-semibold">
+ <span class="text black tw-font-semibold">
  {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
  {{.OriginalAuthor}}
  </span>

templates/repo/issue/view_content/reference_issue_dialog.tmpl

@@ -2,7 +2,7 @@
  <div class="header">
  {{ctx.Locale.Tr "repo.issues.context.reference_issue"}}
  </div>
- <div class="content" style="text-align:left">
+ <div class="content tw-text-left">
  <form class="ui form form-fetch-action" action="{{printf "%s/issues/new" .Repository.Link}}" method="post">
  {{.CsrfTokenHtml}}
  <div class="ui segment content">

templates/repo/pulls/tab_menu.tmpl

@@ -15,7 +15,7 @@
  {{ctx.Locale.Tr "repo.pulls.tab_files"}}
  <span class="ui small label">{{if .NumFiles}}{{.NumFiles}}{{else}}-{{end}}</span>
  </a>
- <span class="item tw-ml-auto gt-pr-0 gt-font-bold tw-flex tw-items-center gt-gap-3">
+ <span class="item tw-ml-auto gt-pr-0 tw-font-bold tw-flex tw-items-center gt-gap-3">
  <span><span class="text green">{{if .Diff.TotalAddition}}+{{.Diff.TotalAddition}}{{end}}</span> <span class="text red">{{if .Diff.TotalDeletion}}-{{.Diff.TotalDeletion}}{{end}}</span></span>
  <span class="diff-stats-bar">
  <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

@@ -31,7 +31,7 @@
  <label for="is_writable">
  {{ctx.Locale.Tr "repo.settings.is_writable"}}
  </label>
- <small style="padding-left: 26px;">{{ctx.Locale.Tr "repo.settings.is_writable_info"}}</small>
+ <small class="tw-pl-[26px]">{{ctx.Locale.Tr "repo.settings.is_writable_info"}}</small>
  </div>
  </div>
  <button class="ui primary button">

templates/repo/settings/options.tmpl

@@ -110,7 +110,7 @@
  <table class="ui table">
  <thead>
  <tr>
- <th style="width:40%">{{ctx.Locale.Tr "repo.settings.mirror_settings.mirrored_repository"}}</th>
+ <th class="tw-w-2/5">{{ctx.Locale.Tr "repo.settings.mirror_settings.mirrored_repository"}}</th>
  <th>{{ctx.Locale.Tr "repo.settings.mirror_settings.direction"}}</th>
  <th>{{ctx.Locale.Tr "repo.settings.mirror_settings.last_update"}}</th>
  <th></th>
@@ -207,7 +207,7 @@
  <table class="ui table">
  <thead>
  <tr>
- <th style="width:40%">{{ctx.Locale.Tr "repo.settings.mirror_settings.pushed_repository"}}</th>
+ <th class="tw-w-2/5">{{ctx.Locale.Tr "repo.settings.mirror_settings.pushed_repository"}}</th>
  <th>{{ctx.Locale.Tr "repo.settings.mirror_settings.direction"}}</th>
  <th>{{ctx.Locale.Tr "repo.settings.mirror_settings.last_update"}}</th>
  <th></th>

templates/repo/sub_menu.tmpl

@@ -25,7 +25,7 @@
  {{range .LanguageStats}}
  <div class="item">
  <i class="color-icon" style="background-color: {{.Color}}"></i>
- <span class="gt-font-semibold">
+ <span class="tw-font-semibold">
  {{if eq .Language "other"}}
  {{ctx.Locale.Tr "repo.language_other"}}
  {{else}}

templates/shared/user/authorlink.tmpl

@@ -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}}
+<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

@@ -11,7 +11,7 @@
  <p>{{ctx.Locale.Tr "webauthn_sign_in"}}</p>
  </div>
  <div class="ui attached segment tw-flex tw-items-center tw-justify-center gt-gap-2 gt-py-3">
- <div class="is-loading" style="width: 40px; height: 40px"></div>
+ <div class="is-loading tw-w-[40px] tw-h-[40px]"></div>
  {{ctx.Locale.Tr "webauthn_press_button"}}
  </div>
  {{if .HasTwoFactor}}

templates/user/settings/account.tmpl

@@ -136,7 +136,7 @@
  <div class="ui red message">
  <p class="text left">{{svg "octicon-alert"}} {{ctx.Locale.Tr "settings.delete_prompt"}}</p>
  {{if .UserDeleteWithComments}}
- <p class="text left gt-font-semibold">{{ctx.Locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime}}</p>
+ <p class="text left tw-font-semibold">{{ctx.Locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime}}</p>
  {{end}}
  </div>
  <form class="ui form ignore-dirty" id="delete-form" action="{{AppSubUrl}}/user/settings/account/delete" method="post">

tests/integration/repo_search_test.go

@@ -32,7 +32,7 @@ func TestSearchRepo(t *testing.T) {
  repo, err := repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, "user2", "repo1")
  assert.NoError(t, err)
 
- executeIndexer(t, repo, code_indexer.UpdateRepoIndexer)
+ code_indexer.UpdateRepoIndexer(repo)
 
  testSearch(t, "/user2/repo1/search?q=Description&page=1", []string{"README.md"})
 
@@ -42,12 +42,14 @@ func TestSearchRepo(t *testing.T) {
  repo, err = repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, "user2", "glob")
  assert.NoError(t, err)
 
- executeIndexer(t, repo, code_indexer.UpdateRepoIndexer)
+ code_indexer.UpdateRepoIndexer(repo)
 
  testSearch(t, "/user2/glob/search?q=loren&page=1", []string{"a.txt"})
- testSearch(t, "/user2/glob/search?q=file3&page=1", []string{"x/b.txt"})
- testSearch(t, "/user2/glob/search?q=file4&page=1", []string{})
- testSearch(t, "/user2/glob/search?q=file5&page=1", []string{})
+ testSearch(t, "/user2/glob/search?q=loren&page=1&t=match", []string{"a.txt"})
+ testSearch(t, "/user2/glob/search?q=file3&page=1", []string{"x/b.txt", "a.txt"})
+ testSearch(t, "/user2/glob/search?q=file3&page=1&t=match", []string{"x/b.txt", "a.txt"})
+ testSearch(t, "/user2/glob/search?q=file4&page=1&t=match", []string{"x/b.txt", "a.txt"})
+ testSearch(t, "/user2/glob/search?q=file5&page=1&t=match", []string{"x/b.txt", "a.txt"})
 }
 
 func testSearch(t *testing.T, url string, expected []string) {
@@ -57,7 +59,3 @@ func testSearch(t *testing.T, url string, expected []string) {
  filenames := resultFilenames(t, NewHTMLParser(t, resp.Body))
  assert.EqualValues(t, expected, filenames)
 }
-
-func executeIndexer(t *testing.T, repo *repo_model.Repository, op func(*repo_model.Repository)) {
- op(repo)
-}

web_src/css/helpers.css

@@ -36,12 +36,6 @@ Gitea's private styles use `g-` prefix.
  text-overflow: ellipsis;
 }
 
-.gt-font-light { font-weight: var(--font-weight-light) !important; }
-.gt-font-normal { font-weight: var(--font-weight-normal) !important; }
-.gt-font-medium { font-weight: var(--font-weight-medium) !important; }
-.gt-font-semibold { font-weight: var(--font-weight-semibold) !important; }
-.gt-font-bold { font-weight: var(--font-weight-bold) !important; }
-
 .interact-fg { color: inherit !important; }
 .interact-fg:hover { color: var(--color-primary) !important; }
 .interact-fg:active { color: var(--color-primary-active) !important; }

web_src/css/review.css

@@ -194,6 +194,10 @@
  margin: 0 0 0 3em;
 }
 
+.diff-file-body.binary {
+ padding: 5px 10px;
+}
+
 .file-comment {
  color: var(--color-text);
 }

web_src/js/components/DiffFileList.vue

@@ -38,7 +38,7 @@ export default {
 <template>
  <ol class="diff-stats gt-m-0" ref="root" v-if="store.fileListIsVisible">
  <li v-for="file in store.files" :key="file.NameHash">
- <div class="gt-font-semibold tw-flex tw-items-center pull-right">
+ <div class="tw-font-semibold tw-flex tw-items-center pull-right">
  <span v-if="file.IsBin" class="gt-ml-1 gt-mr-3">{{ store.binaryFileMessage }}</span>
  {{ file.IsBin ? '' : file.Addition + file.Deletion }}
  <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)">