Merge branch 'master' into FixImagesOnVisualStudioCodeExtensionMarket

Author: gdziadkiewicz

package.json

@@ -86,6 +86,7 @@
     },
     "dependencies": {
         "copy-paste": "^1.1.4",
+        "find-parent-dir": "^0.3.0",
         "git-rev-2": "^0.1.0",
         "github-url-from-git": "^1.4.0",
         "open": "0.0.5",

src/extension.js

@@ -14,6 +14,7 @@ var parse = require('github-url-from-git');
 var open = require('open');
 var copy = require('copy-paste').copy;
 var gitRev = require('git-rev-2');
+var findParentDir = require('find-parent-dir');
 
 function formGitHubLink(parsedUri, branch, subdir, line) {
     if (subdir) {
@@ -34,9 +35,10 @@ function formVisualStudioLink(parsedUri, subdir, branch, line) {
 
 function getGitHubLink(cb, fileFsPath, line) {
     var cwd = workspace.rootPath;
+    var repoDir = findParentDir.sync(workspace.rootPath, '.git') || cwd;
 
     git({
-        cwd: cwd
+        cwd: repoDir
     }, function (err, config) {
         var rawUri, parseOpts, parsedUri, branch, projectName,
             subdir, gitLink, scUrls, workspaceConfiguration;
@@ -63,14 +65,19 @@ function getGitHubLink(cb, fileFsPath, line) {
             parsedUri = rawUri;
         }
 
-        gitRev.branch( cwd, function (branchErr, branch) {
+        gitRev.branch(cwd, function (branchErr, branch) {
             if (branchErr || !branch)
                 branch = 'master';
 
             projectName = parsedUri.substring(parsedUri.lastIndexOf("/") + 1, parsedUri.length);
-
             subdir = fileFsPath ? fileFsPath.substring(workspace.rootPath.length).replace(/\"/g, "") : undefined;
 
+            if (repoDir !== cwd) {
+                // The workspace directory is a subdirectory of the git repo folder so we need to prepend the the nested path
+                var repoRelativePath = cwd.replace(repoDir, "/");
+                subdir = repoRelativePath + subdir;
+            }
+
             if (parsedUri.startsWith(scUrls.github)) {
                 gitLink = formGitHubLink(parsedUri, branch, subdir, line);
             } else if (parsedUri.startsWith(scUrls.bitbucket)) {
@@ -104,7 +111,7 @@ function getGitHubLinkForRepo(cb) {
     getGitHubLink(cb);
 }
 
-function branchOnCallingContext(args, cb){
+function branchOnCallingContext(args, cb) {
     if (args && args.fsPath) {
         getGitHubLinkForFile(args.fsPath, cb);
     }
@@ -129,4 +136,4 @@ function activate(context) {
     context.subscriptions.push(commands.registerCommand('extension.copyGitHubLinkToClipboard', copyGitHubLinkToClipboard));
 }
 
-exports.activate = activate;
+exports.activate = activate;