fix in color style names

in/data/colors/default.lua

@@ -0,0 +1,46 @@
+local style = require "core.style"
+local common = require "core.common"
+
+style.background = { common.color "#2e2e32" }  -- Docview
+style.background2 = { common.color "#252529" } -- Treeview
+style.background3 = { common.color "#252529" } -- Command view
+style.text = { common.color "#97979c" }
+style.caret = { common.color "#93DDFA" }
+style.accent = { common.color "#e1e1e6" }
+-- style.dim - text color for nonactive tabs, tabs divider, prefix in log and
+-- search result, hotkeys for context menu and command view
+style.dim = { common.color "#525257" }
+style.divider = { common.color "#202024" } -- Line between nodes
+style.selection = { common.color "#48484f" }
+style.line_number = { common.color "#525259" }
+style.line_number2 = { common.color "#83838f" } -- With cursor
+style.line_highlight = { common.color "#343438" }
+style.scrollbar = { common.color "#414146" }
+style.scrollbar2 = { common.color "#4b4b52" } -- Hovered
+style.scrollbar_track = { common.color "#252529" }
+style.nagbar = { common.color "#FF0000" }
+style.nagbar_text = { common.color "#FFFFFF" }
+style.nagbar_dim = { common.color "rgba(0, 0, 0, 0.45)" }
+style.drag_overlay = { common.color "rgba(255,255,255,0.1)" }
+style.drag_overlay_tab = { common.color "#93DDFA" }
+style.good = { common.color "#72b886" }
+style.warn = { common.color "#FFA94D" }
+style.error = { common.color "#FF3333" }
+style.modified = { common.color "#1c7c9c" }
+
+style.syntax["normal"] = { common.color "#e1e1e6" }
+style.syntax["symbol"] = { common.color "#e1e1e6" }
+style.syntax["comment"] = { common.color "#676b6f" }
+style.syntax["keyword"] = { common.color "#E58AC9" }  -- local function end if case
+style.syntax["keyword2"] = { common.color "#F77483" } -- self int float
+style.syntax["number"] = { common.color "#FFA94D" }
+style.syntax["literal"] = { common.color "#FFA94D" }  -- true false nil
+style.syntax["string"] = { common.color "#f7c95c" }
+style.syntax["operator"] = { common.color "#93DDFA" } -- = + - / < >
+style.syntax["function"] = { common.color "#93DDFA" }
+
+style.log["INFO"]  = { icon = "i", color = style.text }
+style.log["WARN"]  = { icon = "!", color = style.warn }
+style.log["ERROR"] = { icon = "!", color = style.error }
+
+return style

in/data/colors/fall.lua

@@ -0,0 +1,28 @@
+local style = require "core.style"
+local common = require "core.common"
+
+style.background = { common.color "#343233" }
+style.background2 = { common.color "#2c2a2b" }
+style.background3 = { common.color "#2c2a2b" }
+style.text = { common.color "#c4b398" }
+style.caret = { common.color "#61efce" }
+style.accent = { common.color "#ffd152" }
+style.dim = { common.color "#615d5f" }
+style.divider = { common.color "#242223" }
+style.selection = { common.color "#454244" }
+style.line_number = { common.color "#454244" }
+style.line_number2 = { common.color "#615d5f" }
+style.line_highlight = { common.color "#383637" }
+style.scrollbar = { common.color "#454344" }
+style.scrollbar2 = { common.color "#524F50" }
+
+style.syntax["normal"] = { common.color "#efdab9" }
+style.syntax["symbol"] = { common.color "#efdab9" }
+style.syntax["comment"] = { common.color "#615d5f" }
+style.syntax["keyword"] = { common.color "#d36e2d" }
+style.syntax["keyword2"] = { common.color "#ef6179" }
+style.syntax["number"] = { common.color "#ffd152" }
+style.syntax["literal"] = { common.color "#ffd152" }
+style.syntax["string"] = { common.color "#ffd152" }
+style.syntax["operator"] = { common.color "#efdab9" }
+style.syntax["function"] = { common.color "#61efce" }

in/data/colors/github-dark-dimmed.lua

