@@ -510,15 +510,15 @@ def cursor_in_zone(context, selector): def get_item_for_range(context, range): '''Returns the smallest item containing the given range''' - return context.itemizer().smallestItemContainingCharacterRange_() + return context.itemizer().smallestItemContainingCharacterRange_(range) def get_item_parent_for_range(context, range): '''Returns the parent of the item containing the given range''' - item = tea.get_item_from_range(context, range) + item = get_item_for_range(context, range) 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): + new_range.length == range.length)): item = item.parent() new_range = item.range() return item src/Contents/Resources/tea_actions.py @@ -5,14 +5,18 @@ their contents. If direction == 'in', balance will attempt to move inward (select first balanced delimiters contained within the current delimiter) rather than outward. + +Setting force_itemizers to True will use itemizers even in HTML documents. ''' +from Foundation import NSValue + import tea_actions as tea from zencoding import html_matcher as html_matcher -def act(context, direction='out'): - if tea.cursor_in_zone(context, "html, html *, xml, xml *"): +def act(context, direction='out', force_itemizers=False): + if tea.cursor_in_zone(context, "html, html *, xml, xml *") and not force_itemizers: # HTML or XML, so use Zen-coding's excellent balancing commands # Using this method rather than tea.get_single_range() is better @@ -62,9 +66,19 @@ def act(context, direction='out'): targets = [] for range in ranges: if direction.lower() == 'in': - targets[] = tea.get_item_for_range(context, range).range() + item = tea.get_item_for_range(context, range) + if item is None: + # No item, so jump to next iteration + continue + new_range = item.range() + if new_range.location == range.location and \ + new_range.length == range.length: + items = item.childItems() + if len(items) > 0: + new_range = items[0].range() + targets.append(new_range) else: - targets[] = tea.get_item_parent_for_range(context, range).range() + targets.append(tea.get_item_parent_for_range(context, range).range()) # Set the selections, and return context.setSelectedRanges_([NSValue.valueWithRange_(range) for range in targets]) src/Support/Scripts/balance.py @@ -2,30 +2,6 @@ <action-recipes> <!-- Commands are in menu order, because that's how I roll --> - <action id="com.onecrayon.TextActions.Balance" category="actions.text.generic"> - <class>TEAforEspresso</class> - <title>Balance</title> - <key-equivalent>cmd d</key-equivalent> - <setup> - <action>balance</action> - </setup> - </action> - - <action id="com.onecrayon.TextActions.BalanceIn" category="actions.text.generic"> - <class>TEAforEspresso</class> - <title>Balance Inward</title> - <key-equivalent>cmd D</key-equivalent> - <setup> - <action>balance</action> - <options> - <dict> - <key>direction</key> - <string>in</string> - </dict> - </options> - </setup> - </action> - <action id="com.onecrayon.TextActions.TrimLines" category="actions.text.generic/actions.text.whitespace"> <class>TEAforEspresso</class> <title>Trim Line(s)</title> @@ -52,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> 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 8a24b1c32ff74647da8b1a8b963dc8f1964ec6cb Ian Beck ian@onecrayon.com http://github.com/onecrayon/tea-for-espresso/commit/24a2c8910758b260cbf994ea2a98c9f3be7fb04c 24a2c8910758b260cbf994ea2a98c9f3be7fb04c 2009-10-24T22:45:01-07:00 2009-10-24T22:45:01-07:00 Debugged problems with balancing and itemizer utilities; changed layout of balance actions in menu 548a8829391132d940dab066b61b55706569e3a6 Ian Beck ian@onecrayon.com