The Unified and Autonomous Development Platform
Fix issue #778 - Marked text of code comment not highlighted in source view sometimes
Robin Shen23f629957f4a
diff --git a/pom.xml b/pom.xmlindex b7122db016..67e74d0e36 100644--- a/pom.xml+++ b/pom.xml@@ -9,7 +9,7 @@<version>1.0.5</version></parent><artifactId>server</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>@@ -588,8 +588,8 @@</repository></repositories><properties>- <commons.version>2.2.1</commons.version>- <agent.version>1.3.12</agent.version>+ <commons.version>2.2.2</commons.version>+ <agent.version>1.3.13</agent.version><slf4j.version>1.7.30</slf4j.version><logback.version>1.2.9</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex ab4191b81e..166ecfc251 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><build><plugins>diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.cssindex aea42e5178..60b82667cd 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-custom.css@@ -7,7 +7,10 @@}.cm-searching {- background: rgb(125, 82, 1);+ background: rgb(248, 234, 148);+}+.dark-mode .cm-searching {+ background: rgb(179, 117, 3);}.CodeMirror-mark {background: #8950FC;@@ -23,10 +26,10 @@background: var(--warning);}.cm-searching.cm-identifierhighlight {- background: #e8e9c5;+ background: rgb(218, 143, 3);}.dark-mode .cm-searching.cm-identifierhighlight {- background: rgb(127, 112, 96);+ background: rgb(125, 82, 1);}.cm-searching.cm-identifierhighlight.CodeMirror-mark {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 e971b933fa..348d8ad7e2 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@@ -243,7 +243,7 @@ onedev.server.sourceView = {$trigger.mouseover(function() {onedev.server.codemirror.mark(cm, markRanges);}).mouseout(function() {- onedev.server.sourceView.clearMark();+ onedev.server.sourceView.restoreMark();});$trigger.mousedown(function() {@@ -265,7 +265,7 @@ onedev.server.sourceView = {$currentPopover.find(".problem-content").mouseover(function() {onedev.server.codemirror.mark(cm, problems[$(this).index()].range);}).mouseout(function() {- onedev.server.sourceView.clearMark();+ onedev.server.sourceView.restoreMark();}).each(function() {var problem = problems[$(this).index()];$(this).children(".add-comment").click(function() {@@ -337,7 +337,7 @@ onedev.server.sourceView = {onedev.server.codemirror.mark(cm, comment.range);});$(this).mouseout(function() {- onedev.server.sourceView.clearMark();+ onedev.server.sourceView.restoreMark();});$(this).click(function() {if (!$(this).hasClass("active") && onedev.server.sourceView.confirmUnsavedChanges()) {@@ -361,7 +361,7 @@ onedev.server.sourceView = {$indicator.mouseover(function() {onedev.server.codemirror.mark(cm, comment.range);}).mouseout(function() {- onedev.server.sourceView.clearMark();+ onedev.server.sourceView.restoreMark();});$indicator.click(function() {if (!$indicator.hasClass("active") && onedev.server.sourceView.confirmUnsavedChanges()) {@@ -461,7 +461,7 @@ onedev.server.sourceView = {onedev.server.sourceView.highlightCommentTrigger();}$(window).resize();- onedev.server.sourceView.clearMark();+ onedev.server.sourceView.restoreMark();},onAddComment: function(commentRange) {$(".popover").popover("hide");@@ -500,7 +500,7 @@ onedev.server.sourceView = {$sourceView.removeData("openComment");onedev.server.sourceView.highlightCommentTrigger();$(window).resize();- onedev.server.sourceView.clearMark();+ onedev.server.sourceView.restoreMark();},onToggleOutline: function() {onedev.server.sourceView.exitFullScreen();@@ -555,13 +555,14 @@ onedev.server.sourceView = {onedev.server.codemirror.scrollTo(cm, markRange);cm.setCursor({line: markRange.fromRow, ch: markRange.fromColumn});},- clearMark: function() {+ restoreMark: function() {+ var $sourceView = $(".source-view");var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- var markRange = $(".source-view").data("markRange");+ var markRange = $sourceView.data("markRange");if (markRange)- onedev.server.codemirror.scrollIntoView(cm, markRange);- $(".source-view").removeData("markRange");- onedev.server.codemirror.clearMark(cm);+ onedev.server.codemirror.mark(cm, markRange);+ else+ onedev.server.codemirror.clearMark(cm);},blame: function(blameInfos) {var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex 38c0db53e5..7e3578b25d 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex 23e394dde0..676256c05e 100644--- a/server-plugin/server-plugin-archetype/pom.xml+++ b/server-plugin/server-plugin-archetype/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><build><resources>diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xmlindex fb6a603c26..bc214fe931 100644--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xmlindex 1e48fa8622..1e82b3f1c7 100644--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex c3b964985c..d1d64f83d0 100644--- a/server-plugin/server-plugin-buildspec-maven/pom.xml+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xmlindex 139fb1a6c1..9e02af22d5 100644--- a/server-plugin/server-plugin-buildspec-node/pom.xml+++ b/server-plugin/server-plugin-buildspec-node/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex 109e73fceb..034fb64077 100644--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xmlindex 06096c8cff..7a9109211d 100644--- a/server-plugin/server-plugin-executor-remotedocker/pom.xml+++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xmlindex 55130e8d5c..32329018f7 100644--- a/server-plugin/server-plugin-executor-remoteshell/pom.xml+++ b/server-plugin/server-plugin-executor-remoteshell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xmlindex 7bd4f64317..8bc0f06aab 100644--- a/server-plugin/server-plugin-executor-serverdocker/pom.xml+++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xmlindex 55896b367a..7e190fe677 100644--- a/server-plugin/server-plugin-executor-servershell/pom.xml+++ b/server-plugin/server-plugin-executor-servershell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xmlindex 2de20233f2..18be206b8d 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml+++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xmlindex 6727fbd6c6..fc934f3edc 100644--- a/server-plugin/server-plugin-import-gitea/pom.xml+++ b/server-plugin/server-plugin-import-gitea/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitea.GiteaPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xmlindex 409baa7f0d..64b2807493 100644--- a/server-plugin/server-plugin-import-github/pom.xml+++ b/server-plugin/server-plugin-import-github/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.github.GitHubPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xmlindex 99fa72d3ce..4b9aa7d954 100644--- a/server-plugin/server-plugin-import-gitlab/pom.xml+++ b/server-plugin/server-plugin-import-gitlab/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xmlindex cecdcdf159..c3544d97f7 100644--- a/server-plugin/server-plugin-import-jiracloud/pom.xml+++ b/server-plugin/server-plugin-import-jiracloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xmlindex 2793472d1e..e3a35b1666 100644--- a/server-plugin/server-plugin-import-youtrack/pom.xml+++ b/server-plugin/server-plugin-import-youtrack/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xmlindex d717ee6656..54c8679b22 100644--- a/server-plugin/server-plugin-report-checkstyle/pom.xml+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xmlindex 8d2a62786f..0991f09d6b 100644--- a/server-plugin/server-plugin-report-clover/pom.xml+++ b/server-plugin/server-plugin-report-clover/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xmlindex 3e8c2daf4a..f3fc0e4abb 100644--- a/server-plugin/server-plugin-report-coverage/pom.xml+++ b/server-plugin/server-plugin-report-coverage/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.report.coverage.CoverageReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xmlindex e259238945..ca6e2a08fd 100644--- a/server-plugin/server-plugin-report-cpd/pom.xml+++ b/server-plugin/server-plugin-report-cpd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jacoco/pom.xml b/server-plugin/server-plugin-report-jacoco/pom.xmlindex 25a4d4cefa..a574f4a6e2 100644--- a/server-plugin/server-plugin-report-jacoco/pom.xml+++ b/server-plugin/server-plugin-report-jacoco/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xmlindex 4aedd63c24..07384a6669 100644--- a/server-plugin/server-plugin-report-jest/pom.xml+++ b/server-plugin/server-plugin-report-jest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xmlindex e34f33fe29..bbf76324c5 100644--- a/server-plugin/server-plugin-report-junit/pom.xml+++ b/server-plugin/server-plugin-report-junit/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex cb80efd79b..fbdb0daf26 100644--- a/server-plugin/server-plugin-report-markdown/pom.xml+++ b/server-plugin/server-plugin-report-markdown/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xmlindex 0a8ca1da31..bfea6d7fc4 100644--- a/server-plugin/server-plugin-report-pmd/pom.xml+++ b/server-plugin/server-plugin-report-pmd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xmlindex 3508447046..cab0a43f9d 100644--- a/server-plugin/server-plugin-report-problem/pom.xml+++ b/server-plugin/server-plugin-report-problem/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.report.problem.ProblemReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xmlindex e9ca44ba44..64371903fe 100644--- a/server-plugin/server-plugin-report-spotbugs/pom.xml+++ b/server-plugin/server-plugin-report-spotbugs/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xmlindex 956f447280..7fc8aa68d1 100644--- a/server-plugin/server-plugin-report-unittest/pom.xml+++ b/server-plugin/server-plugin-report-unittest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.report.unittest.UnitTestReportModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-discord/pom.xml b/server-plugin/server-plugin-sso-discord/pom.xmlindex 2cd4ab551b..823c1af941 100644--- a/server-plugin/server-plugin-sso-discord/pom.xml+++ b/server-plugin/server-plugin-sso-discord/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><properties><moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xmlindex 1bb665bee9..12aa7e2e49 100644--- a/server-plugin/server-plugin-sso-openid/pom.xml+++ b/server-plugin/server-plugin-sso-openid/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><dependencies><dependency>diff --git a/server-product/pom.xml b/server-product/pom.xmlindex 8becbcabcc..f5575948d3 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>7.3.7</version>+ <version>7.3.8</version></parent><dependencies><dependency>