Fix cursor position in PHP test methods.

@todo fix cursor position for Jasmine tests.
@todo replace string replace with run_command (#10)

README.md

@@ -8,7 +8,7 @@ If the original phrase is inside a dockblock then it updates the method using th
 
 Install
 -----
-Install by downloading the [1.0.1 release zip](https://github.com/testNameGenerator/SublimeText-plugin/releases/download/1.0.1/testNameGenerator.zip) and unpacking it into the \Packages folder (SublimeText Menu \ Preferences \ Browse Packages).
+Install by downloading the [1.0.4 release zip](https://github.com/testNameGenerator/SublimeText-plugin/releases/download/1.0.4/testNameGenerator.zip) and unpacking it into the \Packages folder (SublimeText Menu \ Preferences \ Browse Packages).
 
 Usage
 -----

TestNameGenerator.py

@@ -55,11 +55,12 @@ def run(self, edit):
                     SublimeConnect.insertMethodName(edit, cursorLine, TextHelper.prepareTestBlockPHP(phrase, methodName))
                 else:
                     SublimeConnect.updateMethodNamePHP(edit, cursorLine, methodName, existingMethod)
-
             else:
                 # JS will add a new test method because the text is inside the test method
                 SublimeConnect.insertMethodName(edit, cursorLine, TextHelper.prepareTestBlockJS(phrase))
 
+        SublimeConnect.close()
+
 class TextHelper():
     def patternExistingMethodPHP(lineContents):
         # complete block: return r'\/\*([\*\n\s]+)' + lineContents + '([a-zA-Z0-9\n\s\*@]+)\*\/([\s]+)(public)?(\s)?function(\s)?test([a-zA-Z0-9_]+)(\s\n)?\('
@@ -73,7 +74,7 @@ def patternMethodName():
 
     def prepareTestBlockPHP(phrase, methodName):
         tab = SublimeConnect.getWhitespaceTab()
-        return tab + "/**\n" + tab + " * " + phrase + "\n" + tab + " */\n" + tab + "public function test" + methodName + "()\n" + tab + "{\n\n" + tab + "}\n\n" + tab
+        return tab + "/**\n" + tab + " * " + phrase + "\n" + tab + " */\n" + tab + "public function test" + methodName + "()\n" + tab + "{\n" + tab + tab + "\n" + tab + "}\n" + tab
 
     # will generate Jasmine blocks
     def prepareTestBlockJS(phrase):
@@ -82,21 +83,46 @@ def prepareTestBlockJS(phrase):
 
         if (examineNameTypeParts[0].lower() == "describe"):
             phrase = " ".join(examineNameTypeParts.pop(0)) # remove the "describe" prefix
-            return self.getJasmineDescribeBlock(phrase, tab)
+            return TextHelper.getJasmineDescribeBlock(phrase, tab)
 
         else:
-            return self.getJasmineItBlock(phrase, tab)
+            return TextHelper.getJasmineItBlock(phrase, tab)
 
     def getJasmineDescribeBlock(phrase, tab):
         return tab + "describe('" +  phrase + "', function () {\n\n" + tab + "});\n\n" + tab
 
     def getJasmineItBlock(phrase, tab):
-        return tab + tab + "it('" + phrase + "', function () {\n\n" + tab + "" + tab + "});\n\n" + tab
+        return tab + tab + "it('" + phrase + "', function () {\n" + tab + tab + tab + "\n" + tab + "" + tab + "});\n\n" + tab
 
 # connector to the sublime api
 class SublimeConnect():
     context = False
 
+    @classmethod
+    def close(self):
+        view = self.context.view
+        queueMoveCursors = []
+        deltaCol = 1 if self.getWhitespaceTab() == "\t" else 4
+
+        for cursor in view.sel():
+            target = view.text_point(self.getCursorRow(cursor) - 2, self.getCursorCol(cursor) + deltaCol)
+            queueMoveCursors.append(sublime.Region(target))
+            pass
+
+        view.sel().clear()
+
+        for cursor in queueMoveCursors:
+            view.sel().add(cursor)
+            pass
+
+    @classmethod
+    def getCursorRow(self, cursor):
+        return self.context.view.rowcol(cursor.begin())[0]
+
+    @classmethod
+    def getCursorCol(self, cursor):
+        return self.context.view.rowcol(cursor.begin())[1]
+
     @classmethod
     def find_all(self, a_str, sub):
         start = 0

package-metadata.json

@@ -1 +1 @@
-{"description": "PHP-PHPUnit / JS-Jasmine Syntax: Will convert plain text task/message into a test method, using the plain text as a comment for readability.", "version": "1.0.3", "url": "https://github.com/testNameGenerator/SublimeText-plugin"}
+{"description": "PHP-PHPUnit / JS-Jasmine Syntax: Will convert plain text task/message into a test method, using the plain text as a comment for readability.", "version": "1.0.4", "url": "https://github.com/testNameGenerator/SublimeText-plugin"}