Match command snippet on ID rather than command name

Also ensure each snippet has its own ID.

Author: savetheclocktower

lib/snippet-body.pegjs

@@ -213,7 +213,8 @@ ifText = text:(escaped / char:[^:] { return char })+ {
   return text.join('')
 }
 
-// For either the second part of a two-part if-else OR the sole part of a one-part if/else. Runs until the `}` that ends the expression.
+// For either the second part of a two-part if-else OR the sole part of a
+// one-part if/else. Runs until the `}` that ends the expression.
 ifElseText = text:(escaped / char:[^}] { return char })+ {
   return text.join('')
 }

lib/snippet.js

@@ -14,8 +14,8 @@ function tabStopsReferencedWithinTabStopContent (segment) {
 
 module.exports = class Snippet {
   constructor (attrs) {
-
     let {
+      id,
       bodyText,
       bodyTree,
       command,
@@ -30,6 +30,7 @@ module.exports = class Snippet {
       selector
     } = attrs
 
+    this.id = id
     this.name = name
     this.prefix = prefix
     this.command = command

lib/snippets.js

@@ -274,7 +274,7 @@ module.exports = {
         } catch (e) {
           const message = `\
           Unable to watch path: \`snippets.cson\`. Make sure you have permissions
-          to the \`~/.atom\` directory and \`${userSnippetsPath}\`.
+          to the \`~/.pulsar\` directory and \`${userSnippetsPath}\`.
 
           On linux there are currently problems with watch sizes. See
           [this document][watches] for more info.
@@ -537,7 +537,7 @@ module.exports = {
 
       let targetSnippet = null
       for (let snippet of Object.values(snippets)) {
-        if (snippet.command === command && snippet.packageName === packageName) {
+        if (snippet.id === attributes.id) {
           targetSnippet = snippet
           break
         }
@@ -555,17 +555,7 @@ module.exports = {
         return event.abortKeyBinding()
       }
 
-      this.getStore(editor).observeHistory({
-        undo: event => { this.onUndoOrRedo(editor, event, true) },
-        redo: event => { this.onUndoOrRedo(editor, event, false) }
-      })
-      this.findOrCreateMarkerLayer(editor)
-      editor.transact(() => {
-        const cursors = editor.getCursors()
-        for (const cursor of cursors) {
-          this.insert(targetSnippet, editor, cursor)
-        }
-      })
+      this.expandSnippet(editor, targetSnippet)
     }
 
     let disposable = atom.commands.add(
@@ -770,6 +760,22 @@ module.exports = {
     }
   },
 
+  expandSnippet (editor, snippet) {
+    this.getStore(editor).observeHistory({
+      undo: event => { this.onUndoOrRedo(editor, event, true) },
+      redo: event => { this.onUndoOrRedo(editor, event, false) }
+    })
+
+    this.findOrCreateMarkerLayer(editor)
+
+    editor.transact(() => {
+      const cursors = editor.getCursors()
+      for (const cursor of cursors) {
+        this.insert(snippet, editor, cursor)
+      }
+    })
+  },
+
   expandSnippetsUnderCursors (editor) {
     const snippet = this.snippetToExpandUnderCursor(editor)
     if (!snippet) { return false }
@@ -883,7 +889,7 @@ module.exports = {
     if (cursor == null) { cursor = editor.getLastCursor() }
     if (typeof snippet === 'string') {
       const bodyTree = this.getBodyParser().parse(snippet)
-      snippet = new Snippet({name: '__anonymous', prefix: '', bodyTree, bodyText: snippet})
+      snippet = new Snippet({id: this.snippetIdCounter++, name: '__anonymous', prefix: '', bodyTree, bodyText: snippet})
     }
     return new SnippetExpansion(snippet, editor, cursor, this)
   },