@@ -0,0 +1,38 @@
+local style = require "core.style"
+local common = require "core.common"
+
+-- GitHub color palette
+-- Ported by Andrey Proskurin (proskur1n)
+local bg = { common.color "#22272e" }
+local bg2 = { common.color "#2d333b" }
+local fg = { common.color "#adbac7" }
+local fgdim = { common.color "#768390" }
+local red = { common.color "#f47067" }
+local blue = { common.color "#6cb6ff" }
+local purple = { common.color "#dcbdfb" }
+
+style.background = bg
+style.background2 = bg
+style.background3 = bg
+style.text = fg
+style.caret = red
+style.accent = blue
+style.dim = fgdim
+style.divider = { common.color "#444c56" }
+style.selection = { common.color "#2e4c77" }
+style.line_number = fgdim
+style.line_number2 = fg
+style.line_highlight = bg2
+style.scrol = fgdim
+style.scrollbar2 = fg
+
+style.syntax["normal"] = fg
+style.syntax["symbol"] = fg
+style.syntax["comment"] = fgdim
+style.syntax["keyword"] = red
+style.syntax["keyword2"] = red
+style.syntax["number"] = blue
+style.syntax["literal"] = blue
+style.syntax["string"] = { common.color "#96d0ff" }
+style.syntax["operator"] = fg
+style.syntax["function"] = blue

in/data/colors/github_dark.lua

@@ -0,0 +1,41 @@
+local style = require "core.style"
+local common = require "core.common"
+
+-- GitHub color palette
+-- Ported by Andrey Proskurin (proskur1n)
+local bg = { common.color "#0d1117" }
+local bg2 = { common.color "#161925" }
+local fg = { common.color "#adbac7" }
+local fgdim = { common.color "#768390" }
+local red = { common.color "#f47067" }
+local blue = { common.color "#6cb6ff" }
+local purple = { common.color "#dcbdfb" }
+
+style.background = bg
+style.background2 = bg
+style.background3 = bg2
+style.text = fg
+style.caret = red
+style.accent = blue
+style.dim = fgdim
+style.divider = { common.color "#444c56" }
+style.selection = { common.color "#2e4c77" }
+style.line_number = fgdim
+style.line_number2 = fg
+style.line_highlight = {common.color "#1e202e"}
+style.scrollbar = fgdim
+style.scrollbar2 = fg
+
+style.syntax["normal"] = fg
+style.syntax["symbol"] = fg
+style.syntax["comment"] = fgdim
+style.syntax["keyword"] = red
+style.syntax["keyword2"] = red
+style.syntax["number"] = blue
+style.syntax["literal"] = blue
+style.syntax["string"] = { common.color "#96d0ff" }
+style.syntax["operator"] = fg
+style.syntax["function"] = blue
+
+style.guide = { common.color "#404040" }              -- indentguide
+

in/data/colors/summer.lua

@@ -0,0 +1,28 @@
+local style = require "core.style"
+local common = require "core.common"
+
+style.background = { common.color "#fbfbfb" }
+style.background2 = { common.color "#f2f2f2" }
+style.background3 = { common.color "#f2f2f2" }
+style.text = { common.color "#404040" }
+style.caret = { common.color "#fc1785" }
+style.accent = { common.color "#fc1785" }
+style.dim = { common.color "#b0b0b0" }
+style.divider = { common.color "#e8e8e8" }
+style.selection = { common.color "#b7dce8" }
+style.line_number = { common.color "#d0d0d0" }
+style.line_number2 = { common.color "#808080" }
+style.line_highlight = { common.color "#f2f2f2" }
+style.scrollbar = { common.color "#e0e0e0" }
+style.scrollbar2 = { common.color "#c0c0c0" }
+
+style.syntax["normal"] = { common.color "#181818" }
+style.syntax["symbol"] = { common.color "#181818" }
+style.syntax["comment"] = { common.color "#22a21f" }
+style.syntax["keyword"] = { common.color "#fb6620" }
+style.syntax["keyword2"] = { common.color "#fc1785" }
+style.syntax["number"] = { common.color "#1586d2" }
+style.syntax["literal"] = { common.color "#1586d2" }
+style.syntax["string"] = { common.color "#1586d2" }
+style.syntax["operator"] = { common.color "#fb6620" }
+style.syntax["function"] = { common.color "#fc1785" }

in/data/colors/textadept.lua

