Merged dev to master.

data/core/commands/core.lua

@@ -104,11 +104,20 @@ command.add(nil, {
     end, function (text)
       return common.home_encode_list(common.path_suggest(common.home_expand(text)))
     end, nil, function(text)
-      local path_stat, err = system.get_file_info(common.home_expand(text))
+      local filename = common.home_expand(text)
+      local path_stat, err = system.get_file_info(filename)
       if err then
-        core.error("Cannot open file %q: %q", text, err)
+        if err:find("No such file", 1, true) then
+          -- check if the containing directory exists
+          local dirname = common.dirname(filename)
+          local dir_stat = dirname and system.get_file_info(dirname)
+          if not dirname or (dir_stat and dir_stat.type == 'dir') then
+            return true
+          end
+        end
+        core.error("Cannot open file %s: %s", text, err)
       elseif path_stat.type == 'dir' then
-        core.error("Cannot open %q, is a folder", text)
+        core.error("Cannot open %s, is a folder", text)
       else
         return true
       end

data/core/commands/doc.lua

@@ -43,11 +43,67 @@ local function append_line_if_last_line(line)
 end
 
 local function save(filename)
-  doc():save(filename and core.normalize_to_project_dir(filename))
+  local abs_filename
+  if filename then
+    filename = core.normalize_to_project_dir(filename)
+    abs_filename = core.project_absolute_path(filename)
+  end
+  doc():save(filename, abs_filename)
   local saved_filename = doc().filename
   core.log("Saved \"%s\"", saved_filename)
 end
 
+-- returns the size of the original indent, and the indent
+-- in your config format, rounded either up or down
+local function get_line_indent(line, rnd_up)
+  local _, e = line:find("^[ \t]+")
+  local soft_tab = string.rep(" ", config.indent_size)
+  if config.tab_type == "hard" then
+    local indent = e and line:sub(1, e):gsub(soft_tab, "\t") or ""
+    return e, indent:gsub(" +", rnd_up and "\t" or "")
+  else
+    local indent = e and line:sub(1, e):gsub("\t", soft_tab) or ""
+    local number = #indent / #soft_tab
+    return e, indent:sub(1,
+      (rnd_up and math.ceil(number) or math.floor(number))*#soft_tab)
+  end
+end
+
+-- un/indents text; behaviour varies based on selection and un/indent.
+-- * if there's a selection, it will stay static around the
+--   text for both indenting and unindenting.
+-- * if you are in the beginning whitespace of a line, and are indenting, the
+--   cursor will insert the exactly appropriate amount of spaces, and jump the
+--   cursor to the beginning of first non whitespace characters
+-- * if you are not in the beginning whitespace of a line, and you indent, it
+--   inserts the appropriate whitespace, as if you typed them normally.
+-- * if you are unindenting, the cursor will jump to the start of the line,
+--   and remove the appropriate amount of spaces (or a tab).
+local function indent_text(unindent)
+  local text = get_indent_string()
+  local line1, col1, line2, col2, swap = doc_multiline_selection(true)
+  local _, se = doc().lines[line1]:find("^[ \t]+")
+  local in_beginning_whitespace = col1 == 1 or (se and col1 <= se + 1)
+  if unindent or doc():has_selection() or in_beginning_whitespace then
+    local l1d, l2d = #doc().lines[line1], #doc().lines[line2]
+    for line = line1, line2 do
+      local e, rnded = get_line_indent(doc().lines[line], unindent)
+      doc():remove(line, 1, line, (e or 0) + 1)
+      doc():insert(line, 1,
+        unindent and rnded:sub(1, #rnded - #text) or rnded .. text)
+    end
+    l1d, l2d = #doc().lines[line1] - l1d, #doc().lines[line2] - l2d
+    if (unindent or in_beginning_whitespace) and not doc():has_selection() then
+      local start_cursor = (se and se + 1 or 1) + l1d or #(doc().lines[line1])
+      doc():set_selection(line1, start_cursor, line2, start_cursor, swap)
+    else
+      doc():set_selection(line1, col1 + l1d, line2, col2 + l2d, swap)
+    end
+  else
+    doc():text_input(text)
+  end
+end
+
 local function cut_or_copy(delete)
   local full_text = ""
   for idx, line1, col1, line2, col2 in doc():get_selections() do
@@ -363,12 +419,14 @@ local commands = {
     end
     core.command_view:set_text(old_filename)
     core.command_view:enter("Rename", function(filename)
-      doc():save(filename)
+      save(common.home_expand(filename))
       core.log("Renamed \"%s\" to \"%s\"", old_filename, filename)
       if filename ~= old_filename then
         os.remove(old_filename)
       end
-    end, common.path_suggest)
+    end, function (text)
+      return common.home_encode_list(common.path_suggest(common.home_expand(text)))
+    end)
   end,
 
 

data/core/common.lua

@@ -230,6 +230,12 @@ function common.basename(path)
 end
 
 
+-- can return nil if there is no directory part in the path
+function common.dirname(path)
+  return path:match("(.+)[\\/][^\\/]+$")
+end
+
+
 function common.home_encode(text)
   if HOME and string.find(text, HOME, 1, true) == 1 then
     local dir_pos = #HOME + 1
@@ -279,8 +285,27 @@ local function split_on_slash(s, sep_pattern)
 end
 
 
+function common.normalize_path(filename)
+  if PATHSEP == '\\' then
+    filename = filename:gsub('[/\\]', '\\')
+    local drive, rem = filename:match('^([a-zA-Z])(:.*)')
+    filename = drive and drive:upper() .. rem or filename
+  end
+  local parts = split_on_slash(filename, PATHSEP)
+  local accu = {}
+  for _, part in ipairs(parts) do
+    if part == '..' then
+      table.remove(accu)
+    elseif part ~= '.' then
+      table.insert(accu, part)
+    end
+  end
+  return table.concat(accu, PATHSEP)
+end
+
+
 function common.path_belongs_to(filename, path)
-  return filename and string.find(filename, path .. PATHSEP, 1, true) == 1
+  return string.find(filename, path .. PATHSEP, 1, true) == 1
 end
 
 

data/core/doc/init.lua

@@ -17,10 +17,34 @@ local function split_lines(text)
   return res
 end
 
-function Doc:new(filename)
+
+local function splice(t, at, remove, insert)
+  insert = insert or {}
+  local offset = #insert - remove
+  local old_len = #t
+  if offset < 0 then
+    for i = at - offset, old_len - offset do
+      t[i + offset] = t[i]
+    end
+  elseif offset > 0 then
+    for i = old_len, at, -1 do
+      t[i + offset] = t[i]
+    end
+  end
+  for i, item in ipairs(insert) do
+    t[at + i - 1] = item
+  end
+end
+
+
+function Doc:new(filename, abs_filename, new_file)
+  self.new_file = new_file
   self:reset()
   if filename then
-    self:load(filename)
+    self:set_filename(filename, abs_filename)
+    if not new_file then
+      self:load(filename)
+    end
   end
 end
 
@@ -47,16 +71,15 @@ function Doc:reset_syntax()
 end
 
 
-function Doc:set_filename(filename)
+function Doc:set_filename(filename, abs_filename)
   self.filename = filename
-  self.abs_filename = system.absolute_path(filename)
+  self.abs_filename = abs_filename
 end
 
 
 function Doc:load(filename)
   local fp = assert( io.open(filename, "rb") )
   self:reset()
-  self:set_filename(filename)
   self.lines = {}
   for line in fp:lines() do
     if line:byte(-1) == 13 then
@@ -73,17 +96,20 @@ function Doc:load(filename)
 end
 
 
-function Doc:save(filename)
-  filename = filename or assert(self.filename, "no filename set to default to")
+function Doc:save(filename, abs_filename)
+  if not filename then
+    assert(self.filename, "no filename set to default to")
+    filename = self.filename
+    abs_filename = self.abs_filename
+  end
   local fp = assert( io.open(filename, "wb") )
   for _, line in ipairs(self.lines) do
     if self.crlf then line = line:gsub("\n", "\r\n") end
     fp:write(line)
   end
   fp:close()
-  if filename then
-    self:set_filename(filename)
-  end
+  self:set_filename(filename, abs_filename)
+  self.new_file = false
   self:reset_syntax()
   self:clean()
 end
@@ -95,7 +121,7 @@ end
 
 
 function Doc:is_dirty()
-  return self.clean_change_id ~= self:get_change_id()
+  return self.clean_change_id ~= self:get_change_id() or self.new_file
 end
 
 

data/core/init.lua

@@ -620,24 +620,6 @@ do
 end
 
 
--- DEPRECATED function
-core.doc_save_hooks = {}
-function core.add_save_hook(fn)
-  core.error("The function core.add_save_hook is deprecated." ..
-    " Modules should now directly override the Doc:save function.")
-  core.doc_save_hooks[#core.doc_save_hooks + 1] = fn
-end
-
-
--- DEPRECATED function
-function core.on_doc_save(filename)
-  -- for backward compatibility in modules. Hooks are deprecated, the function Doc:save
-  -- should be directly overidded.
-  for _, hook in ipairs(core.doc_save_hooks) do
-    hook(filename)
-  end
-end
-
 local function quit_with_function(quit_fn, force)
   if force then
     delete_temp_files()
@@ -695,24 +677,27 @@ function core.load_plugins()
     userdir = {dir = USERDIR, plugins = {}},
     datadir = {dir = DATADIR, plugins = {}},
   }
-  for _, root_dir in ipairs {USERDIR, DATADIR} do
+  local files = {}
+  for _, root_dir in ipairs {DATADIR, USERDIR} do
     local plugin_dir = root_dir .. "/plugins"
-    local files = system.list_dir(plugin_dir)
-    for _, filename in ipairs(files or {}) do
-      local basename = filename:match("(.-)%.lua$") or filename
-      local version_match = check_plugin_version(plugin_dir .. '/' .. filename)
-      if not version_match then
-        core.log_quiet("Version mismatch for plugin %q from %s", basename, plugin_dir)
-        local ls = refused_list[root_dir == USERDIR and 'userdir' or 'datadir'].plugins
-        ls[#ls + 1] = filename
-      end
-      if version_match and config.plugins[basename] ~= false then
-        local modname = "plugins." .. basename
-        local ok = core.try(require, modname)
-        if ok then core.log_quiet("Loaded plugin %q from %s", basename, plugin_dir) end
-        if not ok then
-          no_errors = false
-        end
+    for _, filename in ipairs(system.list_dir(plugin_dir) or {}) do
+      files[filename] = plugin_dir -- user plugins will always replace system plugins
+    end
+  end
+
+  for filename, plugin_dir in pairs(files) do
+    local basename = filename:match("(.-)%.lua$") or filename
+    local version_match = check_plugin_version(plugin_dir .. '/' .. filename)
+    if not version_match then
+      core.log_quiet("Version mismatch for plugin %q from %s", basename, plugin_dir)
+      local list = refused_list[plugin_dir:find(USERDIR) == 1 and 'userdir' or 'datadir'].plugins
+      table.insert(list, filename)
+    end
+    if version_match and core.plugins[basename] ~= false then
+      local ok = core.try(require, "plugins." .. basename)
+      if ok then core.log_quiet("Loaded plugin %q from %s", basename, plugin_dir) end
+      if not ok then
+        no_errors = false
       end
     end
   end
@@ -809,10 +794,30 @@ function core.normalize_to_project_dir(filename)
 end
 
 
+-- The function below works like system.absolute_path except it
+-- doesn't fail if the file does not exist. We consider that the
+-- current dir is core.project_dir so relative filename are considered
+-- to be in core.project_dir.
+-- Please note that .. or . in the filename are not taken into account.
+-- This function should get only filenames normalized using
+-- common.normalize_path function.
+function core.project_absolute_path(filename)
+  if filename:match('^%a:\\') or filename:find('/', 1, true) then
+    return filename
+  else
+    return core.project_dir .. PATHSEP .. filename
+  end
+end
+
+
 function core.open_doc(filename)
+  local new_file = not filename or not system.get_file_info(filename)
+  local abs_filename
   if filename then
+    -- normalize filename and set absolute filename then
     -- try to find existing doc for filename
-    local abs_filename = system.absolute_path(filename)
+    filename = core.normalize_to_project_dir(filename)
+    abs_filename = core.project_absolute_path(filename)
     for _, doc in ipairs(core.docs) do
       if doc.abs_filename and abs_filename == doc.abs_filename then
         return doc
@@ -820,8 +825,7 @@ function core.open_doc(filename)
     end
   end
   -- no existing doc for filename; create new
-  filename = filename and core.normalize_to_project_dir(filename)
-  local doc = Doc(filename)
+  local doc = Doc(filename, abs_filename, new_file)
   table.insert(core.docs, doc)
   core.log_quiet(filename and "Opened doc \"%s\"" or "Opened new doc", filename)
   return doc

data/core/keymap.lua

@@ -108,6 +108,7 @@ keymap.add_direct {
   ["ctrl+shift+c"] = "core:change-project-folder",
   ["ctrl+shift+o"] = "core:open-project-folder",
   ["alt+return"] = "core:toggle-fullscreen",
+  ["f11"] = "core:toggle-fullscreen",
 
   ["alt+shift+j"] = "root:split-left",
   ["alt+shift+l"] = "root:split-right",

data/core/regex.lua

@@ -1,5 +1,5 @@
 
--- So that in addition to regex.gsub(pattern, string), we can also do 
+-- So that in addition to regex.gsub(pattern, string), we can also do
 -- pattern:gsub(string).
 regex.__index = function(table, key) return regex[key]; end
 
@@ -9,7 +9,7 @@ regex.match = function(pattern_string, string, offset, options)
   return regex.cmatch(pattern, string, offset or 1, options or 0)
 end
 
--- Will iterate back through any UTF-8 bytes so that we don't replace bits 
+-- Will iterate back through any UTF-8 bytes so that we don't replace bits
 -- mid character.
 local function previous_character(str, index)
   local byte
@@ -32,7 +32,7 @@ end
 
 -- Build off matching. For now, only support basic replacements, but capture
 -- groupings should be doable. We can even have custom group replacements and
--- transformations and stuff in lua. Currently, this takes group replacements 
+-- transformations and stuff in lua. Currently, this takes group replacements
 -- as \1 - \9.
 -- Should work on UTF-8 text.
 regex.gsub = function(pattern_string, str, replacement)
@@ -48,8 +48,8 @@ regex.gsub = function(pattern_string, str, replacement)
       if #indices > 2 then
         for i = 1, (#indices/2 - 1) do
           currentReplacement = string.gsub(
-            currentReplacement, 
-            "\\" .. i, 
+            currentReplacement,
+            "\\" .. i,
             str:sub(indices[i*2+1], end_character(str,indices[i*2+2]-1))
           )
         end
@@ -57,10 +57,10 @@ regex.gsub = function(pattern_string, str, replacement)
       currentReplacement = string.gsub(currentReplacement, "\\%d", "")
       table.insert(replacements, { indices[1], #currentReplacement+indices[1] })
       if indices[1] > 1 then
-        result = result .. 
+        result = result ..
           str:sub(1, previous_character(str, indices[1])) .. currentReplacement
       else
-        result = result .. currentReplacement      
+        result = result .. currentReplacement
       end
       str = str:sub(indices[2])
     end