CR feedback

Author: zhengbli

TypeScript.py

@@ -5,13 +5,13 @@
 if sys.version_info < (3, 0):
     from libs import *
     from libs.reference import *
-    from libs.viewhelpers import *
+    from libs.view_helpers import *
     from listeners import *
     from commands import *
 else:
     from .libs import *
     from .libs.reference import *
-    from .libs.viewhelpers import *
+    from .libs.view_helpers import *
     from .listeners import *
     from .commands import *
 

commands/__init__.py

@@ -1,17 +1,32 @@
-from .auto_indent_on_enter_between_curly_braces import TypescriptAutoIndentOnEnterBetweenCurlyBrackets
 from .error_info import TypescriptErrorInfo
-from .format import TypescriptFormatBrackets, TypescriptFormatDocument, TypescriptFormatLine, TypescriptFormatOnKey, \
-    TypescriptFormatSelection, TypescriptPasteAndFormat
 from .go_to_definition import TypescriptGoToDefinitionCommand
 from .go_to_type import TypescriptGoToTypeCommand
 from .nav_to import TypescriptNavToCommand
 from .quick_info import TypescriptQuickInfo, TypescriptQuickInfoDoc
-from .references import TypescriptFindReferencesCommand, TypescriptGoToRefCommand, TypescriptNextRefCommand, \
-    TypescriptPopulateRefs, TypescriptPrevRefCommand
-from .rename import TypescriptDelayedRenameFile, TypescriptFinishRenameCommand, TypescriptRenameCommand
 from .save import TypescriptSave
 from .show_doc import TypescriptShowDoc
 from .signature import TypescriptSignaturePanel, TypescriptSignaturePopup
+from .format import (
+    TypescriptFormatBrackets,
+    TypescriptFormatDocument,
+    TypescriptFormatLine,
+    TypescriptFormatOnKey,
+    TypescriptFormatSelection,
+    TypescriptPasteAndFormat,
+    TypescriptAutoIndentOnEnterBetweenCurlyBrackets
+)
+from .references import (
+    TypescriptFindReferencesCommand,
+    TypescriptGoToRefCommand,
+    TypescriptNextRefCommand,
+    TypescriptPopulateRefs,
+    TypescriptPrevRefCommand
+)
+from .rename import (
+    TypescriptDelayedRenameFile,
+    TypescriptFinishRenameCommand,
+    TypescriptRenameCommand
+)
 
 __all__ = [
     "TypescriptAutoIndentOnEnterBetweenCurlyBrackets",
@@ -40,4 +55,4 @@
     "TypescriptShowDoc",
     "TypescriptSignaturePanel",
     "TypescriptSignaturePopup"
-]
+]

commands/auto_indent_on_enter_between_curly_braces.py

@@ -1,5 +1,5 @@
 import sublime_plugin
-from ..libs.viewhelpers import is_typescript, active_view
+from ..libs.view_helpers import is_typescript, active_view
 
 
 class TypeScriptBaseTextCommand(sublime_plugin.TextCommand):

commands/base_command.py

@@ -1,6 +1,6 @@
 import sublime_plugin
 
-from ..libs.viewhelpers import cli
+from ..libs.view_helpers import cli
 from .base_command import TypeScriptBaseTextCommand
 
 

commands/error_info.py

@@ -1,4 +1,4 @@
-from ..libs.viewhelpers import *
+from ..libs.view_helpers import *
 from .base_command import TypeScriptBaseTextCommand
 
 
@@ -84,4 +84,27 @@ def run(self, text):
         for rb, ra in zip(regions_before_paste, regions_after_paste):
             line_start = view.line(rb.begin()).begin()
             line_end = view.line(ra.begin()).end()
-            format_range(text, view, line_start, line_end)
+            format_range(text, view, line_start, line_end)
+
+
+class TypescriptAutoIndentOnEnterBetweenCurlyBrackets(TypeScriptBaseTextCommand):
+    """
+    Handle the case of hitting enter between {} to auto indent and format
+    """
+
+    def run(self, text):
+        view = self.view
+        view.run_command('typescript_format_on_key', {"key": "\n"})
+        loc = view.sel()[0].begin()
+        row, offset = view.rowcol(loc)
+        tab_size = view.settings().get('tab_size')
+        brace_offset = offset
+        ws = ""
+        for i in range(tab_size):
+            ws += ' '
+        ws += "\n"
+        for i in range(brace_offset):
+            ws += ' '
+        # insert the whitespace
+        insert_text(view, text, loc, ws)
+        set_caret_pos(view, loc + tab_size)

commands/format.py

@@ -1,4 +1,4 @@
-from ..libs.viewhelpers import *
+from ..libs.view_helpers import *
 from ..libs.reference import *
 from .base_command import TypeScriptBaseTextCommand
 

commands/go_to_definition.py

@@ -1,4 +1,4 @@
-from ..libs.viewhelpers import *
+from ..libs.view_helpers import *
 from ..libs.reference import *
 from .base_command import TypeScriptBaseTextCommand
 

commands/go_to_type.py

@@ -1,5 +1,5 @@
 from ..libs import *
-from ..libs.viewhelpers import *
+from ..libs.view_helpers import *
 from ..libs.reference import *
 from .base_command import TypeScriptBaseWindowCommand
 

commands/nav_to.py

@@ -1,5 +1,5 @@
-from ..libs.viewhelpers import *
-from ..libs.texthelpers import escape_html
+from ..libs.view_helpers import *
+from ..libs.text_helpers import escape_html
 from .base_command import TypeScriptBaseTextCommand