@@ -0,0 +1,51 @@
+local b05 = 'rgba(0,0,0,0.5)'   local red = '#994D4D'
+local b80 = '#333333'       local orange  = '#B3661A'
+local b60 = '#808080'       local green   = '#52994D'
+local b40 = '#ADADAD'       local teal    = '#4D9999'
+local b20 = '#CECECE'       local blue    = '#1A66B3'
+local b00 = '#E6E6E6'       local magenta = '#994D99'
+--------------------------=--------------------------
+local style               =     require  'core.style'
+local common              =     require 'core.common'
+--------------------------=--------------------------
+style.line_highlight      =     { common.color(b20) }
+style.background          =     { common.color(b00) }
+style.background2         =     { common.color(b20) }
+style.background3         =     { common.color(b20) }
+style.text                =     { common.color(b60) }
+style.caret               =     { common.color(b80) }
+style.accent              =     { common.color(b80) }
+style.dim                 =     { common.color(b60) }
+style.divider             =     { common.color(b40) }
+style.selection           =     { common.color(b40) }
+style.line_number         =     { common.color(b60) }
+style.line_number2        =     { common.color(b80) }
+style.scrollbar           =     { common.color(b40) }
+style.scrollbar2          =     { common.color(b60) }
+style.nagbar              =     { common.color(red) }
+style.nagbar_text         =     { common.color(b00) }
+style.nagbar_dim          =     { common.color(b05) }
+--------------------------=--------------------------
+style.syntax              =                        {}
+style.syntax['normal']    =     { common.color(b80) }
+style.syntax['symbol']    =     { common.color(b80) }
+style.syntax['comment']   =     { common.color(b60) }
+style.syntax['keyword']   =    { common.color(blue) }
+style.syntax['keyword2']  =     { common.color(red) }
+style.syntax['number']    =    { common.color(teal) }
+style.syntax['literal']   =    { common.color(blue) }
+style.syntax['string']    =   { common.color(green) }
+style.syntax['operator']  = { common.color(magenta) }
+style.syntax['function']  =    { common.color(blue) }
+--------------------------=--------------------------
+style.syntax.paren1       = { common.color(magenta) }
+style.syntax.paren2       =  { common.color(orange) }
+style.syntax.paren3       =    { common.color(teal) }
+style.syntax.paren4       =    { common.color(blue) }
+style.syntax.paren5       =     { common.color(red) }
+--------------------------=--------------------------
+style.lint                =                        {}
+style.lint.info           =    { common.color(blue) }
+style.lint.hint           =   { common.color(green) }
+style.lint.warning        =     { common.color(red) }
+style.lint.error          =  { common.color(orange) }

in/data/colors/vscode-dark.lua

@@ -0,0 +1,37 @@
+-- Most of the colors are taken from:
+-- https://github.com/microsoft/vscode/tree/master/extensions/theme-defaults/themes
+
+local style = require "core.style"
+local common = require "core.common"
+
+style.background = { common.color "#1E1E1E" }
+style.background2 = { common.color "#252526" }
+style.background3 = { common.color "#252526" }
+style.text = { common.color "#D4D4D4" }
+style.caret = { common.color "#FFFFFF" }
+style.accent = { common.color "#76BCFF" } -- Text in autocomplete and command, col(>80) in satusbar
+style.dim = { common.color "#7A7A7A" } -- Text of nonactive tabs, prefix in log
+style.divider = { common.color "#1E1E1E" }
+style.selection = { common.color "#264F78" }
+style.line_number = { common.color "#707070" }
+style.line_number2 = { common.color "#A0A0A0" } -- Number on line with caret
+style.line_highlight = { common.color "#333A40"}
+style.scrollbar = { common.color "#404040" }
+style.scrollbar2 = { common.color "#707070" } -- Hovered
+
+style.syntax["normal"] = { common.color "#D4D4D4" }
+style.syntax["symbol"] = { common.color "#D4D4D4" }
+style.syntax["comment"] = { common.color "#6A9955" }
+style.syntax["keyword"] = { common.color "#569CD6" }  -- local function end, if case
+style.syntax["keyword2"] = { common.color "#C586C0" } -- self, int float
+style.syntax["number"] = { common.color "#B5CEA8" }
+style.syntax["literal"] = { common.color "#569CD6" }
+style.syntax["string"] = { common.color "#CE9178" }
+style.syntax["operator"] = { common.color "#569CD6"}  -- = + - / < >
+style.syntax["function"] = { common.color "#DCDCAA" }
+
+-- PLUGINS
+style.linter_warning = { common.color "#B89500" }     -- linter
+style.bracketmatch_color = { common.color "#76BCFF" } -- bracketmatch
+style.guide = { common.color "#404040" }              -- indentguide
+style.guide_width = 1                                 -- indentguide

in/data/core/bit.lua

@@ -0,0 +1,36 @@
+local bit = {}
+
+local LUA_NBITS = 32
+local ALLONES = (~(((~0) << (LUA_NBITS - 1)) << 1))
+
+local function trim(x)
+	return (x & ALLONES)
+end
+
+local function mask(n)
+	return (~((ALLONES << 1) << ((n) - 1)))
+end
+
+local function check_args(field, width)
+	assert(field >= 0, "field cannot be negative")
+	assert(width > 0, "width must be positive")
+	assert(field + width < LUA_NBITS and field + width >= 0,
+	       "trying to access non-existent bits")
+end
+
+function bit.extract(n, field, width)
+	local w = width or 1
+	check_args(field, w)
+	local m = trim(n)
+	return m >> field & mask(w)
+end
+
+function bit.replace(n, v, field, width)
+	local w = width or 1
+	check_args(field, w)
+	local m = trim(n)
+	local x = v & mask(width);
+	return m & ~(mask(w) << field) | (x << field)
+end
+
+return bit