fix broken indentation of the first checkbox of a heading

Author: jceb

ftplugin/orgmode/plugins/EditCheckbox.py

@@ -41,13 +41,11 @@ def new_checkbox(cls, below=None):
 		nc._heading = h
 
 		# default checkbox level
-		level = h.level
+		level = h.level + 1
 		start = vim.current.window.cursor[0] - 1
 		# if no checkbox is found, insert at current line with indent level=1
 		if c is None:
-			if h.checkboxes:
-				level = h.first_checkbox.level
-				h.checkboxes.append(nc)
+			h.checkboxes.append(nc)
 		else:
 			l = c.get_parent_list()
 			idx = c.get_index_in_parent_list()
@@ -94,12 +92,12 @@ def new_checkbox(cls, below=None):
 		vim.current.window.cursor = (start + 1, 0)
 
 		if below:
-			vim.command("normal o")
+			vim.command(u"normal! o")
 		else:
-			vim.command("normal O")
+			vim.command(u"normal! O")
 
-		insert_at_cursor(str(nc))
-		vim.command("call feedkeys('a')")
+		insert_at_cursor(unicode(nc))
+		vim.command(u"call feedkeys('a')")
 
 	@classmethod
 	def toggle(cls, checkbox=None):
@@ -197,7 +195,7 @@ def _update_checkboxes_status(cls, checkbox=None):
 				current_status = None
 			# the checkbox needs to have status
 			else:
-				total +=  1
+				total += 1
 
 			# count number of status in this checkbox level
 			if current_status == Checkbox.STATUS_OFF:

tests/test_plugin_edit_checkbox.py

@@ -54,54 +54,66 @@ def setUp(self):
   2. [ ] another main task
 """.split(u'\n')
 
+		self.c4 = u"""
+* heading
+""".split(u'\n')
+
 	def test_toggle(self):
 		global bufnr
 		bufnr += 1
 		# test on self.c1
 		set_vim_buffer(buf=self.c1, cursor=(6, 0), bufnr=bufnr)
 		# update_checkboxes_status
 		self.editcheckbox.update_checkboxes_status()
-		self.assertEqual(vim.current.buffer[1], "* heading1 [0%]")
+		self.assertEqual(vim.current.buffer[1], u"* heading1 [0%]")
 		# toggle
 		self.editcheckbox.toggle()
-		self.assertEqual(vim.current.buffer[5], "              - [X] checkbox4")
+		self.assertEqual(vim.current.buffer[5], u"              - [X] checkbox4")
 
 		bufnr += 1
 		set_vim_buffer(buf=self.c1, cursor=(9, 0), bufnr=bufnr)
 		# toggle and check checkbox status
 		self.editcheckbox.toggle()
-		self.assertEqual(vim.current.buffer[8], "              - [X] checkbox7")
-		self.assertEqual(vim.current.buffer[7], "        - [-] checkbox6")
-		self.assertEqual(vim.current.buffer[6], "  - [-] checkbox5")
+		self.assertEqual(vim.current.buffer[8], u"              - [X] checkbox7")
+		self.assertEqual(vim.current.buffer[7], u"        - [-] checkbox6")
+		self.assertEqual(vim.current.buffer[6], u"  - [-] checkbox5")
 
 		# new_checkbox
 		vim.current.window.cursor = (10, 0)
 		self.editcheckbox.new_checkbox(below=True)
-		self.assertEqual(vim.current.buffer[10], '              - [ ] ')
+		self.assertEqual(vim.current.buffer[10], u'              - [ ] ')
 		self.editcheckbox.update_checkboxes_status()
 
 	def test_no_status_checkbox(self):
 		global bufnr
 		bufnr += 1
 		# test on self.c2
 		set_vim_buffer(buf=self.c2, bufnr=bufnr)
-		self.assertEqual(vim.current.buffer[2], "  - checkbox [0%]")
+		self.assertEqual(vim.current.buffer[2], u"  - checkbox [0%]")
 		# toggle
 		vim.current.window.cursor = (4, 0)
 		self.editcheckbox.toggle()
-		self.assertEqual(vim.current.buffer[3], "        - [X] test1")
+		self.assertEqual(vim.current.buffer[3], u"        - [X] test1")
 
 		# self.editcheckbox.update_checkboxes_status()
 		# see if the no status checkbox update its status
-		self.assertEqual(vim.current.buffer[2], "  - checkbox [33%]")
+		self.assertEqual(vim.current.buffer[2], u"  - checkbox [33%]")
 
 	def test_number_list(self):
 		global bufnr
 		bufnr += 1
 		set_vim_buffer(buf=self.c3, bufnr=bufnr)
 		vim.current.window.cursor = (6, 0)
 		self.editcheckbox.toggle()
-		self.assertEqual(vim.current.buffer[5], "  2. [X] another main task")
+		self.assertEqual(vim.current.buffer[5], u"  2. [X] another main task")
+
+	def test_new_checkbox(self):
+		global bufnr
+		bufnr += 1
+		set_vim_buffer(buf=self.c4, bufnr=bufnr)
+		vim.current.window.cursor = (3, 1)
+		self.editcheckbox.new_checkbox(below=True)
+		self.assertEqual(vim.current.buffer[2], u"  - [ ] ")
 
 
 def suite():