Merge pull request #200 from zhengbli/issue199

Add "TypeScript Indent" tmPreferences files

Author: zhengbli

TypeScript Indent.YAML-tmPreferences

@@ -0,0 +1,13 @@
+# [PackageDev] target_format: plist, ext: tmPreferences
+---
+name: TypeScript Indent
+uuid: 77966fa8-af34-4f1e-8535-e556d5063853
+scope: source.ts
+settings:
+  bracketIndentNextLinePattern: 
+  >
+    (?x)
+      ^ \s* \b(if|while|else)\b [^;]* $
+      | ^ \s* \b(for)\b .* $
+  decreaseIndentPattern: ^(.*\*/)?\s*\}.*$
+  increaseIndentPattern: ^.*\{[^}"']*$

TypeScript Indent.tmPreferences

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>name</key>
+	<string>TypeScript Indent</string>
+	<key>scope</key>
+	<string>source.ts</string>
+	<key>settings</key>
+	<dict>
+		<key>bracketIndentNextLinePattern</key>
+		<string>(?x)
+  ^ \s* \b(if|while|else)\b [^;]* $
+  | ^ \s* \b(for)\b .* $
+</string>
+		<key>decreaseIndentPattern</key>
+		<string>^(.*\*/)?\s*\}.*$</string>
+		<key>increaseIndentPattern</key>
+		<string>^.*\{[^}"']*$</string>
+	</dict>
+	<key>uuid</key>
+	<string>77966fa8-af34-4f1e-8535-e556d5063853</string>
+</dict>
+</plist>

typescript/commands/format.py

@@ -1,4 +1,5 @@
 from ..libs.view_helpers import *
+from ..libs import log
 from .base_command import TypeScriptBaseTextCommand
 
 
@@ -8,6 +9,8 @@ class TypescriptFormatOnKey(TypeScriptBaseTextCommand):
     in the case of "\n", this is only called when no completion dialogue is visible
     """
     def run(self, text, key="", insert_key=True):
+        log.debug("running TypescriptFormatOnKey")
+
         if 0 == len(key):
             return
         check_update_view(self.view)
@@ -27,19 +30,22 @@ def run(self, text, key="", insert_key=True):
 class TypescriptFormatSelection(TypeScriptBaseTextCommand):
     """Command to format the current selection"""
     def run(self, text):
+        log.debug("running TypescriptFormatSelection")
         r = self.view.sel()[0]
         format_range(text, self.view, r.begin(), r.end())
 
 
 class TypescriptFormatDocument(TypeScriptBaseTextCommand):
     """Command to format the entire buffer"""
     def run(self, text):
+        log.debug("running TypescriptFormatDocument")
         format_range(text, self.view, 0, self.view.size())
 
 
 class TypescriptFormatLine(TypeScriptBaseTextCommand):
     """Command to format the current line"""
     def run(self, text):
+        log.debug("running TypescriptFormatLine")
         line_region = self.view.line(self.view.sel()[0])
         line_text = self.view.substr(line_region)
         if NON_BLANK_LINE_PATTERN.search(line_text):
@@ -53,6 +59,7 @@ def run(self, text):
 
 class TypescriptFormatBrackets(TypeScriptBaseTextCommand):
     def run(self, text):
+        log.debug("running TypescriptFormatBrackets")
         check_update_view(self.view)
         sel = self.view.sel()
         if len(sel) == 1:
@@ -70,6 +77,7 @@ def run(self, text):
 
 class TypescriptPasteAndFormat(TypeScriptBaseTextCommand):
     def run(self, text):
+        log.debug("running TypescriptPasteAndFormat")
         view = self.view
         check_update_view(view)
         regions_before_paste = regions_to_static_regions(view.sel())
@@ -93,6 +101,7 @@ class TypescriptAutoIndentOnEnterBetweenCurlyBrackets(TypeScriptBaseTextCommand)
     """
 
     def run(self, text):
+        log.debug("running TypescriptAutoIndentOnEnterBetweenCurlyBrackets")
         view = self.view
         view.run_command('typescript_format_on_key', {"key": "\n"})
         loc = view.sel()[0].begin()

typescript/listeners/listeners.py

@@ -84,6 +84,7 @@ def on_modified_with_info(self, view, info):
         EventHub.run_listeners("on_modified_with_info", view, info)
 
     def post_on_modified(self, view):
+        log.debug("post_on_modified")
         EventHub.run_listeners("post_on_modified", view)
 
     def on_selection_modified(self, view):