Merge pull request #567 from andocz/blame-preserve-selection

Improve initialization of git blame view
Ericsson · Mar 12, 2022 · f775739 · f775739
2 parents f32a055 + 4717d23
commit f775739
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/plugins/git/webgui/js/gitBlame.js b/plugins/git/webgui/js/gitBlame.js
@@ -204,7 +204,6 @@ function (on, topic, declare, Color, dom, Tooltip, Text, model, viewHandler,
      * @param {Integer} fileId
      */
     loadBlameView : function (path, fileId) {
-      this.set('selection', [1,1,1,1]);
       var res = model.gitservice.getRepositoryByProjectPath(path);
 
       if (!res.isInRepository)
@@ -250,14 +249,27 @@ function (on, topic, declare, Color, dom, Tooltip, Text, model, viewHandler,
         if (!fileInfo)
           return;
 
+        var selection = message.nodeInfo
+          ? [
+              message.nodeInfo.range.range.startpos.line,
+              message.nodeInfo.range.range.startpos.column,
+              message.nodeInfo.range.range.endpos.line,
+              message.nodeInfo.range.range.endpos.column]
+          : [1, 1, 1, 1];
+
         commitCache = {};
         that.loadFile(fileInfo.id);
+        that.set('selection', selection);
+        that.jumpToPos(selection[0], selection[1]);
+
         that.loadBlameView(fileInfo.path, fileInfo.id);
 
         topic.publish('codecompass/setCenterModule', that.id);
 
         urlHandler.setStateValue({
-          center : that.id
+          center : that.id,
+          select : selection.join('|'),
+          fid    : fileInfo.id
         });
       });
     }