Autocomplete, fixed segfault, include properties

Author: dantleech

CHANGELOG.md

@@ -4,12 +4,14 @@
 
 - New command: `file:import`: - import files into the repository.
 - `node:list`: Added `--level` option to rescursively show children nodes and properties
+- Autocomplete completes property names in addition to node names in current path
 
 ## Improvements
 
 - `session:export:view`: Added `--pretty` option to `session:export:view` command to output formatted XML.
 - `session:export:view`: Ask confirmation before overwriting file.
 
-## Bug Fixes
+## Bugs
 
 - Aliases: Allow quoted arguments
+- Fixed autocomplete segfault

src/PHPCR/Shell/Console/Application/Shell.php

@@ -103,33 +103,9 @@ private function autocompleter($text)
     {
         $info = readline_info();
         $text = substr($info['line_buffer'], 0, $info['end']);
-
         $list = $this->application->getHelperSet()->get('phpcr')->getSession()->autocomplete($text);
 
         return $list;
-
-        if ($info['point'] !== $info['end']) {
-            return false;
-        }
-
-        // task name?
-        if (false === strpos($text, ' ') || !$text) {
-            return array_keys($this->application->all());
-        }
-
-        // options and arguments?
-        try {
-            $command = $this->application->find(substr($text, 0, strpos($text, ' ')));
-        } catch (\Exception $e) {
-            return false;
-        }
-
-        $list = array('--help');
-        foreach ($command->getDefinition()->getOptions() as $option) {
-            $list[] = '--' . $option->getName();
-        }
-
-        return $list;
     }
 
     /**

src/PHPCR/Shell/PhpcrSession.php

@@ -48,43 +48,18 @@ public function setCwd($cwd)
      */
     public function autocomplete($text)
     {
-        // get last string
-        if (!preg_match('&^(.+) &', $text, $matches)) {
-            return false;
-        }
-
-        $path = $matches[1];
-
-        if (substr($path, 0, 1) == '/') {
-            $parentPath = PathHelper::getParentPath($path);
-            try {
-                $node = $this->getNode($parentPath);
-                $list = array();
-                foreach ($node->getNodes() as $path => $node) {
-                    $list[] = substr($parentPath, 1) . '/' . $path;
-                }
-
-                return $list;
-            } catch (PathNotFoundException $e) {
-                return false;
-            }
-        } else {
-            $cwd = $this->getCwd();
-            try {
-                $node = $this->getNode($cwd);
-                $list = array();
-                foreach ($node->getNodes() as $path => $node) {
-                    if ($this->getCwd() == '/') {
-                        $list[] = $path;
-                    } else {
-                        $list[] = $path;
-                    }
-                }
-
-                return $list;
-            } catch (PathNotFoundException $e) {
-                return false;
+        // return autocompletions for current path
+        $cwd = $this->getCwd();
+        try {
+            $node = $this->getNode($cwd);
+            $list = (array) $node->getNodeNames();
+            foreach ($node->getProperties() as $name => $v) {
+                $list[] = $name;
             }
+
+            return $list;
+        } catch (PathNotFoundException $e) {
+            return false;
         }
     }