Skip to content

The Unified and Autonomous Development Platform

Highlight related symbol in outline when cursor moves in source

robin shen0e72b77b1956
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
index e0d38515b2..05f92e4602 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
@@ -54,6 +54,7 @@ import com.gitplex.jsymbol.Range;
import com.gitplex.jsymbol.Symbol;
import com.gitplex.jsymbol.SymbolExtractor;
import com.gitplex.jsymbol.SymbolExtractorRegistry;
+import com.gitplex.jsymbol.TokenPosition;
import com.gitplex.server.GitPlex;
import com.gitplex.server.git.Blame;
import com.gitplex.server.git.Blob;
@@ -592,6 +593,37 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
target.appendJavaScript(script);
context.onCommentOpened(target, comment);
break;
+ case "syncOutline":
+ int line = params.getParameterValue("param1").toInt();
+ int ch = params.getParameterValue("param2").toInt();
+ Symbol closest = null;
+ for (Symbol symbol: symbols) {
+ TokenPosition scope = symbol.getScope();
+ if (scope != null) {
+ if (contains(scope, line, ch)) {
+ if (closest != null) {
+ if (contains(closest.getScope(), scope.getFromLine(), scope.getFromCh())
+ && contains(closest.getScope(), scope.getToLine(), scope.getToCh())) {
+ closest = symbol;
+ }
+ } else {
+ closest = symbol;
+ }
+ }
+ }
+ }
+ if (closest != null) {
+ @SuppressWarnings("unchecked")
+ NestedTree<Symbol> tree = (NestedTree<Symbol>) outlineContainer.get(BODY_ID);
+ Symbol current = closest;
+ while (current != null) {
+ tree.expand(current);
+ current = current.getParent();
+ }
+ script = String.format("gitplex.server.sourceView.syncOutline('%s');", getSymbolId(closest));
+ target.appendJavaScript(script);
+ }
+ break;
}
}
@@ -659,9 +691,12 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
@Override
protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {
- Fragment fragment = new Fragment(id, "outlineNodeFrag", SourceViewPanel.this);
Symbol symbol = nodeModel.getObject();
+ Fragment fragment = new Fragment(id, "outlineNodeFrag", SourceViewPanel.this);
+ fragment.setMarkupId(getSymbolId(symbol));
+ fragment.setOutputMarkupId(true);
+
fragment.add(symbol.renderIcon("icon"));
AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
@@ -728,6 +763,14 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
});
}
+
+ private boolean contains(TokenPosition scope, int line, int ch) {
+ int fromLine = scope.getFromLine();
+ int toLine = scope.getToLine();
+ int fromCh = scope.getFromCh();
+ int toCh = scope.getToCh();
+ return (fromLine < line || fromLine == line && fromCh<=ch) && (toLine > line || toLine == line && toCh >= ch);
+ }
private TextRange getMark(IRequestParameters params, String beginLineParam, String beginCharParam,
String endLineParam, String endCharParam) {
@@ -905,6 +948,10 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {
List<Range> ranges;
}
+ private String getSymbolId(Symbol symbol) {
+ return "outline-symbol-" + symbols.indexOf(symbol);
+ }
+
@SuppressWarnings("unused")
private static class CommentInfo {
long id;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java
index cc7fe53b76..eb7bb508b4 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java
@@ -10,6 +10,7 @@ import com.gitplex.server.web.assets.js.codemirror.CodeMirrorResourceReference;
import com.gitplex.server.web.assets.js.cookies.CookiesResourceReference;
import com.gitplex.server.web.assets.js.hover.HoverResourceReference;
import com.gitplex.server.web.assets.js.jqueryui.JQueryUIResourceReference;
+import com.gitplex.server.web.assets.js.scrollintoview.ScrollIntoViewResourceReference;
import com.gitplex.server.web.assets.js.selectionpopover.SelectionPopoverResourceReference;
import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
import com.gitplex.server.web.page.base.BaseDependentResourceReference;
@@ -28,7 +29,7 @@ public class SourceViewResourceReference extends BaseDependentResourceReference
dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new SelectionPopoverResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));
-
+ dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));
dependencies.add(CssHeaderItem.forReference(
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.css
index 3c07be79bb..baf9243164 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.css
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.css
@@ -87,6 +87,9 @@
padding: 4px;
overflow: auto;
}
+.source-view>.outline>.content>.body .tree-content.active {
+ background: #FCF5DA;
+}
.CodeMirror-comments {
width: 20px;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
index ae7a78ec4a..0dcfd07b2b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
@@ -78,6 +78,19 @@ gitplex.server.sourceView = {
gitplex.server.mouseState.moved = false;
repositionCommentPopovers();
});
+
+ var cursorActivityTimer;
+ cm.on("cursorActivity", function() {
+ if (cursorActivityTimer)
+ clearTimeout(cursorActivityTimer);
+ cursorActivityTimer = setTimeout(function() {
+ var $outline = $sourceView.children(".outline");
+ if ($outline.is(":visible")) {
+ var cursor = cm.getCursor();
+ callback("syncOutline", cursor.line, cursor.ch);
+ }
+ }, 500);
+ });
$sourceView.on("getViewState", function() {
return gitplex.server.codemirror.getViewState(cm);
@@ -210,6 +223,15 @@ gitplex.server.sourceView = {
}
});
},
+ syncOutline: function(symbolId) {
+ var $symbol = $("#" + symbolId);
+ var $body = $(".source-view>.outline>.content>.body");
+ $body.scrollIntoView($symbol, 20, 20);
+ $body.find(".tree-content").removeClass("active");
+ $symbol.addClass("active");
+
+ $(window).resize();
+ },
restoreMark: function() {
var $sourceView = $(".source-view");
var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;