itdominator/Newton_Editor
1
0
Fork 0
generated from itdominator/Python-With-Gtk-Template
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed indent issues from new plugin; whoops

Browse Source
This commit is contained in:
itdominator 2023-10-16 00:15:05 -05:00
parent b1a032776e
commit aa1fc0e5a9
2 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
plugins/commentzar/add_comment_mixin.py
View File

@ -7,59 +7,61 @@
class AddCommentMixin: class AddCommentMixin:
def add_comment_characters(self, buffer, start_tag, end_tag, start, end, deselect, oldPos): def add_comment_characters(self, document, start_tag, end_tag, start, end, deselect, oldPos):
smark = buffer.create_mark("start", start, False) smark = document.create_mark("start", start, False)
imark = buffer.create_mark("iter", start, False) imark = document.create_mark("iter", start, False)
emark = buffer.create_mark("end", end, False) emark = document.create_mark("end", end, False)
number_lines = end.get_line() - start.get_line() + 1 number_lines = end.get_line() - start.get_line() + 1
comment_pos_iter = None comment_pos_iter = None
count = 0 count = 0
buffer.begin_user_action() document.begin_user_action()
for i in range(0, number_lines): for i in range(0, number_lines):
iter = buffer.get_iter_at_mark(imark) iter = document.get_iter_at_mark(imark)
if not comment_pos_iter: if not comment_pos_iter:
(comment_pos_iter, count) = self.discard_white_spaces(iter) (comment_pos_iter, count) = self.discard_white_spaces(iter)
if self.is_commented(comment_pos_iter, start_tag):
new_code = self.remove_comment_characters(buffer, start_tag, end_tag, start, end)
return
else:
comment_pos_iter = iter
for i in range(count):
c = iter.get_char()
if not c in (" ", "\t"):
break
iter.forward_char()
buffer.insert(comment_pos_iter, start_tag) if self.is_commented(comment_pos_iter, start_tag):
buffer.insert(comment_pos_iter, " ") new_code = self.remove_comment_characters(document, start_tag, end_tag, start, end)
return
else:
comment_pos_iter = iter
for i in range(count):
c = iter.get_char()
if not c in (" ", "\t"):
break
iter.forward_char()
document.insert(comment_pos_iter, start_tag)
document.insert(comment_pos_iter, " ")
if end_tag: if end_tag:
if i != number_lines -1: if i != number_lines -1:
iter = buffer.get_iter_at_mark(imark) iter = document.get_iter_at_mark(imark)
iter.forward_to_line_end() iter.forward_to_line_end()
buffer.insert(iter, end_tag) document.insert(iter, end_tag)
else: else:
iter = buffer.get_iter_at_mark(emark) iter = document.get_iter_at_mark(emark)
buffer.insert(iter, end_tag) document.insert(iter, end_tag)
iter = buffer.get_iter_at_mark(imark) iter = document.get_iter_at_mark(imark)
iter.forward_line() iter.forward_line()
buffer.delete_mark(imark) document.delete_mark(imark)
imark = buffer.create_mark("iter", iter, True) imark = document.create_mark("iter", iter, True)
buffer.end_user_action() document.end_user_action()
buffer.delete_mark(imark) document.delete_mark(imark)
new_start = buffer.get_iter_at_mark(smark) new_start = document.get_iter_at_mark(smark)
new_end = buffer.get_iter_at_mark(emark) new_end = document.get_iter_at_mark(emark)
buffer.select_range(new_start, new_end) document.select_range(new_start, new_end)
buffer.delete_mark(smark) document.delete_mark(smark)
buffer.delete_mark(emark) document.delete_mark(emark)
if deselect: if deselect:
oldPosIter = buffer.get_iter_at_offset(oldPos + 2) oldPosIter = document.get_iter_at_offset(oldPos + 2)
buffer.place_cursor(oldPosIter) document.place_cursor(oldPosIter)

12
plugins/commentzar/codecomment_tags.py
View File

@ -7,14 +7,14 @@
class CodeCommentTags: class CodeCommentTags:
def get_comment_tags(self, lang): def get_comment_tags(self, lang):
(s, e) = self.get_line_comment_tags(lang) (s, e) = self.get_line_comment_tags(lang)
if (s, e) == (None, None): if (s, e) == (None, None):
(s, e) = self.get_block_comment_tags(lang) (s, e) = self.get_block_comment_tags(lang)
return (s, e) return (s, e)
def get_block_comment_tags(self, lang): def get_block_comment_tags(self, lang):
start_tag = lang.get_metadata('block-comment-start') start_tag = lang.get_metadata('block-comment-start')
end_tag = lang.get_metadata('block-comment-end') end_tag = lang.get_metadata('block-comment-end')
if start_tag and end_tag: if start_tag and end_tag: