Merge branch 'master' into master

9 files changed, 539 insertions, 120 deletions

diff --git a/plugins/ephemeral_tabs.lua b/plugins/ephemeral_tabs.lua
new file mode 100644
index 0000000..dea4261
--- /dev/null
+++ b/plugins/ephemeral_tabs.lua
@@ -0,0 +1,77 @@
+-- mod-version:2 -- lite-xl 2.0
+local core = require "core"
+local command = require "core.command"
+local RootView = require "core.rootview"
+local DocView = require "core.docview"
+local Doc = require "core.doc"
+local TreeView = require "plugins.treeview"
+
+local RootView_open_doc = RootView.open_doc
+function RootView:open_doc(doc)
+  local docview = RootView_open_doc(self, doc)
+  -- The absence of the ephemeral flag means that before this moment in this
+  -- node this document was not exists
+  if docview.ephemeral == nil then
+    local node = self:get_active_node_default()
+    -- We assume that ephemeral tab is always the last one
+    -- But user can drag and drop tabs so full check is needed
+    for i, v in ipairs(node.views) do
+      if v.ephemeral then
+        node:close_view(self.root_node, v)
+      end
+    end
+    docview.ephemeral = true
+  end
+  return docview
+end
+
+local Doc_get_name = DocView.get_name
+function DocView:get_name()
+  return self.doc and self.ephemeral and ("~ " .. Doc_get_name(self) .. " ~")
+          or Doc_get_name(self)
+end
+
+-- Any change to the document makes the tab normal
+local Doc_on_text_change = Doc.on_text_change
+function Doc:on_text_change(type)
+  core.active_view.ephemeral = false
+  Doc_on_text_change(self, type)
+end
+
+-- Double clicking in the TreeView makes the tab normal
+local TreeView_on_mouse_pressed = TreeView.on_mouse_pressed
+function TreeView:on_mouse_pressed(button, x, y, clicks)
+  local result = TreeView_on_mouse_pressed(self, button, x, y, clicks)
+  if (clicks > 1) and (core.active_view.doc ~= nil) then
+    core.active_view.ephemeral = false
+  end
+  return result
+end
+
+-- Double clicking on a tab makes it normal
+local RootView_on_mouse_pressed = RootView.on_mouse_pressed
+function RootView:on_mouse_pressed(button, x, y, clicks)
+  local result = RootView_on_mouse_pressed(self, button, x, y, clicks)
+  if clicks > 1 then
+    local node = self.root_node:get_child_overlapping_point(x, y)
+    local idx = node:get_tab_overlapping_point(x, y)
+    if idx then
+      node.views[idx].ephemeral = false
+    end
+  end
+  return result
+end
+
+-- Dragging a tab makes it normal
+local RootView_on_mouse_released = RootView.on_mouse_released
+function RootView:on_mouse_released(button, x, y, ...)
+  if self.dragged_node then
+    if button == "left" then
+      if self.dragged_node.dragging then
+        local view = self.dragged_node.node.views[self.dragged_node.idx]
+        view.ephemeral = false
+      end
+    end
+  end
+  return RootView_on_mouse_released(self, button, x, y, ...)
+end
diff --git a/plugins/ephemeraldocviews.lua b/plugins/ephemeraldocviews.lua
deleted file mode 100644
index cb9f53d..0000000
--- a/plugins/ephemeraldocviews.lua
+++ /dev/null
@@ -1,45 +0,0 @@
--- mod-version:2 -- lite-xl 2.0
-local core = require "core"
-local command = require "core.command"
-local RootView = require "core.rootview"
-local DocView = require "core.docview"
-local Doc = require "core.doc"
-
-local open_doc = RootView.open_doc
-function RootView:open_doc(doc)
-  local node = self:get_active_node_default()
-  local ephemeral, existing_ephemeral = node.views, nil
-  for i, view in ipairs(node.views) do
-    if view.doc == doc then
-      ephemeral = false
-    end
-    if view.doc and view.doc.ephemeral then
-      existing_ephemeral = view
-    end
-  end
-  if ephemeral and existing_ephemeral then
-    node:close_view(self.root_node, existing_ephemeral)
-  end
-  local view = open_doc(self, doc)
-  if ephemeral then
-    view.doc.ephemeral = #node.views > 1
-  end
-  return view
-end
-
-local get_name = DocView.get_name
-function DocView:get_name()
-  return self.doc and self.doc.ephemeral and ("-- " .. get_name(self) .. " --") or get_name(self)
-end
-
-local doc_insert = Doc.insert
-function Doc:insert(...)
-  doc_insert(self, ...)
-  self.ephemeral = false
-end
-
-local doc_remove = Doc.remove
-function Doc:remove(...)
-  doc_remove(self, ...)
-  self.ephemeral = false
-end
diff --git a/plugins/extend_selection_line.lua b/plugins/extend_selection_line.lua
new file mode 100644
index 0000000..e986597
--- /dev/null
+++ b/plugins/extend_selection_line.lua
@@ -0,0 +1,19 @@
+-- mod-version:2 -- lite-xl 2.0
+local DocView = require "core.docview"
+local style = require "core.style"
+
+local draw_line_body = DocView.draw_line_body
+function DocView:draw_line_body(idx, x, y, ...)
+  draw_line_body(self, idx, x, y, ...)
+  local lh = self:get_line_height()
+  for _, line1, _, line2, _ in self.doc:get_selections(true) do
+    if idx >= line1 and idx < line2 and line1 ~= line2 then
+      -- draw selection from the end of the line to the end of the available space
+      local x1 = x + self:get_col_x_offset(idx, #self.doc.lines[idx])
+      local x2 = x + self.scroll.x + self.size.x
+      if x2 > x1 then
+        renderer.draw_rect(x1, y, x2 - x1, lh, style.selection)
+      end
+    end
+  end
+end
diff --git a/plugins/force_syntax.lua b/plugins/force_syntax.lua
new file mode 100644
index 0000000..dce4abc
--- /dev/null
+++ b/plugins/force_syntax.lua
@@ -0,0 +1,132 @@
+-- mod-version:2 -- lite-xl 2.0
+local core = require "core"
+local Doc = require "core.doc"
+local syntax = require "core.syntax"
+local command = require "core.command"
+local common = require "core.common"
+local style = require "core.style"
+local StatusView = require "core.statusview"
+local DocView = require "core.docview"
+
+local function doc()
+  if core.active_view and getmetatable(core.active_view) == DocView then return core.active_view.doc end
+  if core.last_active_view and getmetatable(core.last_active_view) == DocView then return core.last_active_view.doc end
+end
+
+-- Force plaintext syntax to have a name
+local plain_text_syntax = syntax.get("", "")
+plain_text_syntax.name = plain_text_syntax.name or "Plain Text"
+
+local doc_reset_syntax = Doc.reset_syntax
+function Doc:reset_syntax()
+  local syntax_get = syntax.get
+  if self.force_syntax then
+    syntax.get = function() return self.force_syntax end
+  end
+  doc_reset_syntax(self)
+  syntax.get = syntax_get
+end
+
+local function get_syntax_name(s)
+  if not s then return "Undefined" end
+  local name = s.name
+  if not name then
+    local exts = type(s.files) == "string" and { s.files } or s.files
+    if exts then
+      name = table.concat(exts, ", ")
+    end
+  end
+  return name or "Undefined"
+end
+
+local statusview_get_items = StatusView.get_items
+function StatusView:get_items()
+  local left, right = statusview_get_items(self)
+
+  local is_dv = core.active_view and getmetatable(core.active_view) == DocView
+  if not is_dv then return left, right end
+
+  local syntax_name = get_syntax_name(doc().syntax)
+
+  local ins = {
+    style.dim, 
+    self.separator2,
+    style.text,
+    syntax_name
+  }
+
+  if syntax_name then
+    for _,item in pairs(ins) do
+      table.insert(right, item)
+    end
+  end
+
+  return left, right
+end
+
+local function get_syntax_list()
+  local pt_name = plain_text_syntax.name
+  if doc().syntax == plain_text_syntax then
+    pt_name = "Current: "..pt_name
+  end
+  local list = { ["Auto detect"] = false,
+                 [pt_name] = plain_text_syntax }
+  local keylist = { "Auto detect", pt_name }
+
+  for _,s in pairs(syntax.items) do
+    local name = get_syntax_name(s)
+    local fullname = name
+    local i = 1
+    while list[fullname] do
+      i = i + 1
+      fullname = name.." ("..i..")"
+    end
+    if doc().syntax == s then
+      fullname = "Current: "..fullname
+    end
+    list[fullname] = s
+    table.insert(keylist, fullname)
+  end
+
+  return list, keylist
+end
+
+local function sorter(a, b)
+  -- Compare only syntax name
+  a = a:gsub("Current: ", "")
+  b = b:gsub("Current: ", "")
+  return string.upper(a) < string.upper(b)
+end
+
+local function bias_sorter(a, b)
+  -- Bias towards Current and Auto detect syntax
+  if a:match("Current: ") then return true end
+  if b:match("Current: ") then return false end
+  if a:match("Auto detect") then return true end
+  if b:match("Auto detect") then return false end
+  return sorter(a, b)
+end
+
+command.add("core.docview", {
+  ["force-syntax:select-file-syntax"] =
+    function()
+      core.command_view:enter(
+        "Set syntax for this file",
+        function(text, item) -- submit
+          local list, _ = get_syntax_list()
+          doc().force_syntax = list[item.text]
+          doc():reset_syntax()
+        end,
+        function(text) -- suggest
+          local _, keylist = get_syntax_list()
+          local res = common.fuzzy_match(keylist, text)
+          -- Force Current and Auto detect syntax to the bottom
+          -- if the text is empty
+          table.sort(res, #text == 0 and bias_sorter or sorter)
+          return res
+        end,
+        nil, -- cancel
+        nil -- validate
+      )
+    end
+})
diff --git a/plugins/indent_convert.lua b/plugins/indent_convert.lua
new file mode 100644
index 0000000..c86686d
--- /dev/null
+++ b/plugins/indent_convert.lua
@@ -0,0 +1,128 @@
+-- mod-version:2 -- lite-xl 2.0
+local core = require "core"
+local config = require "core.config"
+local command = require "core.command"
+
+config.plugins.indent_convert = {
+  update_indent_type = true -- set to false to avoid updating the document indent type
+}
+
+local zero_pattern = _VERSION == "Lua 5.1" and "%z" or "\0"
+
+-- TODO: only set document indent type if there are no selections
+-- TODO: correctly restore selections accounting for the offset caused by the conversion
+
+-- To replace N spaces with tabs, we match the last N spaces before the start of
+-- the actual code and replace them with a tab.
+-- We repeat this until we can't find any more spaces before the code.
+-- The problem we encounter with this method is that if we have less than N
+-- remaining spaces, those will end up at the start of the line.
+-- Eg:
+-- int main() {
+-- __printf("Hello world\n");
+-- ___return 0;
+-- }
+--
+-- Becomes
+-- int main() {
+-- #printf("Hello world\n");
+-- _#return 0;
+-- }
+--
+-- Instead of
+-- int main() {
+-- #printf("Hello world\n");
+-- #_return 0;
+-- }
+-- With regex we could do something like
+-- `regex.gsub("(^(?: {2})*)(?: {2})", "\\1\t")`
+-- but the implementation of `regex.gsub` is very slow.
+--
+-- The workaround is to find the longest possible repetition of N*X spaces and
+-- use that information to replace the longest repetition of spaces starting
+-- from the beginning of the line, then the second longest...
+local function spaces_replacer(text, indent_size)
+  local spaces = string.rep(" ", indent_size)
+  local total = 0
+  local n
+  local reps = 0
+  -- find the longest repetition of indent_size*spaces
+  repeat
+    reps = reps + 1
+    local s, _ = string.find(text, "%f[^"..zero_pattern.."\n]"..string.rep(spaces, reps))
+  until not s
+  reps = reps - 1
+  while reps > 0 do
+    text, n = string.gsub(text,
+                          "(%f[^"..zero_pattern.."\n])("..string.rep(spaces, reps)..")",
+                          "%1"..string.rep("\t", reps))
+    total = total + n
+    reps = reps - 1
+  end
+  return text, total
+end
+
+local function tabs_replacer(text, indent_size)
+  local spaces = string.rep(" ", indent_size)
+  local total = 0
+  local n
+  -- replace the last tab before the text until there aren't anymore
+  repeat
+    text, n = string.gsub(text, "(%f[^"..zero_pattern.."\n]\t*)(\t)", "%1"..spaces)
+    total = total + n
+  until n == 0
+  return text, total
+end
+
+local function replacer(doc, fn, indent_size)
+  return function(text)
+    return fn(text, indent_size)
+  end
+end
+
+local function get_indent_size(doc)
+  local indent_size = config.indent_size
+  if type(doc.get_indent_info) == "function" then
+    -- use the new `Doc:get_indent_info` function
+    indent_size = select(2, doc:get_indent_info())
+  end
+  return indent_size
+end
+
+local function tabs_to_spaces()
+  local doc = core.active_view.doc
+  local indent_size = get_indent_size(doc)
+  local selections = doc.selections
+  doc:replace(replacer(doc, tabs_replacer, indent_size))
+  doc.selections = selections
+  doc:sanitize_selection()
+  if config.plugins.indent_convert.update_indent_type then
+    doc.indent_info = {
+      type = "soft",
+      size = indent_size,
+      confirmed = true
+    }
+  end
+end
+
+local function spaces_to_tabs()
+  local doc = core.active_view.doc
+  local indent_size = get_indent_size(doc)
+  local selections = doc.selections
+  doc:replace(replacer(doc, spaces_replacer, indent_size))
+  doc.selections = selections
+  doc:sanitize_selection()
+  if config.plugins.indent_convert.update_indent_type then
+    doc.indent_info = {
+      type = "hard",
+      size = indent_size,
+      confirmed = true
+    }
+  end
+end
+
+command.add("core.docview", {
+    ["indent-convert:tabs-to-spaces"] = tabs_to_spaces,
+    ["indent-convert:spaces-to-tabs"] = spaces_to_tabs
+  }
+)
diff --git a/plugins/language_julia.lua b/plugins/language_julia.lua
index 65bc1ce..e62a9b2 100644
--- a/plugins/language_julia.lua
+++ b/plugins/language_julia.lua
@@ -1,5 +1,5 @@
 -- mod-version:2 -- lite-xl 2.0
--- Support for the Julia programming language: 
+-- Support for the Julia programming language:
 -- Covers the most used keywords up to Julia version 1.6.4
 
 local syntax = require "core.syntax"
@@ -9,25 +9,37 @@ syntax.add {
   files = { "%.jl$" },
   comment = "#",
   patterns = {
-    { pattern = { "#=", "=#" },       type = "comment"  },
-    { pattern = "#.-\n",                type = "comment"  },
-    { pattern = { '"', '"', '\\' },     type = "string"   },
-    { pattern = { "`", "`", '\\' },     type = "string"   },
+    {pattern = {"#=", "=#"},            type="comment"    },
+    {pattern = "#.*$",                  type="comment"    },
+    { pattern = { 'icxx"""', '"""' },     type = "string", syntax = ".cpp" },
+    { pattern = { 'cxx"""', '"""' },     type = "string", syntax = ".cpp" },
+    { pattern = { 'py"""', '"""' },     type = "string", syntax = ".py" },
+    { pattern = { 'js"""', '"""' },     type = "string", syntax = ".js" },
+    { pattern = { 'md"""', '"""' },     type = "string", syntax = ".md" },
+    { pattern = "%d%w*[%.-+*//]",       type = "number"   },
     { pattern = "0[oO_][0-7]+",         type = "number"   },
     { pattern = "-?0x[%x_]+",           type = "number"   },
+    { pattern = "-?0b[%x_]+",           type = "number"   },
     { pattern = "-?%d+_%d",             type = "number"   },
     { pattern = "-?%d+[%d%.eE]*f?",     type = "number"   },
     { pattern = "-?%.?%d+f?",           type = "number"   },
-    { pattern = "[%+%-=/%*%^%%<>!~|&]", type = "operator" },
-    { pattern = "[%a_][%w_]*%f[(]",     type = "function" },
-    { pattern = "[%a_][%w_]*",          type = "symbol"   },
+    { pattern = "[^%d%g]%:%a*",         type = "function" },
+    { pattern = "[%+%-=/%*%^%%<>!~|&%:]",type = "operator"},
+    { pattern = '""".*"""', type = "string" },
+    { pattern = '".*"',     type = "string" },
+    { pattern = '[bv]".*"', type = "string" },
+     { pattern = 'r".*$',   type = "string" },
+    { pattern = "'\\.*'",   type = "string" },
+    { pattern = "'.'",      type = "string" },
+    { pattern = "[%a_][%w_]*%f[(]",       type = "function" },
+    { pattern = "%g*!",                    type="function"},
+    { pattern = "[%a_][%w_]*",            type = "symbol"   },
   },
   symbols = {
     -- keywords
-    ["abstract type"]     = "keyword",
     ["baremodule"]        = "keyword",
     ["begin"]             = "keyword",
-    ["break`"]            = "keyword",
+    ["break"]             = "keyword",
     ["catch"]             = "keyword",
     ["const"]             = "keyword",
     ["continue"]          = "keyword",
@@ -44,24 +56,31 @@ syntax.add {
     ["function"]          = "keyword",
     ["global"]            = "keyword",
     ["if"]                = "keyword",
+    ["in"]                = "keyword",
     ["import"]            = "keyword",
     ["let"]               = "keyword",
     ["local"]             = "keyword",
     ["macro"]             = "keyword",
+    ["type"]              = "keyword",
     ["module"]            = "keyword",
+    ["mutable"]           = "keyword",
     ["quote"]             = "keyword",
     ["return"]            = "keyword",
     ["try"]               = "keyword",
     ["typeof"]            = "keyword",
     ["using"]             = "keyword",
     ["while"]             = "keyword",
-    
+    ["where"]             = "keyword",
+
     -- types
     ["struct"]            = "keyword2",
-    ["mutable struct"]    = "keyword2",
+    ["abstract"]          = "keyword2",
+    ["primitive"]         = "keyword2",
+    ["mutable"]           = "keyword2",
     ["Char"]              = "keyword2",
     ["Bool"]              = "keyword2",
     ["Int"]               = "keyword2",
+    ["Integer"]           = "keyword2",
     ["Int8"]              = "keyword2",
     ["UInt8"]             = "keyword2",
     ["Int16"]             = "keyword2",
@@ -77,10 +96,17 @@ syntax.add {
     ["Float64"]           = "keyword2",
     ["Vector"]            = "keyword2",
     ["Matrix"]            = "keyword2",
+    ["Ref"]               = "keyword2",
+    ["String"]            = "keyword2",
+    ["Function"]          = "keyword2",
+    ["Number"]            = "keyword2",
 
     -- literals
     ["missing"]          = "literal",
     ["true"]             = "literal",
     ["false"]            = "literal",
-  },
+    ["nothing"]          = "literal",
+    ["Inf"]              = "literal",
+    ["NaN"]              = "literal",
+  }
 }
diff --git a/plugins/language_rust.lua b/plugins/language_rust.lua
index a8dc017..f20d35e 100644
--- a/plugins/language_rust.lua
+++ b/plugins/language_rust.lua
@@ -8,8 +8,10 @@ syntax.add {
   patterns = {
     { pattern = "//.-\n",               type = "comment"  },
     { pattern = { "/%*", "%*/" },       type = "comment"  },
+    { pattern = { 'r#"', '"#', '\\' },  type = "string"   },
     { pattern = { '"', '"', '\\' },     type = "string"   },
-    { pattern = { "`", "`", '\\' },     type = "string"   },
+    { pattern = "'.'",                  type = "string"   },
+    { pattern = "'%a",                  type = "keyword2" },
     { pattern = "0[oO_][0-7]+",         type = "number"   },
     { pattern = "-?0x[%x_]+",           type = "number"   },
     { pattern = "-?%d+_%d",             type = "number"   },
@@ -21,68 +23,68 @@ syntax.add {
     { pattern = "[%a_][%w_]*",          type = "symbol"   },
   },
   symbols = {
-	["as"] = "keyword",
-	["async"] = "keyword",
-	["await"] = "keyword",
-	["break"] = "keyword",
-	["const"] = "keyword",
+	["as"]       = "keyword",
+	["async"]    = "keyword",
+	["await"]    = "keyword",
+	["break"]    = "keyword",
+	["const"]    = "keyword",
 	["continue"] = "keyword",
-	["crate"] = "keyword",
-	["dyn"] = "keyword",
-	["else"] = "keyword",
-	["enum"] = "keyword",
-	["extern"] = "keyword",
-	["false"] = "keyword",
-	["fn"] = "keyword",
-	["for"] = "keyword",
-	["if"] = "keyword",
-	["impl"] = "keyword",
-	["in"] = "keyword",
-	["let"] = "keyword",
-	["loop"] = "keyword",
-	["match"] = "keyword",
-	["mod"] = "keyword",
-	["move"] = "keyword",
-	["mut"] = "keyword",
-	["pub"] = "keyword",
-	["ref"] = "keyword",
-	["return"] = "keyword",
-	["Self"] = "keyword",
-	["self"] = "keyword",
-	["static"] = "keyword",
-	["struct"] = "keyword",
-	["super"] = "keyword",
-	["trait"] = "keyword",
-	["true"] = "keyword",
-	["type"] = "keyword",
-	["unsafe"] = "keyword",
-	["use"] = "keyword",
-	["where"] = "keyword",
-	["while"] = "keyword",
-    ["i32"]        = "keyword2",
-    ["i64"]      = "keyword2",
-    ["i128"]      = "keyword2",
-    ["i16"]      = "keyword2",
-    ["i8"]       = "keyword2",
-    ["u8"] 	= "keyword2",
-    ["u16"]       = "keyword2",
-    ["u32"]     = "keyword2",
-    ["u64"]     = "keyword2",
-    ["usize"]     = "keyword2",
-    ["isize"]      = "keyword2",
-    ["f32"]    = "keyword2",
-    ["f64"]    = "keyword2",
-    ["f128"]    = "keyword2",
-    ["String"]        = "keyword2",
-    ["char"] = "keyword2",
-    ["&str"]     = "keyword2",
-    ["bool"]       = "keyword2",
-    ["true"]       = "literal",
-    ["false"]      = "literal",
-    ["None"]        = "literal",
-	["Some"]    = "literal",
-	["Option"]  = "literal",
-	["Result"] = "literal",
+	["crate"]    = "keyword",
+	["dyn"]      = "keyword",
+	["else"]     = "keyword",
+	["enum"]     = "keyword",
+	["extern"]   = "keyword",
+	["false"]    = "keyword",
+	["fn"]       = "keyword",
+	["for"]      = "keyword",
+	["if"]       = "keyword",
+	["impl"]     = "keyword",
+	["in"]       = "keyword",
+	["let"]      = "keyword",
+	["loop"]     = "keyword",
+	["match"]    = "keyword",
+	["mod"]      = "keyword",
+	["move"]     = "keyword",
+	["mut"]      = "keyword",
+	["pub"]      = "keyword",
+	["ref"]      = "keyword",
+	["return"]   = "keyword",
+	["Self"]     = "keyword",
+	["self"]     = "keyword",
+	["static"]   = "keyword",
+	["struct"]   = "keyword",
+	["super"]    = "keyword",
+	["trait"]    = "keyword",
+	["true"]     = "keyword",
+	["type"]     = "keyword",
+	["unsafe"]   = "keyword",
+	["use"]      = "keyword",
+	["where"]    = "keyword",
+	["while"]    = "keyword",
+    	["i32"]      = "keyword2",
+    	["i64"]      = "keyword2",
+    	["i128"]     = "keyword2",
+    	["i16"]      = "keyword2",
+    	["i8"]       = "keyword2",
+        ["u8"]       = "keyword2",
+    	["u16"]      = "keyword2",
+        ["u32"]      = "keyword2",
+        ["u64"]      = "keyword2",
+        ["usize"]    = "keyword2",
+        ["isize"]    = "keyword2",
+        ["f32"]      = "keyword2",
+        ["f64"]      = "keyword2",
+        ["f128"]     = "keyword2",
+        ["String"]   = "keyword2",
+        ["char"]     = "keyword2",
+        ["str"]      = "keyword2",
+        ["bool"]     = "keyword2",
+        ["true"]     = "literal",
+        ["false"]    = "literal",
+        ["None"]     = "literal",
+	["Some"]     = "literal",
+	["Option"]   = "literal",
+	["Result"]   = "literal",
   },
 }
 
diff --git a/plugins/minimap.lua b/plugins/minimap.lua
index b129f40..2c383b8 100644
--- a/plugins/minimap.lua
+++ b/plugins/minimap.lua
@@ -16,6 +16,13 @@ config.plugins.minimap = {
 	-- how many spaces one tab is equivalent to
 	tab_width = 4,
 	draw_background = true,
+
+	-- you can override these colors
+	selection_color = nil,
+	caret_color = nil,
+
+	-- If other plugins provide per-line highlights,
+	-- this controls the placement. (e.g. gitdiff_highlight)
 	highlight_align = 'left',
 	highlight_width = 3,
 	gutter_width = 5,
@@ -222,6 +229,17 @@ DocView.draw_scrollbar = function(self)
 	-- draw visual rect
 	renderer.draw_rect(x, visible_y, w, scroller_height, visual_color)
 
+	-- highlight the selected lines, and the line with the caret on it
+	local selection_color = config.plugins.minimap.selection_color or style.dim
+	local caret_color = config.plugins.minimap.caret_color or style.caret
+	local selection_line, selection_col, selection_line2, selection_col2 = self.doc:get_selection()
+	local selection_y = y + (selection_line - minimap_start_line) * line_spacing
+	local selection2_y = y + (selection_line2 - minimap_start_line) * line_spacing
+	local selection_min_y = math.min(selection_y, selection2_y)
+	local selection_h = math.abs(selection2_y - selection_y)+1
+	renderer.draw_rect(x, selection_min_y, w, selection_h, selection_color)
+	renderer.draw_rect(x, selection_y, w, line_spacing, caret_color)
+
 	local highlight_align = config.plugins.minimap.highlight_align
 	local highlight_width = config.plugins.minimap.highlight_width
 	local gutter_width = config.plugins.minimap.gutter_width
diff --git a/plugins/opacity.lua b/plugins/opacity.lua
new file mode 100644
index 0000000..8dd0d9a
--- /dev/null
+++ b/plugins/opacity.lua
@@ -0,0 +1,62 @@
+-- mod-version:2 -- lite-xl 2.0
+local common = require "core.common"
+local command = require "core.command"
+local keymap = require "core.keymap"
+local RootView = require "core.rootview"
+
+local opacity_on = true
+local use_mousewheel = true
+local opacity_steps = 0.05
+local default_opacity = 1
+local current_opacity = default_opacity
+
+local function set_opacity(opacity)
+  if not opacity_on then opacity_on = true end
+  current_opacity = common.clamp(opacity, 0.2, 1)
+  system.set_window_opacity(current_opacity)
+end
+
+local on_mouse_wheel = RootView.on_mouse_wheel
+
+function RootView:on_mouse_wheel(d, ...)
+  if keymap.modkeys["shift"] and use_mousewheel then
+    if d < 0 then command.perform "opacity:decrease" end
+    if d > 0 then command.perform "opacity:increase" end
+  else
+    return on_mouse_wheel(self, d, ...)
+  end
+end
+
+local function tog_opacity()
+  opacity_on = not opacity_on
+  if opacity_on then
+    system.set_window_opacity(current_opacity)
+  else
+    system.set_window_opacity(default_opacity)
+  end
+end
+
+local function res_opacity()
+  set_opacity(default_opacity)
+end
+
+local function inc_opacity()
+  set_opacity(current_opacity + opacity_steps)
+end
+
+local function dec_opacity()
+  set_opacity(current_opacity - opacity_steps)
+end
+
+command.add(nil, {
+  ["opacity:toggle"  ] = function() tog_opacity() end,
+  ["opacity:reset"   ] = function() res_opacity() end,
+  ["opacity:decrease"] = function() dec_opacity() end,
+  ["opacity:increase"] = function() inc_opacity() end,
+  ["opacity:toggle mouse wheel use"] = function() use_mousewheel = not use_mousewheel end,
+})
+
+keymap.add {
+  ["shift+f11"] = "opacity:toggle",
+  ["ctrl+f11"]  = "opacity:toggle mouse wheel use",
+}