Skip to content

The Unified and Autonomous Development Platform

fix(web): normalize reference type casing for autocomplete

Robin Sheneb2b823290b6
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java
index 7bd2e693e5..8df0006b12 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java
@@ -5,6 +5,7 @@ import static org.apache.commons.lang3.StringUtils.deleteWhitespace;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -38,7 +39,7 @@ public abstract class ReferenceInputBehavior extends InputAssistBehavior {
List<InputSuggestion> suggestions = new ArrayList<>();
String type = matcher.group("type");
if (type != null)
- type = deleteWhitespace(type);
+ type = deleteWhitespace(type).toLowerCase(Locale.ENGLISH);
else
type = "";
switch (type) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
index fc86392ccb..2034b91009 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
@@ -12,6 +12,7 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import javax.servlet.http.Cookie;
@@ -437,7 +438,9 @@ public class MarkdownEditor extends FormComponentPanel<String> {
var currentProject = referenceSupport.getCurrentProject();
String atChar = params.getParameterValue("param1").toOptionalString();
String query = params.getParameterValue("param2").toOptionalString();
- String type = params.getParameterValue("param3").toOptionalString();
+ String type = StringUtils.deleteWhitespace(StringUtils.defaultString(
+ params.getParameterValue("param3").toOptionalString()))
+ .toLowerCase(Locale.ENGLISH);
String projectKeyOrPath = params.getParameterValue("param4").toOptionalString();
List<Map<String, String>> referenceList = new ArrayList<>();
Project project;