all: release v1.0.5

Author: Stephen Gutekanst

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.5 - Fixed search shortcut.
+
+- Updated the search URL to reflect a recent Sourcegraph.com change.
+
 ## 1.0.0 - Initial Release
 
-- basic Open File & Search functionality.
+- Basic Open File & Search functionality.

README.md

@@ -49,13 +49,13 @@ Please file an issue: https://github.com/sourcegraph/sourcegraph-atom/issues/new
 
 To develop the plugin:
 
-- `git clone` the repository into `~/.atom/Packages/sourcegraph` (lowercase `packages` on Mac)
+- `git clone` the repository into `~/.atom/Packages/sourcegraph` (lowercase `packages` on Mac), `npm install` and open in Atom.
 - Use <kbd>Cmd+Shift+P</kbd> to open the command pallette, and choose `Window: Reload` to reload the extension in the current Atom window.
 - Atom does some really bad things with respect to reopening the workspace, so `File` -> `Reopen Project` and `View` -> `Toggle Tree View` (<kbd>Cmd+\\</kbd>) are your friends here. Consider using a separate editor to make changes.
 - To release a new version, you MSUT update the following files:
   1. `CHANGELOG.md` (describe ALL changes)
   3. `lib/sourcegraph.js` (`VERSION` constant)
-  4. `git commit -m "all: release v<THE VERSION>` and `git push`.
+  4. `git commit -m "all: release v<THE VERSION>" && git push`
   5. `apm publish <major|minor|patch>`
 
 

lib/sourcegraph.js

@@ -7,7 +7,7 @@ const execa = require('execa')
 const url = require('url')
 const path = require('path')
 
-const VERSION = "v1.0.4"
+const VERSION = "v1.0.5"
 
 // gitRemotes returns the names of all git remotes, e.g. ["origin", "foobar"]
 async function gitRemotes(repoDir: string) {
@@ -53,25 +53,32 @@ async function gitBranch(repoDir: string) {
 }
 
 function sourcegraphURL() {
-  const url = atom.config.get('sourcegraph.URL');
+  const url = atom.config.get('sourcegraph.URL')
   if (!url.endsWith("/")) {
     return url + "/"
   }
   return url
 }
 
 // repoInfo returns the Sourcegraph repository URI, and the file path relative
-// to the repository root. If the repository URI cannot be determined, an
-// exception is thrown.
+// to the repository root. If the repository URI cannot be determined, empty
+// strings are returned.
 async function repoInfo(fileName: string) {
-  // Determine repository root directory.
-  const fileDir = path.dirname(fileName)
-  const repoRoot = await gitRootDir(fileDir)
-
-  // Determine file path, relative to repository root.
-  const remoteURL = await gitDefaultRemoteURL(repoRoot)
-  const branch = await gitBranch(repoRoot)
-  const fileRel = fileName.slice(repoRoot.length + 1)
+  let remoteURL = ""
+  let branch = ""
+  let fileRel = ""
+  try{
+    // Determine repository root directory.
+    const fileDir = path.dirname(fileName)
+    const repoRoot = await gitRootDir(fileDir)
+
+    // Determine file path, relative to repository root.
+    remoteURL = await gitDefaultRemoteURL(repoRoot)
+    branch = await gitBranch(repoRoot)
+    fileRel = fileName.slice(repoRoot.length + 1)
+  } catch (e) {
+    console.log("repoInfo:", e)
+  }
   return [remoteURL, branch, fileRel]
 }
 
@@ -84,40 +91,47 @@ async function open() {
   }
   let r = editor.getSelectedBufferRange()
 
-  try {
-    const [remoteURL, branch, fileRel] = await repoInfo(editor.getPath())
-
-    // Open in browser.
-    opn(`${sourcegraphURL()}-/editor`
-      + `?remote_url=${encodeURIComponent(remoteURL)}`
-      + `&branch=${encodeURIComponent(branch)}`
-      + `&file=${encodeURIComponent(fileRel)}`
-      + `&editor=${encodeURIComponent("Atom")}`
-      + `&version=${encodeURIComponent(VERSION)}`
-      + `&start_row=${encodeURIComponent(r.start.row)}`
-      + `&start_col=${encodeURIComponent(r.start.column)}`
-      + `&end_row=${encodeURIComponent(r.end.row)}`
-      + `&end_col=${encodeURIComponent(r.end.column)}`)
-  } catch (e) {
-    console.error(e)
+  const [remoteURL, branch, fileRel] = await repoInfo(editor.getPath())
+  if (remoteURL == "") {
+      return
   }
+
+  // Open in browser.
+  opn(`${sourcegraphURL()}-/editor`
+    + `?remote_url=${encodeURIComponent(remoteURL)}`
+    + `&branch=${encodeURIComponent(branch)}`
+    + `&file=${encodeURIComponent(fileRel)}`
+    + `&editor=${encodeURIComponent("Atom")}`
+    + `&version=${encodeURIComponent(VERSION)}`
+    + `&start_row=${encodeURIComponent(r.start.row)}`
+    + `&start_col=${encodeURIComponent(r.start.column)}`
+    + `&end_row=${encodeURIComponent(r.end.row)}`
+    + `&end_col=${encodeURIComponent(r.end.column)}`)
 }
 
 // search is the command implementation for searching a selection on
 // Sourcegraph.
-function search() {
+async function search() {
   let editor = atom.workspace.getActiveTextEditor()
   if (!editor) {
     return
   }
 
+  const [remoteURL, branch, fileRel] = await repoInfo(editor.getPath())
+
   let query = editor.getSelectedText()
   if (query == "") {
     return // nothing to query
   }
 
   // Search in browser.
-  opn(`${sourcegraphURL()}-/editor/?search=${encodeURIComponent(query)}&editor=${encodeURIComponent("Atom")}&version=${encodeURIComponent(VERSION)}`)
+  opn(`${sourcegraphURL()}-/editor`
+    + `?remote_url=${encodeURIComponent(remoteURL)}`
+    + `&branch=${encodeURIComponent(branch)}`
+    + `&file=${encodeURIComponent(fileRel)}`
+    + `&editor=${encodeURIComponent("Atom")}`
+    + `&version=${encodeURIComponent(VERSION)}`
+    + `&search=${encodeURIComponent(query)}`)
 }
 
 export default {