Fix snippets not working when hitting tab-key

This fixes a long-standing regression introduced in 97d1319.

CHANGELOG.md

@@ -18,6 +18,7 @@ This project adheres to [Semantic Versioning](http://semver.org).
 * __Fixed:__ User-defined character names not highlighted by `\(xx`
 * __Fixed:__ Macros starting with `.[` always assumed to be `refer(!)`
 * __Fixed:__ Macros starting with `cu-` mistaken for `.cu` requests
+* __Fixed:__ Snippets not working when hitting tab key
 * __Improved:__ Highlighting of arithmetic and comparison operators
 * __Removed:__ `.t` from associated file extensions
 

lib/editing.js

@@ -7,9 +7,9 @@
  */
 module.exports = () => [
 	atom.commands.add("atom-text-editor[data-grammar='text roff']", {
-		"language-roff:fix-blank-lines": () => fixBlankLines(),
-		"language-roff:indent":          () => indentEditor(),
-		"language-roff:outdent":         () => outdentEditor(),
+		"language-roff:fix-blank-lines": ev => fixBlankLines(ev),
+		"language-roff:indent":          ev => indentEditor(ev),
+		"language-roff:outdent":         ev => outdentEditor(ev),
 	}),
 ];
 
@@ -39,11 +39,18 @@ function fixBlankLines(){
 
 /**
  * Handle Roff-specific indentation.
+ * @param {CustomEvent} event
  * @internal
  */
-function indentEditor(){
+function indentEditor(event){
 	const ed = atom.workspace.getActiveTextEditor();
 
+	// Determine if snippet expansion is possible at the current cursor
+	const pkg = atom.packages.getActivePackage("snippets");
+	if(pkg && pkg.mainModule && "function" === typeof pkg.mainModule.snippetToExpandUnderCursor)
+		if(pkg.mainModule.snippetToExpandUnderCursor(ed) || pkg.mainModule.goToNextTabStop(ed))
+			return event.abortKeyBinding();
+
 	ed.transact(100, () => {
 		const tab = ed.getTabText();
 
@@ -77,11 +84,18 @@ function indentEditor(){
 
 /**
  * Handle Roff-specific unindentation.
+ * @param {CustomEvent} event
  * @internal
  */
-function outdentEditor(){
+function outdentEditor(event){
 	const ed = atom.workspace.getActiveTextEditor();
 
+	// Terminate command if a snippet is active and a previous tabstop exists
+	const pkg = atom.packages.getActivePackage("snippets");
+	if(pkg && pkg.mainModule && "function" === typeof pkg.mainModule.goToPreviousTabStop)
+		if(pkg.mainModule.goToPreviousTabStop(ed))
+			return event.abortKeyBinding();
+
 	ed.transact(100, () => {
 		const tab         = ed.getTabText();
 		const untab       = "(?:\t|\\x20{1," + ed.getTabLength() + "})";