The Unified and Autonomous Development Platform
chore: Some usability improvements
Robin Shenec701f073c00
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/FuzzyCriteria.javaindex 5824cbf02a..80976ee004 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/FuzzyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/FuzzyCriteria.java@@ -1,14 +1,17 @@package io.onedev.server.search.commit;import com.google.common.base.Preconditions;+import com.google.common.collect.Lists;import io.onedev.commons.utils.StringUtils;import io.onedev.server.event.project.RefUpdated;import io.onedev.server.git.command.RevListOptions;+import io.onedev.server.git.service.RefFacade;import io.onedev.server.model.Project;import org.eclipse.jgit.revwalk.RevCommit;import java.util.ArrayList;import java.util.List;+import java.util.stream.Collectors;import static io.onedev.commons.utils.match.WildcardUtils.matchString;@@ -29,13 +32,18 @@ public class FuzzyCriteria extends CommitCriteria {@Overridepublic void fill(Project project, RevListOptions options) {+ boolean ranged = false;for (String value: values) {- if (value.length() >= 4 && project.getObjectId(value, false) != null)+ if (project.getBranchRef(value) != null) {options.revisions().add(value);- else+ ranged = true;+ } else if (project.getTagRef(value) != null || value.length() >= 6 && project.getObjectId(value, false) != null) {+ options.revisions().add(value);+ } else {options.messages().add(value);+ }}- if (options.revisions().size() == 1)+ if (options.revisions().size() == 1 && !ranged)options.count(1);}@@ -44,7 +52,7 @@ public class FuzzyCriteria extends CommitCriteria {var project = event.getProject();RevCommit commit = project.getRevCommit(event.getNewCommitId(), true);for (String value: values) {- if (value.length() >= 4 && commit.equals(project.getObjectId(value, false))+ if (commit.equals(project.getRevCommit(value, false))|| matchString("*" + value + "*", commit.getFullMessage())) {return true;}diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex b8bfb799a8..86142f21f5 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -507,7 +507,7 @@ public class SuggestionUtils {var exts = new TreeSet<String>();for (var path: paths) {- var ext = StringUtils.substringAfter(Paths.get(path).getFileName().toFile().getName(), ".");+ var ext = StringUtils.substringAfterLast(Paths.get(path).getFileName().toFile().getName(), ".");if (ext.length() != 0)exts.add(ext);}