Added small detection for docstring closings

Updated README to reflect this change
Normalized completions and generated snippets

Author: adambullmer

DocblockrPython.py

@@ -95,6 +95,26 @@ def counter():
         count += 1
         yield count
 
+def read_next_line(view, position, reverse=False):
+    """
+    |||
+    """
+    current_line = view.line(position)
+    modifier = 1
+    if reverse is True:
+        modifier = -1
+
+    while True:
+        next_line = current_line.end() + modifier
+
+        # Ensure within bounds of the view
+        if not (next_line < view.size() and next_line > 0):
+            return False
+
+        current_line = view.line(next_line)
+
+        yield current_line
+
 class DocblockrPythonCommand(sublime_plugin.TextCommand):
     """
     |||
@@ -113,6 +133,12 @@ def run(self, edit):
         |||
         """
         self.initialize(self.view)
+
+        # If this docstring is already closed, then generate a new line
+        if self.parser.is_docstring_closed(self.view, self.view.sel()[0].end()) is True:
+            write(self.view, '\n')
+            return
+
         self.view.erase(edit, self.trailing_rgn)
 
         output = self.parser.parse(self.line, self.contents)
@@ -159,13 +185,15 @@ def create_snippet(self, parsed_attributes):
             if attribute_type is 'arguments':
                 snippet += 'Arguments:\n'
                 for attribute in attributes:
-                    snippet += '\t@arg ' + attribute
+                    snippet += '\t' + attribute
+                    snippet += ' {${' + str(next(tab_index)) + ':[type]}} --'
                     snippet += ' ${' + str(next(tab_index)) + ':[description]}\n'
             elif attribute_type is 'keyword_arguments':
                 snippet += 'Keyword Arguments:\n'
                 for attribute in attributes:
-                    snippet += '\t@kwarg ' + attribute
-                    snippet += '${' + str(next(tab_index)) + ':[description]}'
+                    snippet += '\t' + attribute
+                    snippet += ' {${' + str(next(tab_index)) + ':[type]}} --'
+                    snippet += ' ${' + str(next(tab_index)) + ':[description]}'
                     snippet += ' (default ${' + str(next(tab_index)) + '})\n'
             elif attribute_type is 'returns':
                 returns_snippet = ''
@@ -306,3 +334,43 @@ def parse_function(cls, line, contents):
         parsed_function['returns'] = {}
 
         return parsed_function
+
+    def is_docstring_closed(self, view, position):
+        """
+        Keep reading lines until we reach the end of the file, class, or function
+        We will assume that if the indentation level is ever lower than present, and no
+        closing docstring has been found yet, the component has ended and needs to be closed
+
+        Arguments:
+            @arg view {sublime.View} Current Sublime Text View
+        """
+        indentation_level = view.indentation_level(position)
+
+        # Check the current line first, and ignore if docstring is closed on this line
+        line = view.substr(view.line(position))
+        match = re.search(r'^\s*""".*"""\s*$', line)
+
+        if match is not None:
+            return False
+
+        for current_line in read_next_line(view, position):
+            # Not an empty line
+            current_line_string = view.substr(current_line).rstrip()
+            if len(current_line_string) is 0:
+                continue
+
+            # Not on a more indented line
+            current_indentation = view.indentation_level(current_line.end())
+            if current_indentation > indentation_level:
+                continue
+
+            # Still within the same indentation level
+            if current_indentation < indentation_level:
+                break
+
+            # Line only contains whitespace and """
+            if re.search(r'^\s*"""', current_line_string) is not None:
+                return True
+
+
+        return False

README.md

@@ -19,13 +19,15 @@ There isn't a key command to start this plugin, it is triggerg by hitting **ente
 
 Known Issues
 ------------
-- Doesn't detect if a docstring is already closed
+- Only detects closed docstring if it is on a line of the same indentation, and has no text in front of it. Single Line docstrings are converted to block
 - Doesn't process module or class variables
 
 Roadmap
 -------
 - Determine / Guess at variable and return value types
 - `Raises` section of documentation
 - `Decorators` section of documentation
-- Better README
 - Extended Python syntax with docstring keyword highlighting
+- Unit Tests!
+- More completions!
+- Better README

python.sublime-completions

@@ -2,8 +2,8 @@
   "scope": "source.python string.quoted.double.block",
   "completions": [
     { "trigger": "@var",     "contents": "@var ${1:[name]} {${2:[type]}} ${3:[description]}" },
-    { "trigger": "@arg",     "contents": "@arg {${1:[type]}} ${2:[description]}" },
-    { "trigger": "@kwarg",   "contents": "${1:[name]} -- ${2:[description]} (default ${3:[default value]})" },
+    { "trigger": "@arg",     "contents": "${1:[name]} {${2:[type]}} -- ${3:[description]}" },
+    { "trigger": "@kwarg",   "contents": "${1:[name]} {${2:[type]}} -- ${3:[description]} (default ${4:[default value]})" },
     { "trigger": "@example", "contents": ">>> ${1:[function name]}(${2:[arguments]})\n${3:[result]}" },
     { "trigger": "@extends", "contents": "@extends {${1:[type]}}" },
     { "trigger": "@returns", "contents": "@returns {${1:[type]}} ${2:[description]}" }