Merge branch 'promote-demote-correction'

Author: Ron89

ftplugin/orgmode/plugins/EditStructure.py

@@ -129,7 +129,10 @@ def _change_heading_level(cls, level, including_children=True, on_heading=False,
 		:on_heading:			True if promoting/demoting should only happen when the cursor is on the heading
 		:insert_mode:			True if vim is in insert mode
 		"""
-
+		# TODO : current promote and demote works for only headings. Since
+		# 		 checkboxes also have tree structure. We should think of
+		# 		 expanding the functionality of promoting and demoting to
+		# 		 checkboxes as well
 		d = ORGMODE.get_document()
 		current_heading = d.current_heading()
 		if not current_heading or on_heading and current_heading.start_vim != vim.current.window.cursor[0]:
@@ -247,8 +250,7 @@ def indent(heading, ic):
 					d.headings.insert(idx, current_heading, taint=False)
 
 		d.write()
-		if indent_end_vim != current_heading.start_vim:
-			vim.command(u_encode(u'normal %dggV%dgg=' % (current_heading.start_vim, indent_end_vim)))
+
 		# restore cursor position
 		vim.current.window.cursor = (c[0], c[1] + level)
 

tests/test_plugin_edit_structure.py

@@ -254,7 +254,6 @@ def test_new_heading_below_split_heading_title_with_todo(self):
 	def test_demote_heading(self):
 		vim.current.window.cursor = (13, 0)
 		self.assertNotEqual(self.editstructure.demote_heading(), None)
-		self.assertEqual(vim.CMDHISTORY[-1], u_encode(u'normal 13ggV15gg='))
 		self.assertEqual(vim.current.buffer[10], u_encode(u'Text 3'))
 		self.assertEqual(vim.current.buffer[11], u_encode(u''))
 		self.assertEqual(vim.current.buffer[12], u_encode(u'***** Überschrift 1.2.1.falsch'))
@@ -277,7 +276,6 @@ def test_demote_newly_created_level_one_heading(self):
 
 		vim.current.window.cursor = (6, 2)
 		self.assertNotEqual(self.editstructure.demote_heading(), None)
-		self.assertEqual(vim.CMDHISTORY[-1], u_encode(u'normal 6ggV17gg='))
 		self.assertEqual(vim.current.buffer[5], u_encode(u'** '))
 		self.assertEqual(vim.current.buffer[6], u_encode(u'*** Überschrift 1.1'))
 		self.assertEqual(vim.current.buffer[10], u_encode(u'*** Überschrift 1.2'))
@@ -322,7 +320,6 @@ def test_demote_last_heading(self):
 	def test_promote_heading(self):
 		vim.current.window.cursor = (13, 0)
 		self.assertNotEqual(self.editstructure.promote_heading(), None)
-		self.assertEqual(vim.CMDHISTORY[-1], u_encode(u'normal 13ggV15gg='))
 		self.assertEqual(vim.current.buffer[10], u_encode(u'Text 3'))
 		self.assertEqual(vim.current.buffer[11], u_encode(u''))
 		self.assertEqual(vim.current.buffer[12], u_encode(u'*** Überschrift 1.2.1.falsch'))
@@ -342,7 +339,6 @@ def test_promote_level_one_heading(self):
 	def test_demote_parent_heading(self):
 		vim.current.window.cursor = (2, 0)
 		self.assertNotEqual(self.editstructure.demote_heading(), None)
-		self.assertEqual(vim.CMDHISTORY[-1], u_encode(u'normal 2ggV16gg='))
 		self.assertEqual(vim.current.buffer[1], u_encode(u'** Überschrift 1'))
 		self.assertEqual(vim.current.buffer[5], u_encode(u'*** Überschrift 1.1'))
 		self.assertEqual(vim.current.buffer[9], u_encode(u'*** Überschrift 1.2'))
@@ -367,10 +363,6 @@ def test_demote_parent_heading_count(self):
 		vim.current.window.cursor = (2, 0)
 		vim.EVALRESULTS[u"v:count"] = u_encode(u'3')
 		self.assertNotEqual(self.editstructure.demote_heading(), None)
-		self.assertEqual(len(vim.CMDHISTORY), 3)
-		self.assertEqual(vim.CMDHISTORY[-3], u_encode(u'normal 2ggV16gg='))
-		self.assertEqual(vim.CMDHISTORY[-2], u_encode(u'normal 2ggV16gg='))
-		self.assertEqual(vim.CMDHISTORY[-1], u_encode(u'normal 2ggV16gg='))
 		self.assertEqual(vim.current.buffer[1], u_encode(u'**** Überschrift 1'))
 		self.assertEqual(vim.current.buffer[5], u_encode(u'***** Überschrift 1.1'))
 		self.assertEqual(vim.current.buffer[9], u_encode(u'***** Überschrift 1.2'))
@@ -384,10 +376,6 @@ def test_promote_parent_heading(self):
 		vim.current.window.cursor = (13, 0)
 		vim.EVALRESULTS[u"v:count"] = u_encode(u'3')
 		self.assertNotEqual(self.editstructure.promote_heading(), None)
-		self.assertEqual(len(vim.CMDHISTORY), 3)
-		self.assertEqual(vim.CMDHISTORY[-3], u_encode(u'normal 13ggV15gg='))
-		self.assertEqual(vim.CMDHISTORY[-2], u_encode(u'normal 13ggV15gg='))
-		self.assertEqual(vim.CMDHISTORY[-1], u_encode(u'normal 13ggV16gg='))
 		self.assertEqual(vim.current.buffer[5], u_encode(u'** Überschrift 1.1'))
 		self.assertEqual(vim.current.buffer[9], u_encode(u'** Überschrift 1.2'))
 		self.assertEqual(vim.current.buffer[12], u_encode(u'* Überschrift 1.2.1.falsch'))