temp take 3?

im second guessing myself

Author: fluvf

constructs/snippet.js

@@ -170,8 +170,9 @@ module.exports = class Snippet extends Construct {
 
   // helper cause Snippet isn't really ever available
   expand ({
-    cursor = atom.workspace.getActiveTextEditor().getLastCursor(),
-    tabstops = cursor.editor.addMarkerLayer(),
+    editor = atom.workspace.getActiveTextEditor(),
+    cursor = editor.getLastCursor(),
+    tabstops = editor.addMarkerLayer(),
     variables = {}
   } = {}) {
     if (this.legacySyntax) {
@@ -207,8 +208,8 @@ module.exports = class Snippet extends Construct {
 
     this.body.forEach(value => {
       value instanceof Object
-        ? value.expand(cursor, tabstops, variables)
-        : this.insert(cursor, value)
+        ? value.expand(editor, cursor, tabstops, variables)
+        : this.insert(editor, cursor.getBufferPosition(), value)
     })
 
     // Only create tabstop stuff if we have any
@@ -218,13 +219,10 @@ module.exports = class Snippet extends Construct {
       // The markers aren't guaranteed to be in insertion order, as they're stored in an Object
       // Luckilly the ids used are integers and the values are fetched using 'Object.values'
       const stops = {
-        tabstops: Snippet.getTabstops(tabstops.getMarkers()),
-        get iterator () {
-          delete this.iterator
-          return (this.iterator = this.tabstops.values())
-        },
-        next () {
+        iterator: Snippet.getTabstops(tabstops.getMarkers()).values(),
+        next (event) {
           const { done, value: [stop, ...mirrors] = [] } = this.iterator.next()
+          const editor = event.originalEvent.getModel();
           return done
             ? disposables.dispose()
             // Cheaty way of returning true concisely
@@ -236,7 +234,7 @@ module.exports = class Snippet extends Construct {
       disposables.add(
         { dispose: () => tabstops.destroy() },
         atom.keymaps.add(module.filename, { [target]: { tab: iterate } }),
-        atom.commands.add(target, iterate, event => stops.next() ||
+        atom.commands.add(target, iterate, event => stops.next(event) ||
         event.abortKeyBinding()))
 
       // Go to the first tabstop

constructs/tabstop.js

@@ -1,7 +1,7 @@
 const Construct = require('./construct')
 
 module.exports = class Tabstop extends Construct {
-  expand (cursor, tabstops, variables) {
+  expand (editor, cursor, tabstops, variables) {
     this.mark({ tabstops, start: cursor.getBufferPosition() })
   }
 }

constructs/variable.js

@@ -1,9 +1,10 @@
 const Construct = require('./construct')
 
 module.exports = class Variable extends Construct {
-  expand (cursor, tabstops, variables) {
+  expand (editor, cursor, tabstops, variables) {
+    const position = cursor.getBufferPosition();
     this.identifier in variables
-      ? this.insert(cursor, variables[this.identifier])
-      : this.mark({ tabstops, ...this.insert(cursor, this.identifier) })
+      ? this.insert(editor, position, variables[this.identifier])
+      : this.mark({ tabstops, ...this.insert(editor, position, this.identifier) })
   }
 }

snippets.js

@@ -21,12 +21,12 @@ module.exports = class Snippets {
         : undefined),
       atom.commands.add('atom-text-editor', 'snippets:available', () =>
         this.availableSnippetsView.toggle(atom.workspace.getActiveTextEditor())),
-      atom.packages.onDidActivatePackage(bundle => this.loadPackage(bundle)),
-      atom.packages.onDidDeactivatePackage(bundle => this.unloadPackage(bundle)))
+      atom.packages.onDidActivatePackage(pack => this.loadPackage(pack)),
+      atom.packages.onDidDeactivatePackage(pack => this.unloadPackage(pack)))
 
     await (this.loaded = Promise.all([
       this.loadUserSnippets(),
-      ...atom.packages.getActivePackages().map(bundle => this.loadPackage(bundle))
+      ...atom.packages.getActivePackages().map(pack => this.loadPackage(pack))
     ]).then(() => true))
   }
 
@@ -75,17 +75,17 @@ module.exports = class Snippets {
     }
   }
 
-  static async loadPackage (bundle) {
-    const snippetsDirectory = path.join(bundle.path, 'snippets')
+  static async loadPackage (pack) {
+    const snippetsDirectory = path.join(pack.path, 'snippets')
     try {
       const files = await fs.promises.readdir(snippetsDirectory)
       files.forEach(async file => {
         const snippetsFile = path.join(snippetsDirectory, file)
         try {
           const disposable = await this.loadSnippetsFile(snippetsFile)
-          this.packageDisposables.has(bundle)
-            ? this.packageDisposables.get(bundle).add(disposable)
-            : this.packageDisposables.set(bundle, new CompositeDisposable(disposable))
+          this.packageDisposables.has(pack)
+            ? this.packageDisposables.get(pack).add(disposable)
+            : this.packageDisposables.set(pack, new CompositeDisposable(disposable))
         } catch (error) {
           atom.notifications.addWarning(`Unable to load snippets from: '${snippetsFile}'`, {
             description: 'Make sure you have permissions to access the directory and file.',
@@ -107,10 +107,10 @@ module.exports = class Snippets {
     }
   }
 
-  static unloadPackage (bundle) {
-    if (this.packageDisposables.has(bundle)) {
-      this.packageDisposables.get(bundle).dispose()
-      this.packageDisposables.delete(bundle)
+  static unloadPackage (pack) {
+    if (this.packageDisposables.has(pack)) {
+      this.packageDisposables.get(pack).dispose()
+      this.packageDisposables.delete(pack)
     }
   }