Merge commit '481b52767988253ac67bb6c65be9f08e2977cd73' into v0.4

Author: jceb

Diff for: ftplugin/liborgmode.py

@@ -3,8 +3,10 @@
 import re
 from UserList import UserList
 
-DIRECTION_FORWARD  = True
-DIRECTION_BACKWARD = False
+class Direction():
+    FORWARD = 1
+    BACKWARD = 2
+
 
 def flatten_list(l):
 	res = []
@@ -1028,13 +1030,13 @@ def all_headings(self):
 			h = h.next_heading
 		raise StopIteration()
 
-	def find_heading(self, position=0, direction=DIRECTION_FORWARD, \
+	def find_heading(self, position=0, direction=Direction.FORWARD, \
 			heading=Heading, connect_with_document=True):
 		u""" Find heading in the given direction
 
-		:postition:	starting line, counting from 0 (in vim you start counting from 1, don't forget)
-		:direction:	downwards == DIRECTION_FORWARD, upwards == DIRECTION_BACKWARD
-		:heading:	Heading class from which new heading objects will be instanciated
+		:postition: starting line, counting from 0 (in vim you start counting from 1, don't forget)
+		:direction: downwards == Direction.FORWARD, upwards == Direction.BACKWARD
+		:heading:   Heading class from which new heading objects will be instanciated
 		:connect_with_document:	if True, the newly created heading will be connected with the document, otherwise not
 
 		:returns:	New heading object or None
@@ -1049,7 +1051,7 @@ def find_heading(self, position=0, direction=DIRECTION_FORWARD, \
 		end = None
 
 		# Search heading upwards
-		if direction == DIRECTION_FORWARD:
+		if direction == Direction.FORWARD:
 			while tmp_line < len_cb:
 				if heading.identify_heading(self._content[tmp_line]) is not None:
 					if start is None:

Diff for: ftplugin/orgmode/__init__.py

@@ -13,7 +13,8 @@
 from orgmode.document   import VimBuffer
 from orgmode.exceptions import PluginError
 
-from liborgmode import DIRECTION_FORWARD, DIRECTION_BACKWARD
+from liborgmode import Direction
+
 
 REPEAT_EXISTS = bool(int(vim.eval('exists("*repeat#set()")')))
 TAGSPROPERTIES_EXISTS = False

Diff for: ftplugin/orgmode/document.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from exceptions import BufferNotFound, BufferNotInSync
-from liborgmode import Document, Heading, MultiPurposeList, DIRECTION_BACKWARD
+from liborgmode import Document, Heading, MultiPurposeList, Direction
 import settings
 import vim
 from UserList import UserList
@@ -304,7 +304,7 @@ def write_heading(self, heading, including_children=True):
 			# Retrieve a potentially dirty document
 			d = ORGMODE.get_document(allow_dirty=True)
 			# Don't rely on the DOM, retrieve the heading afresh
-			h = d.find_heading(direction=DIRECTION_FORWARD, position=100)
+			h = d.find_heading(direction=Direction.FORWARD, position=100)
 			# Update tags
 			h.tags = ['tag1', 'tag2']
 			# Write the heading
@@ -380,5 +380,5 @@ def find_current_heading(self, position=None, heading=Heading):
 		"""
 		return self.find_heading(vim.current.window.cursor[0] - 1 \
 				if position is None else position, \
-				direction=DIRECTION_BACKWARD, heading=heading, \
+				direction=Direction.BACKWARD, heading=heading, \
 				connect_with_document=False)

Diff for: ftplugin/orgmode/plugins/EditStructure.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from orgmode import ORGMODE, apply_count, repeat, realign_tags, DIRECTION_FORWARD, DIRECTION_BACKWARD
+from orgmode import ORGMODE, apply_count, repeat, realign_tags
+from orgmode import Direction
 from orgmode.menu import Submenu, Separator, ActionEntry
 from orgmode.keybinding import Keybinding, Plug, MODE_INSERT, MODE_NORMAL
 from liborgmode import Heading
@@ -258,16 +259,16 @@ def promote_heading(cls, including_children=True, on_heading=False, insert_mode=
 			return u'OrgPromoteHeadingNormal'
 
 	@classmethod
-	def _move_heading(cls, direction=DIRECTION_FORWARD, including_children=True):
+	def _move_heading(cls, direction=Direction.FORWARD, including_children=True):
 		u""" Move heading up or down
 
 		:returns: heading or None
 		"""
 		d = ORGMODE.get_document()
 		heading = d.current_heading()
 		if (not heading) or \
-				(direction == DIRECTION_FORWARD and not heading.next_sibling) or \
-				(direction == DIRECTION_BACKWARD and not heading.previous_sibling):
+				(direction == Direction.FORWARD and not heading.next_sibling) or \
+				(direction == Direction.BACKWARD and not heading.previous_sibling):
 			return None
 
 		cursor_offset_within_the_heading_vim = vim.current.window.cursor[0] - (heading._orig_start + 1)
@@ -276,7 +277,7 @@ def _move_heading(cls, direction=DIRECTION_FORWARD, including_children=True):
 			heading.previous_sibling.children.extend(heading.children)
 			del heading.children
 
-		heading_insert_position = 0 if direction == DIRECTION_FORWARD else -1
+		heading_insert_position = 0 if direction == Direction.FORWARD else -1
 		l = heading.get_parent_list()
 		idx = heading.get_index_in_parent_list()
 		del l[idx]
@@ -295,14 +296,14 @@ def _move_heading(cls, direction=DIRECTION_FORWARD, including_children=True):
 	@repeat
 	@apply_count
 	def move_heading_upward(cls, including_children=True):
-		if cls._move_heading(direction=DIRECTION_BACKWARD, including_children=including_children):
+		if cls._move_heading(direction=Direction.BACKWARD, including_children=including_children):
 			return u'OrgMoveHeadingUpward'
 
 	@classmethod
 	@repeat
 	@apply_count
 	def move_heading_downward(cls, including_children=True):
-		if cls._move_heading(direction=DIRECTION_FORWARD, including_children=including_children):
+		if cls._move_heading(direction=Direction.FORWARD, including_children=including_children):
 			return u'OrgMoveHeadingDownward'
 
 	def register(self):

Diff for: ftplugin/orgmode/plugins/Navigator.py

@@ -3,7 +3,7 @@
 from orgmode import echo, ORGMODE, apply_count
 from orgmode.menu import Submenu, ActionEntry
 from orgmode.keybinding import Keybinding, MODE_VISUAL, MODE_OPERATOR, Plug
-from liborgmode import DIRECTION_FORWARD, DIRECTION_BACKWARD
+from liborgmode import Direction
 
 import vim
 
@@ -41,7 +41,7 @@ def parent(cls, mode):
 		p = heading.parent
 
 		if mode == u'visual':
-			cls._change_visual_selection(heading, p, direction=DIRECTION_BACKWARD, parent=True)
+			cls._change_visual_selection(heading, p, direction=Direction.BACKWARD, parent=True)
 		else:
 			vim.current.window.cursor = (p.start_vim, p.level + 1)
 		return p
@@ -72,15 +72,15 @@ def parent_next_sibling(cls, mode):
 		ns = heading.parent.next_sibling
 
 		if mode == u'visual':
-			cls._change_visual_selection(heading, ns, direction=DIRECTION_FORWARD, parent=False)
+			cls._change_visual_selection(heading, ns, direction=Direction.FORWARD, parent=False)
 		elif mode == u'operator':
 			vim.current.window.cursor = (ns.start_vim, 0)
 		else:
 			vim.current.window.cursor = (ns.start_vim, ns.level + 1)
 		return ns
 
 	@classmethod
-	def _change_visual_selection(cls, current_heading, heading, direction=DIRECTION_FORWARD, noheadingfound=False, parent=False):
+	def _change_visual_selection(cls, current_heading, heading, direction=Direction.FORWARD, noheadingfound=False, parent=False):
 		current = vim.current.window.cursor[0]
 		line_start, col_start = [ int(i) for i in vim.eval(u'getpos("\'<")'.encode(u'utf-8'))[1:3] ]
 		line_end, col_end = [ int(i) for i in vim.eval(u'getpos("\'>")'.encode(u'utf-8'))[1:3] ]
@@ -92,7 +92,7 @@ def _change_visual_selection(cls, current_heading, heading, direction=DIRECTION_
 		# << |visual start
 		# selection end >>
 		if current == line_start:
-			if (direction == DIRECTION_FORWARD and line_end < f_start) or noheadingfound and not direction == DIRECTION_BACKWARD:
+			if (direction == Direction.FORWARD and line_end < f_start) or noheadingfound and not direction == Direction.BACKWARD:
 				swap_cursor = False
 
 			# focus heading HERE
@@ -102,7 +102,7 @@ def _change_visual_selection(cls, current_heading, heading, direction=DIRECTION_
 			# << |visual start
 			# focus heading HERE
 			# selection end >>
-			if f_start < line_start and direction == DIRECTION_BACKWARD:
+			if f_start < line_start and direction == Direction.BACKWARD:
 				if current_heading.start_vim < line_start and not parent:
 					line_start = current_heading.start_vim
 				else:
@@ -115,7 +115,7 @@ def _change_visual_selection(cls, current_heading, heading, direction=DIRECTION_
 			# selection end >>
 			# focus heading HERE
 			else:
-				if direction == DIRECTION_FORWARD:
+				if direction == Direction.FORWARD:
 					if line_end < f_start and not line_start == f_start - 1 and current_heading:
 						# focus end of previous heading instead of beginning of next heading
 						line_start = line_end
@@ -124,7 +124,7 @@ def _change_visual_selection(cls, current_heading, heading, direction=DIRECTION_
 						# focus end of next heading
 						line_start = line_end
 						line_end = f_end
-				elif direction == DIRECTION_BACKWARD:
+				elif direction == Direction.BACKWARD:
 					if line_end < f_end:
 						pass
 				else:
@@ -142,7 +142,7 @@ def _change_visual_selection(cls, current_heading, heading, direction=DIRECTION_
 				swap_cursor = False
 
 			elif (line_start > f_start or \
-					line_start == f_start) and line_end <= f_end and direction == DIRECTION_BACKWARD:
+					line_start == f_start) and line_end <= f_end and direction == Direction.BACKWARD:
 				line_end = line_start
 				line_start = f_start
 
@@ -157,7 +157,7 @@ def _change_visual_selection(cls, current_heading, heading, direction=DIRECTION_
 			# selection end| >>
 			# focus heading HERE
 			else:
-				if direction == DIRECTION_FORWARD:
+				if direction == Direction.FORWARD:
 					if line_end < f_start - 1:
 						# focus end of previous heading instead of beginning of next heading
 						line_end = f_start - 1
@@ -176,7 +176,7 @@ def _change_visual_selection(cls, current_heading, heading, direction=DIRECTION_
 				(line_start, move_col_start, vim.eval(u'visualmode()'.encode(u'utf-8')), line_end, move_col_end, swap)).encode(u'utf-8'))
 
 	@classmethod
-	def _focus_heading(cls, mode, direction=DIRECTION_FORWARD, skip_children=False):
+	def _focus_heading(cls, mode, direction=Direction.FORWARD, skip_children=False):
 		u"""
 		Focus next or previous heading in the given direction
 
@@ -190,7 +190,7 @@ def _focus_heading(cls, mode, direction=DIRECTION_FORWARD, skip_children=False):
 		# FIXME this is just a piece of really ugly and unmaintainable code. It
 		# should be rewritten
 		if not heading:
-			if direction == DIRECTION_FORWARD and d.headings \
+			if direction == Direction.FORWARD and d.headings \
 					and vim.current.window.cursor[0] < d.headings[0].start_vim:
 				# the cursor is in the meta information are, therefore focus
 				# first heading
@@ -202,7 +202,7 @@ def _focus_heading(cls, mode, direction=DIRECTION_FORWARD, skip_children=False):
 				else:
 					echo(u'No heading found')
 				return
-		elif direction == DIRECTION_BACKWARD:
+		elif direction == Direction.BACKWARD:
 			if vim.current.window.cursor[0] != heading.start_vim:
 				# the cursor is in the body of the current heading, therefore
 				# the current heading will be focused
@@ -216,17 +216,17 @@ def _focus_heading(cls, mode, direction=DIRECTION_FORWARD, skip_children=False):
 
 		# so far no heading has been found that the next focus should be on
 		if not focus_heading:
-			if not skip_children and direction == DIRECTION_FORWARD and heading.children:
+			if not skip_children and direction == Direction.FORWARD and heading.children:
 				focus_heading = heading.children[0]
-			elif direction == DIRECTION_FORWARD and heading.next_sibling:
+			elif direction == Direction.FORWARD and heading.next_sibling:
 				focus_heading = heading.next_sibling
-			elif direction == DIRECTION_BACKWARD and heading.previous_sibling:
+			elif direction == Direction.BACKWARD and heading.previous_sibling:
 				focus_heading = heading.previous_sibling
 				if not skip_children:
 					while focus_heading.children:
 						focus_heading = focus_heading.children[-1]
 			else:
-				if direction == DIRECTION_FORWARD:
+				if direction == Direction.FORWARD:
 					focus_heading = current_heading.next_heading
 				else:
 					focus_heading = current_heading.previous_heading
@@ -239,7 +239,7 @@ def _focus_heading(cls, mode, direction=DIRECTION_FORWARD, skip_children=False):
 				focus_heading = heading
 				noheadingfound = True
 			else:
-				if direction == DIRECTION_FORWARD:
+				if direction == Direction.FORWARD:
 					echo(u'Already focussing last heading')
 				else:
 					echo(u'Already focussing first heading')
@@ -248,7 +248,7 @@ def _focus_heading(cls, mode, direction=DIRECTION_FORWARD, skip_children=False):
 		if mode == u'visual':
 			cls._change_visual_selection(current_heading, focus_heading, direction=direction, noheadingfound=noheadingfound)
 		elif mode == u'operator':
-			if direction == DIRECTION_FORWARD and vim.current.window.cursor[0] >= focus_heading.start_vim:
+			if direction == Direction.FORWARD and vim.current.window.cursor[0] >= focus_heading.start_vim:
 				vim.current.window.cursor = (focus_heading.end_vim, len(vim.current.buffer[focus_heading.end].decode(u'utf-8')))
 			else:
 				vim.current.window.cursor = (focus_heading.start_vim, 0)
@@ -264,15 +264,15 @@ def previous(cls, mode, skip_children=False):
 		u"""
 		Focus previous heading
 		"""
-		return cls._focus_heading(mode, direction=DIRECTION_BACKWARD, skip_children=skip_children)
+		return cls._focus_heading(mode, direction=Direction.BACKWARD, skip_children=skip_children)
 
 	@classmethod
 	@apply_count
 	def next(cls, mode, skip_children=False):
 		u"""
 		Focus next heading
 		"""
-		return cls._focus_heading(mode, direction=DIRECTION_FORWARD, skip_children=skip_children)
+		return cls._focus_heading(mode, direction=Direction.FORWARD, skip_children=skip_children)
 
 	def register(self):
 		# normal mode