The Unified and Autonomous Development Platform
feat: Reworked symbol extraction for performance and add support for Rust/Swift/Ruby/TypeScript
Robin Shen06eee5c0570e
diff --git a/pom.xml b/pom.xmlindex bdbab062cf..4a4202270a 100644--- a/pom.xml+++ b/pom.xml@@ -681,8 +681,8 @@</repository></repositories><properties>- <commons.version>3.3.11</commons.version>- <agent.version>3.1.3</agent.version>+ <commons.version>4.0.0</commons.version>+ <agent.version>3.1.4</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/buildspec/job/action/RunProjectJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.javaindex ce1f205aa5..62a1d42f29 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.java@@ -8,13 +8,13 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.annotation.Nullable;import javax.validation.ConstraintValidatorContext;import javax.validation.constraints.NotEmpty;import javax.ws.rs.NotAcceptableException;import org.apache.shiro.authz.UnauthorizedException;import org.apache.shiro.util.ThreadContext;+import org.jspecify.annotations.Nullable;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/git/command/ListNumStatsCommand.java b/server-core/src/main/java/io/onedev/server/git/command/ListNumStatsCommand.javaindex 425a1b9eb2..db94cee4fd 100644--- a/server-core/src/main/java/io/onedev/server/git/command/ListNumStatsCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/command/ListNumStatsCommand.java@@ -43,7 +43,7 @@ public class ListNumStatsCommand {git.addArgs("diff", "--numstat", "--no-renames", fromRev + ".." + toRev);} else {git.addArgs("-c", "diff.renameLimit=1000", "diff", "--numstat",- "--find-renames", fromRev + ".." + toRev);+ "--find-renames=100%", fromRev + ".." + toRev);}git.execute(new LineConsumer() {diff --git a/server-core/src/main/java/io/onedev/server/git/command/LogCommand.java b/server-core/src/main/java/io/onedev/server/git/command/LogCommand.javaindex 4b2a5c2d86..3f56090c26 100644--- a/server-core/src/main/java/io/onedev/server/git/command/LogCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/command/LogCommand.java@@ -118,9 +118,9 @@ public abstract class LogCommand {git.addArgs("log");} else {if (fields.contains(Field.LINE_CHANGES))- git.addArgs("-c", "diff.renameLimit=1000", "log", "--numstat", "--find-renames");+ git.addArgs("-c", "diff.renameLimit=1000", "log", "--numstat", "--find-renames=100%");else if (fields.contains(Field.FILE_CHANGES))- git.addArgs("-c", "diff.renameLimit=1000", "log", "--name-status", "--find-renames");+ git.addArgs("-c", "diff.renameLimit=1000", "log", "--name-status", "--find-renames=100%");elsegit.addArgs("log");}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/identifier-highlighter.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/identifier-highlighter.jsindex e8e0425e75..be303b61f0 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/identifier-highlighter.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/identifier-highlighter.js@@ -58,13 +58,19 @@var tokenPos = new CodeMirror.Pos(cur.line, (start+end)/2);var tokenType = cm.getTokenTypeAt(tokenPos);if (tokenType != null) {- if (tokenType.indexOf("variable") != -1- || tokenType.indexOf("property") != -1+ if (tokenType.indexOf("property") != -1+ || tokenType.indexOf("variable") != -1+ || tokenType.indexOf("variable-2") != -1+ || tokenType.indexOf("variable-3") != -1|| tokenType.indexOf("def") != -1- || tokenType.indexOf("tag") != -1- || tokenType.indexOf("attribute") != -1+ || tokenType.indexOf("meta") != -1|| tokenType.indexOf("string") != -1- || tokenType.indexOf("string2") != -1) {+ || tokenType.indexOf("string-2") != -1+ || tokenType.indexOf("tag") != -1+ || tokenType.indexOf("attribute") != -1+ || tokenType.indexOf("built-in") != -1+ || tokenType.indexOf("qualifier") != -1+ || tokenType.indexOf("type") != -1) {var token = cm.getTokenAt(tokenPos);var state = cm.state.identifierHighlighter;if (state.overlay) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.jsindex 7fa9a5a4aa..bd59bd4739 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js@@ -82,10 +82,13 @@ onedev.server.sourceView = {$code.mouseover(function(e) {var node = e.target || e.srcElement, $node = $(node);- if ($node.hasClass("cm-property") || $node.hasClass("cm-variable") || $node.hasClass("cm-variable-2")- || $node.hasClass("cm-variable-3") || $node.hasClass("cm-def") || $node.hasClass("cm-meta")- || $node.hasClass("cm-string") || $node.hasClass("cm-tag") || $node.hasClass("cm-attribute")- || $node.hasClass("cm-builtin") || $node.hasClass("cm-qualifier")) {+ if ($node.hasClass("cm-property") || $node.hasClass("cm-variable")+ || $node.hasClass("cm-variable-2") || $node.hasClass("cm-variable-3")+ || $node.hasClass("cm-def") || $node.hasClass("cm-meta")+ || $node.hasClass("cm-string") || $node.hasClass("cm-string-2")+ || $node.hasClass("cm-tag") || $node.hasClass("cm-attribute")+ || $node.hasClass("cm-builtin") || $node.hasClass("cm-qualifier")+ || $node.hasClass("cm-type")) {document.getElementById(symbolTooltipId).onMouseOverSymbol(revision, node);}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 8d89021ec4..e84f5ab9ce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -15,7 +15,7 @@ import java.util.List;import java.util.Map;import java.util.Set;-import org.jspecify.annotations.Nullable;+import javax.inject.Inject;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -34,21 +34,17 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.ObjectId;+import org.jspecify.annotations.Nullable;import com.google.common.collect.Lists;import io.onedev.commons.utils.PlanarRange;-import io.onedev.server.OneDev;import io.onedev.server.ai.ChatTool;import io.onedev.server.ai.ChatToolAware;import io.onedev.server.codequality.CodeProblem;import io.onedev.server.codequality.CodeProblemContribution;import io.onedev.server.codequality.CoverageStatus;import io.onedev.server.codequality.LineCoverageContribution;-import io.onedev.server.service.CodeCommentService;-import io.onedev.server.service.CodeCommentReplyService;-import io.onedev.server.service.CodeCommentStatusChangeService;-import io.onedev.server.service.PullRequestService;import io.onedev.server.git.GitUtils;import io.onedev.server.git.service.GitService;import io.onedev.server.model.Build;@@ -63,6 +59,10 @@ import io.onedev.server.search.commit.CommitQuery;import io.onedev.server.search.commit.Revision;import io.onedev.server.search.commit.RevisionCriteria;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.CodeCommentReplyService;+import io.onedev.server.service.CodeCommentService;+import io.onedev.server.service.CodeCommentStatusChangeService;+import io.onedev.server.service.PullRequestService;import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.ProjectAndRevision;import io.onedev.server.util.diff.WhitespaceOption;@@ -120,6 +120,27 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotatiprivate static final String TABS_ID = "tabs";private static final String TAB_PANEL_ID = "tabPanel";++ @Inject+ private GitService gitService;++ @Inject+ private CodeCommentService codeCommentService;++ @Inject+ private PullRequestService pullRequestService;++ @Inject+ private CodeCommentReplyService codeCommentReplyService;++ @Inject+ private CodeCommentStatusChangeService codeCommentStatusChangeService;++ @Inject+ private Set<CodeProblemContribution> codeProblemContributions;++ @Inject+ private Set<LineCoverageContribution> lineCoverageContributions;private final IModel<PullRequest> requestModel;@@ -128,8 +149,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotati@Overrideprotected Collection<CodeComment> load() {- CodeCommentService manager = OneDev.getInstance(CodeCommentService.class);- return manager.query(projectModel.getObject(),+ return codeCommentService.query(projectModel.getObject(),state.compareWithMergeBase ? mergeBase : leftCommitId, rightCommitId);}@@ -251,7 +271,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotatiif (state.leftSide.getBranch() != null && state.rightSide.getBranch() != null) {ProjectAndBranch left = new ProjectAndBranch(state.leftSide.toString());ProjectAndBranch right = new ProjectAndBranch(state.rightSide.toString());- return OneDev.getInstance(PullRequestService.class).findEffective(left, right);+ return pullRequestService.findEffective(left, right);} else {return null;}@@ -260,16 +280,12 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotati};if (leftCommitId != null && rightCommitId != null) {- mergeBase = getGitService().getMergeBase(+ mergeBase = gitService.getMergeBase(state.rightSide.getProject(), rightCommitId,state.leftSide.getProject(), leftCommitId);}}-- private GitService getGitService() {- return OneDev.getInstance(GitService.class);- }-+@Overrideprotected void onInitialize() {super.onInitialize();@@ -771,7 +787,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotati@Overridepublic CodeComment getOpenComment() {if (state.commentId != null)- return OneDev.getInstance(CodeCommentService.class).load(state.commentId);+ return codeCommentService.load(state.commentId);elsereturn null;}@@ -817,22 +833,22 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotati@Overridepublic void onSaveComment(CodeComment comment) {if (comment.isNew())- OneDev.getInstance(CodeCommentService.class).create(comment);+ codeCommentService.create(comment);else- OneDev.getInstance(CodeCommentService.class).update(comment);+ codeCommentService.update(comment);}@Overridepublic void onSaveCommentReply(CodeCommentReply reply) {if (reply.isNew())- OneDev.getInstance(CodeCommentReplyService.class).create(reply);+ codeCommentReplyService.create(reply);else- OneDev.getInstance(CodeCommentReplyService.class).update(reply);+ codeCommentReplyService.update(reply);}@Overridepublic void onSaveCommentStatusChange(CodeCommentStatusChange change, String note) {- OneDev.getInstance(CodeCommentStatusChangeService.class).create(change, note);+ codeCommentStatusChangeService.create(change, note);}@Override@@ -894,7 +910,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotatiSet<CodeProblem> problems = new HashSet<>();ObjectId oldCommitId = state.compareWithMergeBase?mergeBase:leftCommitId;for (Build build: state.leftSide.getProject().getBuilds(oldCommitId)) {- for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))+ for (CodeProblemContribution contribution: codeProblemContributions)problems.addAll(contribution.getCodeProblems(build, blobPath, null));}return problems;@@ -904,7 +920,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotatipublic Collection<CodeProblem> getNewProblems(String blobPath) {Set<CodeProblem> problems = new HashSet<>();for (Build build: state.rightSide.getProject().getBuilds(rightCommitId)) {- for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class))+ for (CodeProblemContribution contribution: codeProblemContributions)problems.addAll(contribution.getCodeProblems(build, blobPath, null));}return problems;@@ -915,7 +931,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotatiMap<Integer, CoverageStatus> coverages = new HashMap<>();ObjectId oldCommitId = state.compareWithMergeBase?mergeBase:leftCommitId;for (Build build: state.leftSide.getProject().getBuilds(oldCommitId)) {- for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {+ for (LineCoverageContribution contribution: lineCoverageContributions) {contribution.getLineCoverages(build, blobPath, null).forEach((key, value) -> {coverages.merge(key, value, (v1, v2) -> v1.mergeWith(v2));});@@ -928,7 +944,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotatipublic Map<Integer, CoverageStatus> getNewCoverages(String blobPath) {Map<Integer, CoverageStatus> coverages = new HashMap<>();for (Build build: state.rightSide.getProject().getBuilds(rightCommitId)) {- for (LineCoverageContribution contribution: OneDev.getExtensions(LineCoverageContribution.class)) {+ for (LineCoverageContribution contribution: lineCoverageContributions) {contribution.getLineCoverages(build, blobPath, null).forEach((key, value) -> {coverages.merge(key, value, (v1, v2) -> v1.mergeWith(v2));});diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/AiToolExecution.java b/server-core/src/main/java/io/onedev/server/web/websocket/AiToolExecution.javaindex 4e3d205951..25df27845e 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/AiToolExecution.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/AiToolExecution.java@@ -2,9 +2,8 @@ package io.onedev.server.web.websocket;import java.util.concurrent.CompletableFuture;-import javax.annotation.Nullable;-import org.apache.wicket.protocol.ws.api.message.IWebSocketPushMessage;+import org.jspecify.annotations.Nullable;import com.fasterxml.jackson.databind.JsonNode;diff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.javaindex 103056f99f..78937d11c3 100644--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java@@ -1107,7 +1107,7 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>@Overridepublic void runPrompt(User ai, Project project, ObjectId commitId, String branch, String prompt, TaskFailedCallback taskFailedCallback) {WorkspaceSpec applicableSpec = null;- for (var spec : project.getWorkspaceSpecs()) {+ for (var spec : project.getHierarchyWorkspaceSpecs()) {if (spec.getTaskAutomation() != null) {var applicableUsers = spec.getTaskAutomation().getApplicableAis();if (applicableUsers.isEmpty() || applicableUsers.contains(ai.getName())) {diff --git a/server-ee b/server-eeindex 9e6a82341a..c3f63997ab 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 9e6a82341ae79f7086f59d40dc3c42c51fa14aaf+Subproject commit c3f63997abb75f1a94a11299a51fd8e106272ea3diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.javaindex 9d6c2d5908..5211f96bb7 100644--- a/server-product/src/test/java/io/onedev/server/product/Test.java+++ b/server-product/src/test/java/io/onedev/server/product/Test.java@@ -2,8 +2,4 @@ package io.onedev.server.product;public class Test {- @org.junit.Test- public void test() throws Exception {- }-}