JS part of command completion done

Author: oradwell

Diff for: src/Ockcyp/WpTerm/Command/CommandFactory.php

@@ -41,6 +41,8 @@ public static function make($executable)
                 return new GotoCommand;
             case 'help':
                 return new HelpCommand;
+            case 'complete':
+                return new CompleteCommand;
             default:
                 // If a valid command but no class mapping defined
                 // instantiate a JsCommand and set name to executable

Diff for: theme-integrations/common/wpterm.js

@@ -18,22 +18,16 @@ var wpTerm = function(termElem, url) {
         self.historyCon[0].scrollTop = self.historyCon[0].scrollHeight;
     };
 
+    self.appendToHistoryArray = function(list) {
+        for (var i = 0; i < list.length; i++) {
+            self.appendToHistory(list[i]);
+        }
+    }
+
     self.appendCommand = function(string) {
         self.appendToHistory(self.promptText + ' ' + string);
     };
 
-    self.appendResponse = function(response) {
-        if (response.list && response.list.length) {
-            for (var i = 0; i < response.list.length; i++) {
-                self.appendToHistory(response.list[i]);
-            }
-        } else if (response.msg) {
-            self.appendToHistory(response.msg);
-        } else if (response.url) {
-            self.appendToHistory('Redirecting to: ' + response.url);
-        }
-    };
-
     self.executeCommand = function(command) {
         // Save the command if not empty string
         // and is different from last command
@@ -63,22 +57,31 @@ var wpTerm = function(termElem, url) {
         }
     };
 
-    self.sendRequest = function(command) {
-        jQuery.get(self.url, {cmd: command}, self.handleResponse);
+    self.sendRequest = function(command, callback) {
+        if (typeof callback == 'undefined') {
+            callback = self.handleResponse;
+        }
+
+        jQuery.get(self.url, {cmd: command}, callback);
     }
 
     self.showHistory = function() {
-        for (var i in self.history.list) {
-            self.appendToHistory(self.history.list[i]);
-        }
+        self.appendToHistoryArray(self.history.list);
     }
 
     self.clearHistoryCon = function() {
         self.historyCon.html('');
     }
 
     self.handleResponse = function(response) {
-        self.appendResponse(response);
+        if (response.list && response.list.length) {
+            self.appendToHistoryArray(response.list);
+        } else if (response.msg) {
+            self.appendToHistory(response.msg);
+        } else if (response.url) {
+            self.appendToHistory('Redirecting to: ' + response.url);
+        }
+
         if (response.url) {
             var url = response.url;
             setTimeout(function() {
@@ -87,6 +90,45 @@ var wpTerm = function(termElem, url) {
         }
     };
 
+    self.handleCompleteResponse = function(response, input) {
+        if (response.complete) {
+            // New cursor position: complete + blank space
+            var newCurPos = input.selectionStart + response.complete.length + 1;
+            // Beginning part
+            input.value = input.value.substr(0, input.selectionStart)
+                // complete + blank space
+                + response.complete + ' '
+                // ending part
+                + input.value.substr(input.selectionEnd);
+
+            // Move the cursor
+            input.selectionStart = newCurPos;
+            input.selectionEnd = newCurPos;
+        } else if (response.list && response.list.length > 0) {
+            // Remove complete from command before adding to list
+            self.appendCommand(response.cmd.substr(9));
+            // Show the list
+            self.appendToHistoryArray(response.list);
+        }
+    };
+
+    self.handleKeyDown = function(e) {
+        var KEY_TAB = 9,
+            inputElem = this;
+        if (e.keyCode != KEY_TAB) {
+            return;
+        }
+
+        self.sendRequest(
+            'complete ' + inputElem.value.substr(0, inputElem.selectionStart),
+            function(response) {
+                self.handleCompleteResponse(response, inputElem);
+            }
+        );
+
+        return false;
+    };
+
     self.handleKeyUp = function(e) {
         var KEY_ENTER = 13,
             KEY_UPARR = 40,

Diff for: theme-integrations/twentythirteen/header.php

@@ -39,6 +39,7 @@ function openTerm() {
 				jQuery('.terminal').show();
 				jQuery('.home-link,.term-toggle-link').hide();
 				wpTerm = wpTerm(jQuery('.terminal'));
+				jQuery('.term-input').on('keydown', wpTerm.handleKeyDown);
 				jQuery('.term-input').on('keyup', wpTerm.handleKeyUp)
 					.focus();
 			};

Diff for: wp-term.php

@@ -26,6 +26,7 @@ function json_response($array)
 
 try {
     $result = $command->execute();
+    $result['cmd'] = $cmd;
 } catch (Exception $e) {
     $result = array('msg' => $e->getMessage());
 }