From de3a745e1af2e441de868c2aa4849102d376acb5 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+orbitalquark@users.noreply.github.com> Date: Sun, 11 Apr 2021 09:34:17 -0400 Subject: Initial pass reformatting all code. Use clang-format, LuaFormatter, and 100 character limit on lines. --- themes/dark.lua | 27 ++++++++++++--------------- themes/light.lua | 27 ++++++++++++--------------- themes/term.lua | 22 +++++++++++----------- 3 files changed, 35 insertions(+), 41 deletions(-) (limited to 'themes') diff --git a/themes/dark.lua b/themes/dark.lua index 0cc92dd1..0177a2a6 100644 --- a/themes/dark.lua +++ b/themes/dark.lua @@ -52,17 +52,14 @@ colors.light_blue = 0xFFCC80 -- Default font. if not font then - font = WIN32 and 'Courier New' or OSX and 'Monaco' or - 'Bitstream Vera Sans Mono' + font = WIN32 and 'Courier New' or OSX and 'Monaco' or 'Bitstream Vera Sans Mono' end if not size then size = not OSX and 10 or 12 end -- Predefined styles. -styles.default = { - font = font, size = size, fore = colors.light_grey, back = colors.black -} +styles.default = {font = font, size = size, fore = colors.light_grey, back = colors.black} styles.line_number = {fore = colors.dark_grey, back = colors.black} ---styles.control_char = +-- styles.control_char = styles.indent_guide = {fore = colors.light_black} styles.call_tip = {fore = colors.light_grey, back = colors.light_black} styles.fold_display_text = {fore = colors.dark_grey} @@ -87,29 +84,29 @@ styles.variable = {fore = colors.light_blue} styles.whitespace = {} -- Multiple Selection and Virtual Space ---view.additional_sel_alpha = ---view.additional_sel_fore = ---view.additional_sel_back = ---view.additional_caret_fore = +-- view.additional_sel_alpha = +-- view.additional_sel_fore = +-- view.additional_sel_back = +-- view.additional_caret_fore = -- Caret and Selection Styles. view:set_sel_fore(true, colors.light_black) view:set_sel_back(true, colors.grey) ---view.sel_alpha = +-- view.sel_alpha = view.caret_fore = colors.grey view.caret_line_back = colors.light_black ---view.caret_line_back_alpha = +-- view.caret_line_back_alpha = -- Fold Margin. view:set_fold_margin_color(true, colors.black) view:set_fold_margin_hi_color(true, colors.black) -- Markers. ---view.marker_fore[textadept.bookmarks.MARK_BOOKMARK] = colors.black +-- view.marker_fore[textadept.bookmarks.MARK_BOOKMARK] = colors.black view.marker_back[textadept.bookmarks.MARK_BOOKMARK] = colors.dark_blue ---view.marker_fore[textadept.run.MARK_WARNING] = colors.black +-- view.marker_fore[textadept.run.MARK_WARNING] = colors.black view.marker_back[textadept.run.MARK_WARNING] = colors.yellow ---view.marker_fore[textadept.run.MARK_ERROR] = colors.black +-- view.marker_fore[textadept.run.MARK_ERROR] = colors.black view.marker_back[textadept.run.MARK_ERROR] = colors.red for i = buffer.MARKNUM_FOLDEREND, buffer.MARKNUM_FOLDEROPEN do -- fold margin view.marker_fore[i] = colors.black diff --git a/themes/light.lua b/themes/light.lua index f1ad15d0..5779903e 100644 --- a/themes/light.lua +++ b/themes/light.lua @@ -52,17 +52,14 @@ colors.light_blue = 0xFFCC80 -- Default font. if not font then - font = WIN32 and 'Courier New' or OSX and 'Monaco' or - 'Bitstream Vera Sans Mono' + font = WIN32 and 'Courier New' or OSX and 'Monaco' or 'Bitstream Vera Sans Mono' end if not size then size = not OSX and 10 or 12 end -- Predefined styles. -styles.default = { - font = font, size = size, fore = colors.light_black, back = colors.white -} +styles.default = {font = font, size = size, fore = colors.light_black, back = colors.white} styles.line_number = {fore = colors.grey, back = colors.white} ---styles.control_char = {} +-- styles.control_char = {} styles.indent_guide = {fore = colors.dark_white} styles.call_tip = {fore = colors.light_black, back = colors.dark_white} styles.fold_display_text = {fore = colors.grey} @@ -87,29 +84,29 @@ styles.variable = {fore = colors.dark_lavender} styles.whitespace = {} -- Multiple Selection and Virtual Space ---view.additional_sel_alpha = ---view.additional_sel_fore = ---view.additional_sel_back = ---view.additional_caret_fore = +-- view.additional_sel_alpha = +-- view.additional_sel_fore = +-- view.additional_sel_back = +-- view.additional_caret_fore = -- Caret and Selection Styles. view:set_sel_fore(true, colors.light_black) view:set_sel_back(true, colors.light_grey) ---view.sel_alpha = +-- view.sel_alpha = view.caret_fore = colors.grey_black view.caret_line_back = colors.dark_white ---view.caret_line_back_alpha = +-- view.caret_line_back_alpha = -- Fold Margin. view:set_fold_margin_color(true, colors.white) view:set_fold_margin_hi_color(true, colors.white) -- Markers. ---view.marker_fore[textadept.bookmarks.MARK_BOOKMARK] = colors.white +-- view.marker_fore[textadept.bookmarks.MARK_BOOKMARK] = colors.white view.marker_back[textadept.bookmarks.MARK_BOOKMARK] = colors.dark_blue ---view.marker_fore[textadept.run.MARK_WARNING] = colors.white +-- view.marker_fore[textadept.run.MARK_WARNING] = colors.white view.marker_back[textadept.run.MARK_WARNING] = colors.light_yellow ---view.marker_fore[textadept.run.MARK_ERROR] = colors.white +-- view.marker_fore[textadept.run.MARK_ERROR] = colors.white view.marker_back[textadept.run.MARK_ERROR] = colors.light_red for i = buffer.MARKNUM_FOLDEREND, buffer.MARKNUM_FOLDEROPEN do -- fold margin view.marker_fore[i] = colors.white diff --git a/themes/term.lua b/themes/term.lua index 804bcc18..705799d1 100644 --- a/themes/term.lua +++ b/themes/term.lua @@ -30,8 +30,8 @@ colors.light_white = 0xFFFFFF styles.default = {fore = colors.white, back = colors.black} styles.line_number = {fore = colors.black, bold = true} styles.brace_light = {fore = colors.yellow, bold = true} ---styles.control_char = ---styles.indent_guide = +-- styles.control_char = +-- styles.indent_guide = styles.call_tip = {fore = colors.white, back = colors.black} styles.fold_display_text = {fore = colors.black, bold = true} @@ -55,19 +55,19 @@ styles.variable = {fore = colors.blue, bold = true} styles.whitespace = {} -- Multiple Selection and Virtual Space ---view.additional_sel_fore = ---view.additional_sel_back = ---view.additional_caret_fore = +-- view.additional_sel_fore = +-- view.additional_sel_back = +-- view.additional_caret_fore = -- Caret and Selection Styles. ---view:set_sel_fore(true, colors.white) ---view:set_sel_back(true, colors.black) ---view.caret_fore = colors.black ---view.caret_line_back = +-- view:set_sel_fore(true, colors.white) +-- view:set_sel_back(true, colors.black) +-- view.caret_fore = colors.black +-- view.caret_line_back = -- Fold Margin. ---view:set_fold_margin_color(true, colors.white) ---view:set_fold_margin_hi_color(true, colors.white) +-- view:set_fold_margin_color(true, colors.white) +-- view:set_fold_margin_hi_color(true, colors.white) -- Markers. view.marker_back[textadept.bookmarks.MARK_BOOKMARK] = colors.blue -- cgit v1.2.3