The Unified and Autonomous Development Platform
chore: Improve variable auto completion in build spec editor
Robin Shen0bd0576e2f2f
diff --git a/pom.xml b/pom.xmlindex edb60279f4..e7e40dd45a 100644--- a/pom.xml+++ b/pom.xml@@ -630,8 +630,8 @@</repository></repositories><properties>- <commons.version>2.8.3</commons.version>- <agent.version>1.10.5</agent.version>+ <commons.version>2.8.4</commons.version>+ <agent.version>1.10.6</agent.version><slf4j.version>2.0.9</slf4j.version><logback.version>1.4.14</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.javaindex 70900ab250..583a5c71b3 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.java@@ -7,11 +7,13 @@ import java.util.stream.Collectors;import com.google.common.base.Optional;import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.codeassist.InputStatus;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.util.Input;import io.onedev.server.util.interpolative.InterpolativeParser;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;@@ -67,5 +69,27 @@ public abstract class InterpolativeAssistBehavior extends ANTLRAssistBehavior {protected abstract List<InputSuggestion> suggestVariables(String matchWith);protected abstract List<InputSuggestion> suggestLiterals(String matchWith);++ @Override+ protected int getReplaceEnd(InputStatus inputStatus) {+ return doGetReplaceEnd(inputStatus);+ }++ public static int doGetReplaceEnd(InputStatus inputStatus) {+ var contentAfterCaret = inputStatus.getContentAfterCaret();+ var count = 0;+ for (var ch: contentAfterCaret.toCharArray()) {+ if (ch == '@')+ count++;+ }++ var replaceEnd = inputStatus.getCaret();+ if (count % 2 != 0) {+ var index = contentAfterCaret.indexOf('@');+ if (index != -1)+ replaceEnd += index + 1;+ }+ return replaceEnd;+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.javaindex 9c7b6b9bdc..49fd0eb0c3 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.java@@ -6,6 +6,7 @@ import java.util.List;import java.util.Set;import java.util.stream.Collectors;+import io.onedev.commons.codeassist.InputStatus;import org.antlr.v4.runtime.Token;import com.google.common.base.Optional;@@ -140,4 +141,9 @@ public abstract class InterpolativePatternSetAssistBehavior extends ANTLRAssistBprotected abstract List<InputSuggestion> suggestPatterns(String matchWith);+ @Override+ protected int getReplaceEnd(InputStatus inputStatus) {+ return InterpolativeAssistBehavior.doGetReplaceEnd(inputStatus);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.javaindex f994e2767f..c41714cf5a 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java@@ -81,6 +81,11 @@ public abstract class ANTLRAssistBehavior extends InputAssistBehavior {return ANTLRAssistBehavior.this.getHints(terminalExpect);}+ @Override+ protected int getReplaceEnd(InputStatus inputStatus) {+ return ANTLRAssistBehavior.this.getReplaceEnd(inputStatus);+ }+@Overrideprotected Optional<String> describe(TerminalExpect terminalExpect, String suggestedLiteral) {return ANTLRAssistBehavior.this.describe(terminalExpect, suggestedLiteral);@@ -218,6 +223,10 @@ public abstract class ANTLRAssistBehavior extends InputAssistBehavior {return new ArrayList<>();}+ protected int getReplaceEnd(InputStatus inputStatus) {+ return -1;+ }+/*** Describe suggested literal*diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.jsindex 3b86875300..32faae4103 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js@@ -101,11 +101,17 @@ onedev.server.codeSupport = {}var afterCursor = cm.doc.getLine(line).substring(start);- var to = afterCursor.indexOf('@');- if (to == -1)+ afterCursor = afterCursor.replace('@@', '__');++ if((afterCursor.match(/@/g) || []).length % 2 === 0) {to = cm.getCursor().ch;- else- to += start+1;+ } else {+ to = afterCursor.indexOf('@');+ if (to === -1)+ to = cm.getCursor().ch;+ else+ to += start+1;+ }$input.data("showHintCallback")({list: variables,