Add error logging and get repo top level (#2)

Author: KattMingMing

README.md

@@ -13,7 +13,7 @@ if (services.c9.workspaceId.match("{username}/{workspacename}")) {
     // call plugin manager with a list of plugins you want to load
     // this takes either url, or a path on your vm
     services.pluginManager.loadPackage([
-        "https://cdn.rawgit.com/sourcegraph/sourcegraph-c9/v0.0.2/sourcegraph/c9build/package.sourcegraph.js",
+        "https://cdn.rawgit.com/sourcegraph/sourcegraph-c9/v0.0.3/sourcegraph/c9build/package.sourcegraph.js",
     ])
 }
 ```

sourcegraph/c9build/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sourcegraph",
   "description": "Sourcegraph for C9",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "author": "Sourcegraph",
   "contributors": [
     {

sourcegraph/c9build/package.sourcegraph.js

@@ -1,7 +1,7 @@
 define("plugins/sourcegraph/package.sourcegraph", [], {
     "name": "sourcegraph",
     "description": "Sourcegraph for C9",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "author": "Sourcegraph",
     "contributors": [
         {
@@ -52,7 +52,7 @@ define("plugins/sourcegraph/sourcegraph",[], function(require, exports, module)
     var workspaceDir = imports.c9.workspaceDir
     var tabs = imports.tabManager
     var dirname = require('path').dirname
-    var VERSION = '0.0.1'
+    var VERSION = '0.0.3'
 
     var plugin = new Plugin('Ajax.org', main.consumes)
     var emit = plugin.getEmitter()
@@ -185,23 +185,37 @@ define("plugins/sourcegraph/sourcegraph",[], function(require, exports, module)
     function repoInfo(callback) {
       getRemote(function(err, remotes) {
         if (err) {
+          logError("Unable to resolve getRemote", err)
           return
         }
         var remote = remotes[0]
         gitRemoteUrl(remote, function(err, remoteUrl) {
           if (err) {
+            logError("Unable to resolve gitRemoteUrl", err)
             return
           }
           getBranch(function(err, branch) {
             if (err) {
+              logError("Unable to resolve getBranch", err)
               return
             }
-            var tab = tabs.focussedTab
-            var filePath = tab && tab.path
-            callback({
-              remote: remoteUrl,
-              branch: branch,
-              file: filePath
+            getTopLevel(function(err, topLevel) {
+              if (err) {
+                logError("Unable to resolve getTopLevel", err)
+                return
+              }
+              var tab = tabs.focussedTab
+              if (!tab || !tab.path) {
+                logError("Unable to resolve file path", "No tab found.")
+                return
+              }
+
+              var filePath = `${environmentDir || workspaceDir}${tab.path}`.replace(topLevel, '')
+              callback({
+                remote: remoteUrl,
+                branch: branch,
+                file: filePath
+              })
             })
           })
         })
@@ -250,6 +264,13 @@ define("plugins/sourcegraph/sourcegraph",[], function(require, exports, module)
       })
     }
 
+    function getTopLevel(callback) {
+      git(['rev-parse', '--show-toplevel'], function(err, stdout, stderr) {
+        if (err || stderr) return callback(err || stderr)
+        callback(null, stdout.trim())
+      })
+    }
+
     function getRemote(callback) {
       git(['remote'], function(err, stdout, stderr) {
         if (err || stderr) return callback(err || stderr)
@@ -289,6 +310,10 @@ define("plugins/sourcegraph/sourcegraph",[], function(require, exports, module)
       return { cursor, anchor }
     }
 
+    function logError(messsage, err) {
+      console.error(`${message}: ${err}\n EnvDir: ${environmentDir}, WorkspaceDir: ${workspaceDir}`)
+    }
+
     plugin.on('load', function() {
       load()
     })

sourcegraph/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sourcegraph",
   "description": "Sourcegraph for C9",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "author": "Sourcegraph",
   "contributors": [
     {

sourcegraph/sourcegraph.js

@@ -21,7 +21,7 @@ define(function(require, exports, module) {
     var workspaceDir = imports.c9.workspaceDir
     var tabs = imports.tabManager
     var dirname = require('path').dirname
-    var VERSION = '0.0.1'
+    var VERSION = '0.0.3'
 
     /***** Initialization *****/
 
@@ -160,23 +160,37 @@ define(function(require, exports, module) {
     function repoInfo(callback) {
       getRemote(function(err, remotes) {
         if (err) {
+          logError("Unable to resolve getRemote", err)
           return
         }
         var remote = remotes[0]
         gitRemoteUrl(remote, function(err, remoteUrl) {
           if (err) {
+            logError("Unable to resolve gitRemoteUrl", err)
             return
           }
           getBranch(function(err, branch) {
             if (err) {
+              logError("Unable to resolve getBranch", err)
               return
             }
-            var tab = tabs.focussedTab
-            var filePath = tab && tab.path
-            callback({
-              remote: remoteUrl,
-              branch: branch,
-              file: filePath
+            getTopLevel(function(err, topLevel) {
+              if (err) {
+                logError("Unable to resolve getTopLevel", err)
+                return
+              }
+              var tab = tabs.focussedTab
+              if (!tab || !tab.path) {
+                logError("Unable to resolve file path", "No tab found.")
+                return
+              }
+
+              var filePath = `${environmentDir || workspaceDir}${tab.path}`.replace(topLevel, '')
+              callback({
+                remote: remoteUrl,
+                branch: branch,
+                file: filePath
+              })
             })
           })
         })
@@ -225,6 +239,13 @@ define(function(require, exports, module) {
       })
     }
 
+    function getTopLevel(callback) {
+      git(['rev-parse', '--show-toplevel'], function(err, stdout, stderr) {
+        if (err || stderr) return callback(err || stderr)
+        callback(null, stdout.trim())
+      })
+    }
+
     function getRemote(callback) {
       git(['remote'], function(err, stdout, stderr) {
         if (err || stderr) return callback(err || stderr)
@@ -266,6 +287,10 @@ define(function(require, exports, module) {
       return { cursor, anchor }
     }
 
+    function logError(messsage, err) {
+      console.error(`${message}: ${err}\n EnvDir: ${environmentDir}, WorkspaceDir: ${workspaceDir}`)
+    }
+
     /***** Lifecycle *****/
 
     plugin.on('load', function() {