src/Support/Scripts/balance.py @@ -165,7 +165,7 @@ def entities_to_hex(text, wrap): return re.sub(r'&(#x?)?([0-9]+|[0-9a-fA-F]+);', wrap_hex, text) def trim(context, text, lines=True, sides='both', respect_indent=False, - preserve_linebreaks=True): + preserve_linebreaks=True): ''' Trims whitespace from the text @@ -353,7 +353,7 @@ def get_word(context, range, alpha_numeric=True, extra_characters='_-', ''' # Helper regex for determining if line ends with a tag # Includes checks for ASP/PHP/JSP/ColdFusion closing delimiters - re_tag = re.compile(r'(<\/?[\w:\-]+[^>]*|\s*(\?|%|-{2,3}))>$') + re_tag = re.compile(r'(<\/?[\w:-]+[^>]*|\s*(/|\?|%|-{2,3}))>$') def test_word(): # Mini-function to cut down on code bloat @@ -482,6 +482,49 @@ def select_from_zones(context, range=None, default=None, **syntaxes): # If we reach this point, there's no match return default +def range_in_zone(context, range, selector): + ''' + Tests the location of the range to see if it matches the provided + zone selector string + ''' + target = SXSelectorGroup.selectorGroupWithString_(selector) + if context.string().length() == range.location: + zone = context.syntaxTree().rootZone() + else: + zone = context.syntaxTree().rootZone().zoneAtCharacterIndex_( + range.location + ) + return target.matches_(zone) + +def cursor_in_zone(context, selector): + ''' + Tests the location of the range to see if it matches the provided + zone selector string + ''' + ranges = get_ranges(context) + return range_in_zone(context, ranges[0], selector) + +# =============================================================== +# Itemizer methods +# =============================================================== + +def get_item_for_range(context, range): + '''Returns the smallest item containing the given range''' + return context.itemizer().smallestItemContainingCharacterRange_(range) + +def get_item_parent_for_range(context, range): + '''Returns the parent of the item containing the given range''' + item = get_item_for_range(context, range) + if item is None: + return None + new_range = item.range() + # Select the parent if the range is the same + while(item.parent() and (new_range.location == range.location and \ + new_range.length == range.length)): + item = item.parent() + new_range = item.range() + return item + # =============================================================== # Snippet methods # =============================================================== src/Support/Library/tea_actions.py @@ -28,6 +28,30 @@ </setup> </action> + <action id="com.onecrayon.TextActions.Balance" category="actions.text.generic/actions.text.selection/tea.balance"> + <class>TEAforEspresso</class> + <title>Balance</title> + <key-equivalent>control b</key-equivalent> + <setup> + <action>balance</action> + </setup> + </action> + + <action id="com.onecrayon.TextActions.BalanceIn" category="actions.text.generic/actions.text.selection/tea.balance"> + <class>TEAforEspresso</class> + <title>Balance Inward</title> + <key-equivalent>control B</key-equivalent> + <setup> + <action>balance</action> + <options> + <dict> + <key>direction</key> + <string>in</string> + </dict> + </options> + </setup> + </action> + <action id="com.onecrayon.TextActions.SelectWord" category="actions.text.generic/actions.text.selection/1"> <class>TEAforEspresso</class> <title>Word</title> @@ -209,6 +233,24 @@ </setup> </action> + <action id="com.onecrayon.TextActions.InsertText.Tab" category="actions.text.formatting/tea.insertion"> + <class>TEAforEspresso</class> + <title>Insert Tab In Tab Stop</title> + <key-equivalent>option tab</key-equivalent> + <setup> + <action>insert_text</action> + <options> + <dict> + <key>default</key> + <string> $TOUCH</string> + + <key>undo_name</key> + <string>Insert Tab</string> + </dict> + </options> + </setup> + </action> + <action id="com.onecrayon.TextActions.FormatText.Em" category="actions.text.formatting"> <class>TEAforEspresso</class> <title>Emphasize</title> @@ -320,7 +362,7 @@ </setup> </action> - <action id="com.onecrayon.TextActions.InsertSnippet.HTMLtag" category="actions.text.HTML/tea.insertion"> + <!--<action id="com.onecrayon.TextActions.InsertSnippet.HTMLtag" category="actions.text.HTML/tea.insertion"> <class>TEAforEspresso</class> <title>Insert Tag</title> <key-equivalent>control W</key-equivalent> @@ -334,7 +376,7 @@ </dict> </options> </setup> - </action> + </action>--> <action id="com.onecrayon.TextActions.WrapInSnippet.tag" category="actions.text.HTML/tea.wrapping"> <class>TEAforEspresso</class> @@ -342,7 +384,7 @@ <key-equivalent>control W</key-equivalent> <setup> <action>selections_to_snippets</action> - <selection-context>one</selection-context> + <!-- <selection-context>one</selection-context> --> <options> <dict> <key>first_snippet</key> @@ -358,7 +400,7 @@ <key-equivalent>cmd control W</key-equivalent> <setup> <action>selected_lines_to_snippets</action> - <selection-context>one</selection-context> + <!-- <selection-context>one</selection-context> --> <options> <dict> <key>first_snippet</key> @@ -383,7 +425,7 @@ <key-equivalent>control L</key-equivalent> <setup> <action>insert_url_snippet</action> - <selection-context>one</selection-context> + <!-- <selection-context>one</selection-context> --> <options> <dict> <key>default</key> src/TextActions/Actions.xml @@ -26,6 +26,7 @@ </category> <!-- TEA-specific categories --> + <category id="tea.balance" show="inline separated"></category> <category id="tea.conversion" show="inline separated"></category> <category id="tea.insertion" show="inline separated"></category> <category id="tea.wrapping" show="inline separated"></category> src/TextActions/Categories.xml 7a26b21db4d93932af7f59275563c7c0e3c2a8bb f9a01f211a4825805c185c2470382290f7f240d3 Ian Beck ian@onecrayon.com http://github.com/onecrayon/tea-for-espresso/commit/b94c9648ec7c947c9e7881eb38af95cb9e7a9f5e b94c9648ec7c947c9e7881eb38af95cb9e7a9f5e 2009-10-26T07:54:02-07:00 2009-10-26T07:54:02-07:00 Merged in 1.0.2 updates to 1.1 branch 90c44ca67b354e1998739fdf51ce5f6564099735 Ian Beck ian@onecrayon.com