.github/workflows/release.yml

@@ -9,15 +9,13 @@ on:
     inputs:
       version:
         description: Release Version
-        default: v2.1.4
+        default: v2.1.3
         required: true
 
 jobs:
   release:
     name: Create Release
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
       version: ${{ steps.tag.outputs.version }}

LICENSE

@@ -1,6 +1,4 @@
-Copyright (c) 2020 rxi
-Copyright (c) 2020-2022 Francesco Abbate
-Copyright (c) 2022-present Lite XL Team
+Copyright (c) 2020-present Lite XL Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

changelog.md

@@ -1,58 +1,5 @@
 # Changes Log
 
-## [2.1.4] - 2024-04-16
-
-This release addresses severe bugs not found in previous releases,
-and improves the usability of the program.
-
-### Features
-
-* Add `.pyi` extension to `language_python`.
-  ([#1728](https://github.com/lite-xl/lite-xl/pull/1728))
-
-* Improve autocomplete suggestions box behavior with long text
-  ([#1734](https://github.com/lite-xl/lite-xl/pull/1734))
-
-* Improve `CommandView` and autocomplete scroll behavior
-  ([#1732](https://github.com/lite-xl/lite-xl/pull/1732))
-
-* Add `from` symbol to support ESM
-  ([#1754](https://github.com/lite-xl/lite-xl/pull/1754))
-
-* Add Arduino syntax highlighting support in `language_cpp`
-  ([#1767](https://github.com/lite-xl/lite-xl/pull/1767))
-
-* Skip patterns matching nothing in tokenizer
-  ([#1743](https://github.com/lite-xl/lite-xl/pull/1743))
-
-### Fixes
-
-* Fix uninitialized variables in `src/api/process.c`
-  ([#1719](https://github.com/lite-xl/lite-xl/pull/1719))
-
-* Fix `language_js` regex/comment distinction
-  ([#1731](https://github.com/lite-xl/lite-xl/pull/1731))
-
-* Fix compilation on non-MINGW64 platforms
-  ([#1739](https://github.com/lite-xl/lite-xl/pull/1739))
-
-* Limit `language_js` regex avoidance to numbers, and fix starting `/*` comments
-  ([#1744](https://github.com/lite-xl/lite-xl/pull/1744))
-
-* Fix `buffer_size` in `g_read` for Windows
-  ([#1722](https://github.com/lite-xl/lite-xl/pull/1722))
-
-* Fix missing permission for creating releases
-  ([#1770](https://github.com/lite-xl/lite-xl/pull/1770))
-
-### Other Changes
-
-* Rectify LICENSE dates and owners
-  ([#1748](https://github.com/lite-xl/lite-xl/pull/1748))
-
-* Fix some typos in `core.init`
-  ([#1755](https://github.com/lite-xl/lite-xl/pull/1755))
-
 ## [2.1.3] - 2024-01-29
 
 This release addresses severe bugs not found in previous releases.
@@ -1504,7 +1451,6 @@ A new global variable `USERDIR` is exposed to point to the user's directory.
 
 - subpixel font rendering with gamma correction
 
-[2.1.4]: https://github.com/lite-xl/lite-xl/releases/tag/v2.1.4
 [2.1.3]: https://github.com/lite-xl/lite-xl/releases/tag/v2.1.3
 [2.1.2]: https://github.com/lite-xl/lite-xl/releases/tag/v2.1.2
 [2.1.1]: https://github.com/lite-xl/lite-xl/releases/tag/v2.1.1

data/core/commandview.lua

@@ -1,6 +1,5 @@
 local core = require "core"
 local common = require "core.common"
-local config = require "core.config"
 local style = require "core.style"
 local Doc = require "core.doc"
 local DocView = require "core.docview"
@@ -21,6 +20,8 @@ local CommandView = DocView:extend()
 
 CommandView.context = "application"
 
+local max_suggestions = 10
+
 local noop = function() end
 
 ---@class core.commandview.state
@@ -49,7 +50,6 @@ local default_state = {
 function CommandView:new()
   CommandView.super.new(self, SingleLineDoc())
   self.suggestion_idx = 1
-  self.suggestions_offset = 1
   self.suggestions = {}
   self.suggestions_height = 0
   self.last_change_id = 0
@@ -128,24 +128,6 @@ function CommandView:move_suggestion_idx(dir)
     end
   end
 
-  local function get_suggestions_offset()
-    local max_visible = math.min(config.max_visible_commands, #self.suggestions)
-    if dir > 0 then
-      if self.suggestions_offset + max_visible < self.suggestion_idx + 1 then
-        return self.suggestion_idx - max_visible + 1
-      elseif self.suggestions_offset > self.suggestion_idx then
-        return self.suggestion_idx
-      end
-    else
-      if self.suggestions_offset > self.suggestion_idx then
-        return self.suggestion_idx
-      elseif self.suggestions_offset + max_visible < self.suggestion_idx + 1 then
-        return self.suggestion_idx - max_visible + 1
-      end
-    end
-    return self.suggestions_offset
-  end
-
   if self.state.show_suggestions then
     local n = self.suggestion_idx + dir
     self.suggestion_idx = overflow_suggestion_idx(n, #self.suggestions)
@@ -169,8 +151,6 @@ function CommandView:move_suggestion_idx(dir)
     self.last_change_id = self.doc:get_change_id()
     self.state.suggest(self:get_text())
   end
-
-  self.suggestions_offset = get_suggestions_offset()
 end
 
 
@@ -281,7 +261,6 @@ function CommandView:update_suggestions()
   end
   self.suggestions = res
   self.suggestion_idx = 1
-  self.suggestions_offset = 1
 end
 
 
@@ -321,11 +300,11 @@ function CommandView:update()
 
   -- update suggestions box height
   local lh = self:get_suggestion_line_height()
-  local dest = self.state.show_suggestions and math.min(#self.suggestions, config.max_visible_commands) * lh or 0
+  local dest = self.state.show_suggestions and math.min(#self.suggestions, max_suggestions) * lh or 0
   self:move_towards("suggestions_height", dest, nil, "commandview")
 
   -- update suggestion cursor offset
-  local dest = (self.suggestion_idx - self.suggestions_offset + 1) * self:get_suggestion_line_height()
+  local dest = math.min(self.suggestion_idx, max_suggestions) * self:get_suggestion_line_height()
   self:move_towards("selection_offset", dest, nil, "commandview")
 
   -- update size based on whether this is the active_view
@@ -361,7 +340,6 @@ local function draw_suggestions_box(self)
   local h = math.ceil(self.suggestions_height)
   local rx, ry, rw, rh = self.position.x, self.position.y - h - dh, self.size.x, h
 
-  core.push_clip_rect(rx, ry, rw, rh)
   -- draw suggestions background
   if #self.suggestions > 0 then
     renderer.draw_rect(rx, ry, rw, rh, style.background3)
@@ -371,12 +349,14 @@ local function draw_suggestions_box(self)
   end
 
   -- draw suggestion text
-  local first = math.max(self.suggestions_offset, 1)
-  local last = math.min(self.suggestions_offset + config.max_visible_commands, #self.suggestions)
+  local offset = math.max(self.suggestion_idx - max_suggestions, 0)
+  local last = math.min(offset + max_suggestions, #self.suggestions)
+  core.push_clip_rect(rx, ry, rw, rh)
+  local first = 1 + offset
   for i=first, last do
     local item = self.suggestions[i]
     local color = (i == self.suggestion_idx) and style.accent or style.text
-    local y = self.position.y - (i - first + 1) * lh - dh
+    local y = self.position.y - (i - offset) * lh - dh
     common.draw_text(self:get_font(), color, item.text, nil, x, y, 0, lh)
 
     if item.info then

data/core/config.lua

@@ -112,12 +112,6 @@ config.max_undos = 10000
 ---@type number
 config.max_tabs = 8
 
----The maximum number of entries shown at a time in the command palette.
----
----The default is 10.
----@type integer
-config.max_visible_commands = 10
-
 ---Shows/hides the tab bar when there is only one tab open.
 ---
 ---The tab bar is always shown by default.

data/core/init.lua

@@ -572,22 +572,22 @@ local config = require "core.config"
 --
 -- Here some examples:
 --
--- "^%." matches any file of directory whose basename begins with a dot.
+-- "^%." match any file of directory whose basename begins with a dot.
 --
--- When there is an '/' or a '/$' at the end, the pattern will only match
+-- When there is an '/' or a '/$' at the end the pattern it will only match
 -- directories. When using such a pattern a final '/' will be added to the name
 -- of any directory entry before checking if it matches.
 --
 -- "^%.git/" matches any directory named ".git" anywhere in the project.
 --
--- If a "/" appears anywhere in the pattern (except when it appears at the end or
--- is immediately followed by a '$'), then the pattern will be applied to the full
+-- If a "/" appears anywhere in the pattern except if it appears at the end or
+-- is immediately followed by a '$' then the pattern will be applied to the full
 -- path of the file or directory. An initial "/" will be prepended to the file's
 -- or directory's path to indicate the project's root.
 --
 -- "^/node_modules/" will match a directory named "node_modules" at the project's root.
--- "^/build.*/" will match any top level directory whose name begins with "build".
--- "^/subprojects/.+/" will match any directory inside a top-level folder named "subprojects".
+-- "^/build.*/" match any top level directory whose name begins with "build"
+-- "^/subprojects/.+/" match any directory inside a top-level folder named "subprojects".
 
 -- You may activate some plugins on a per-project basis to override the user's settings.
 -- config.plugins.trimwitespace = true

data/core/tokenizer.lua

@@ -122,10 +122,8 @@ local function report_bad_pattern(log_fn, syntax, pattern_idx, msg, ...)
   end
   if bad_patterns[syntax][pattern_idx] then return end
   bad_patterns[syntax][pattern_idx] = true
-  log_fn("Malformed pattern #%d <%s> in %s language plugin.\n" .. msg,
-            pattern_idx,
-            syntax.patterns[pattern_idx].pattern or syntax.patterns[pattern_idx].regex,
-            syntax.name or "unnamed", ...)
+  log_fn("Malformed pattern #%d in %s language plugin. " .. msg,
+            pattern_idx, syntax.name or "unnamed", ...)
 end
 
 ---@param incoming_syntax table
@@ -339,14 +337,6 @@ function tokenizer.tokenize(incoming_syntax, text, state, resume)
     for n, p in ipairs(current_syntax.patterns) do
       local find_results = { find_text(text, p, i, true, false) }
       if find_results[1] then
-        -- Check for patterns successfully matching nothing
-        if find_results[1] > find_results[2] then
-          report_bad_pattern(core.warn, current_syntax, n,
-              "Pattern successfully matched, but nothing was captured.")
-          goto continue
-        end
-
-        -- Check for patterns with mismatching number of `types`
         local type_is_table = type(p.type) == "table"
         local n_types = type_is_table and #p.type or 1
         if #find_results == 2 and type_is_table then
@@ -360,7 +350,6 @@ function tokenizer.tokenize(incoming_syntax, text, state, resume)
           report_bad_pattern(core.warn, current_syntax, n,
             "Too many token types: got %d needed %d.", n_types, #find_results - 1)
         end
-
         -- matched pattern; make and add tokens
         push_tokens(res, current_syntax, p, text, find_results)
         -- update state if this was a start|end pattern pair
@@ -376,7 +365,6 @@ function tokenizer.tokenize(incoming_syntax, text, state, resume)
         i = find_results[2] + 1
         matched = true
         break
-        ::continue::
       end
     end
 

data/plugins/autocomplete.lua

@@ -282,14 +282,12 @@ end)
 
 
 local partial = ""
-local suggestions_offset = 1
 local suggestions_idx = 1
 local suggestions = {}
 local last_line, last_col
 
 
 local function reset_suggestions()
-  suggestions_offset = 1
   suggestions_idx = 1
   suggestions = {}
 
@@ -371,7 +369,6 @@ local function update_suggestions()
     end
   end
   suggestions_idx = 1
-  suggestions_offset = 1
 end
 
 local function get_partial_symbol()
@@ -387,10 +384,8 @@ local function get_active_view()
   end
 end
 
-local last_max_width = 0
 local function get_suggestions_rect(av)
   if #suggestions == 0 then
-    last_max_width = 0
     return 0, 0, 0, 0
   end
 
@@ -403,59 +398,45 @@ local function get_suggestions_rect(av)
   local hide_info = config.plugins.autocomplete.hide_info
   local hide_icons = config.plugins.autocomplete.hide_icons
 
-  local ah = config.plugins.autocomplete.max_height
-
-  local max_items = math.min(ah, #suggestions)
-
-  local show_count = math.min(#suggestions, ah)
-  local start_index = math.max(suggestions_idx-(ah-1), 1)
-
   local max_width = 0
-  local max_l_icon_width = 0
-  for i = start_index, start_index + show_count - 1 do
-    local s = suggestions[i]
+  for _, s in ipairs(suggestions) do
     local w = font:get_width(s.text)
     if s.info and not hide_info then
       w = w + style.font:get_width(s.info) + style.padding.x
     end
     local icon = s.icon or s.info
     if not hide_icons and icon and autocomplete.icons[icon] then
-      local icon_width = autocomplete.icons[icon].font:get_width(
+      w = w + autocomplete.icons[icon].font:get_width(
         autocomplete.icons[icon].char
-      )
-      if config.plugins.autocomplete.icon_position == "left" then
-        max_l_icon_width = math.max(max_l_icon_width, icon_width + (style.padding.x / 2))
-      end
-      w = w + icon_width + (style.padding.x / 2)
+      ) + (style.padding.x / 2)
       has_icons = true
     end
     max_width = math.max(max_width, w)
   end
-  max_width = math.max(last_max_width, max_width)
-  last_max_width = max_width
 
-  max_width = max_width + style.padding.x * 2
-  x = x - style.padding.x - max_l_icon_width
+  local ah = config.plugins.autocomplete.max_height
+
+  local max_items = #suggestions
+  if max_items > ah then
+    max_items = ah
+  end
 
   -- additional line to display total items
   max_items = max_items + 1
 
-  if max_width > core.root_view.size.x then
-    max_width = core.root_view.size.x
-  end
-  if max_width < 150 * SCALE then
-    max_width = 150 * SCALE
+  if max_width < 150 then
+    max_width = 150
   end
 
   -- if portion not visiable to right, reposition to DocView right margin
-  if x + max_width > core.root_view.size.x then
-    x = (av.size.x + av.position.x) - max_width
+  if (x - av.position.x) + max_width > av.size.x then
+    x = (av.size.x + av.position.x) - max_width - (style.padding.x * 2)
   end
 
   return
-    x,
+    x - style.padding.x,
     y - style.padding.y,
-    max_width,
+    max_width + style.padding.x * 2,
     max_items * (th + style.padding.y) + style.padding.y,
     has_icons
 end
@@ -584,8 +565,8 @@ local function draw_suggestions_box(av)
   local font = av:get_font()
   local lh = font:get_height() + style.padding.y
   local y = ry + style.padding.y / 2
-  local show_count = math.min(#suggestions, ah)
-  local start_index = suggestions_offset
+  local show_count = #suggestions <= ah and #suggestions or ah
+  local start_index = suggestions_idx > ah and (suggestions_idx-(ah-1)) or 1
   local hide_info = config.plugins.autocomplete.hide_info
 
   for i=start_index, start_index+show_count-1, 1 do
@@ -621,24 +602,11 @@ local function draw_suggestions_box(av)
       end
     end
 
-    local info_size = style.font:get_width(s.info) + style.padding.x
-
     local color = (i == suggestions_idx) and style.accent or style.text
-    -- Push clip to avoid that the suggestion text gets drawn over suggestion type/icon
-    core.push_clip_rect(rx + icon_l_padding + style.padding.x, y,
-                        rw - info_size - icon_l_padding - icon_r_padding - style.padding.x, lh)
-    local x_adv = common.draw_text(
+    common.draw_text(
       font, color, s.text, "left",
       rx + icon_l_padding + style.padding.x, y, rw, lh
     )
-    core.pop_clip_rect()
-    -- If the text wasn't fully visible, draw an ellipsis
-    if x_adv > rx + rw - info_size - icon_r_padding then
-      local ellipsis_size = font:get_width("…")
-      local ell_x = rx + rw - info_size - icon_r_padding - ellipsis_size
-      renderer.draw_rect(ell_x, y, ellipsis_size, lh, style.background3)
-      common.draw_text(font, color, "…", "left", ell_x, y, ellipsis_size, lh)
-    end
     if s.info and not hide_info then
       color = (i == suggestions_idx) and style.text or style.dim
       common.draw_text(
@@ -851,7 +819,7 @@ command.add(predicate, {
       local current_partial = get_partial_symbol()
       local sz = #current_partial
 
-      for _, line1, col1, line2, _ in doc:get_selections(true) do
+      for idx, line1, col1, line2, col2 in doc:get_selections(true) do
         local n = col1 - 1
         local line = doc.lines[line1]
         for i = 1, sz + 1 do
@@ -872,24 +840,10 @@ command.add(predicate, {
 
   ["autocomplete:previous"] = function()
     suggestions_idx = (suggestions_idx - 2) % #suggestions + 1
-
-    local ah = math.min(config.plugins.autocomplete.max_height, #suggestions)
-    if suggestions_offset > suggestions_idx then
-      suggestions_offset = suggestions_idx
-    elseif suggestions_offset + ah < suggestions_idx + 1 then
-      suggestions_offset = suggestions_idx - ah + 1
-    end
   end,
 
   ["autocomplete:next"] = function()
     suggestions_idx = (suggestions_idx % #suggestions) + 1
-
-    local ah = math.min(config.plugins.autocomplete.max_height, #suggestions)
-    if suggestions_offset + ah < suggestions_idx + 1 then
-      suggestions_offset = suggestions_idx - ah + 1
-    elseif suggestions_offset > suggestions_idx then
-      suggestions_offset = suggestions_idx
-    end
   end,
 
   ["autocomplete:cycle"] = function()

data/plugins/language_cpp.lua

@@ -5,8 +5,7 @@ syntax.add {
   name = "C++",
   files = {
     "%.h$", "%.inl$", "%.cpp$", "%.cc$", "%.C$", "%.cxx$",
-    "%.c++$", "%.hh$", "%.H$", "%.hxx$", "%.hpp$", "%.h++$",
-    "%.ino$"
+    "%.c++$", "%.hh$", "%.H$", "%.hxx$", "%.hpp$", "%.h++$"
   },
   comment = "//",
   block_comment = { "/*", "*/" },

data/plugins/language_js.lua

@@ -20,10 +20,10 @@ local syntax = require "core.syntax"
 --                                followed by pattern options, and anything that can
 --                                be after a pattern.
 --
--- Demo with some unit tests (click on the Unit Tests entry): https://regex101.com/r/Vx5L5V/1
+-- Demo with some unit tests (click on the Unit Tests entry): https://regex101.com/r/R0w8Qw/1
 -- Note that it has a couple of changes to make it work on that platform.
 local regex_pattern = {
-  [=[\/(?=(?!\/)(?:(?>[^\\[\/]++|\\.|\[(?:[^\\\]]++|\\.)*+\])*+)++\/[gmiyuvsd]*\s*(?:[\n,;\)\]\}\.]|\/[\/*]))()]=],
+  [=[/(?=(?!/)(?:(?>[^\\[\/]++|\\.|\[(?:[^\\\]]++|\\.)*+\])*+)++/[gmiyuvsd]*\s*[\n,;\)\]\}\.])()]=],
   "/()[gmiyuvsd]*", "\\"
 }
 
@@ -57,19 +57,18 @@ syntax.add {
   comment = "//",
   block_comment = { "/*", "*/" },
   patterns = {
-    { pattern = "//.*",                                               type = "comment"  },
-    { pattern = { "/%*", "%*/" },                                     type = "comment"  },
-    { regex = regex_pattern, syntax = inner_regex_syntax,             type = {"string", "string"}  },
-    { pattern = { '"', '"', '\\' },                                   type = "string"   },
-    { pattern = { "'", "'", '\\' },                                   type = "string"   },
-    { pattern = { "`", "`", '\\' },                                   type = "string"   },
-    -- Use (?:\/(?!\/|\*))? to avoid that a regex can start after a number, while also allowing // and /* comments
-    { regex   = [[-?0[xXbBoO][\da-fA-F_]+n?()\s*()(?:\/(?!\/|\*))?]], type = {"number", "normal", "operator"}   },
-    { regex   = [[-?\d+[0-9.eE_n]*()\s*()(?:\/(?!\/|\*))?]],          type = {"number", "normal", "operator"}   },
-    { regex   = [[-?\.?\d+()\s*()(?:\/(?!\/|\*))?]],                  type = {"number", "normal", "operator"}   },
-    { pattern = "[%+%-=/%*%^%%<>!~|&]",                               type = "operator" },
-    { pattern = "[%a_][%w_]*%f[(]",                                   type = "function" },
-    { pattern = "[%a_][%w_]*",                                        type = "symbol"   },
+    { pattern = "//.*",                                   type = "comment"  },
+    { pattern = { "/%*", "%*/" },                         type = "comment"  },
+    { regex = regex_pattern, syntax = inner_regex_syntax, type = {"string", "string"}  },
+    { pattern = { '"', '"', '\\' },                       type = "string"   },
+    { pattern = { "'", "'", '\\' },                       type = "string"   },
+    { pattern = { "`", "`", '\\' },                       type = "string"   },
+    { pattern = "-?0[xXbBoO][%da-fA-F_]+n?()%s*()/?",     type = {"number", "normal", "operator"}   },
+    { pattern = "-?%d+[%d%.eE_n]*()%s*()/?",              type = {"number", "normal", "operator"}   },
+    { pattern = "-?%.?%d+()%s*()/?",                      type = {"number", "normal", "operator"}   },
+    { pattern = "[%+%-=/%*%^%%<>!~|&]",                   type = "operator" },
+    { pattern = "[%a_][%w_]*%f[(]",                       type = "function" },
+    { pattern = "[%a_][%w_]*()%s*()/?",                   type = {"symbol", "normal", "operator"}   },
   },
   symbols = {
     ["async"]      = "keyword",
@@ -93,7 +92,6 @@ syntax.add {
     ["get"]        = "keyword",
     ["if"]         = "keyword",
     ["import"]     = "keyword",
-    ["from"]       = "keyword",    
     ["in"]         = "keyword",
     ["of"]         = "keyword",
     ["instanceof"] = "keyword",

data/plugins/language_python.lua

@@ -3,7 +3,7 @@ local syntax = require "core.syntax"
 
 syntax.add {
   name = "Python",
-  files = { "%.py$", "%.pyw$", "%.rpy$", "%.pyi$" },
+  files = { "%.py$", "%.pyw$", "%.rpy$" },
   headers = "^#!.*[ /]python",
   comment = "#",
   block_comment = { '"""', '"""' },

meson.build

@@ -1,6 +1,6 @@
 project('lite-xl',
     ['c'],
-    version : '2.1.4',
+    version : '2.1.3',
     license : 'MIT',
     meson_version : '>= 0.56',
     default_options : [

resources/linux/com.lite_xl.LiteXL.appdata.xml

@@ -29,6 +29,6 @@
   </provides>
 
   <releases>
-    <release version="2.1.4" date="2024-04-16" />
+    <release version="2.1.3" date="2024-01-29" />
   </releases>
 </component>

scripts/common.sh

@@ -77,17 +77,11 @@ get_platform_arch() {
   platform=$(get_platform_name)
   arch=${CROSS_ARCH:-$(uname -m)}
   if [[ $MSYSTEM != "" ]]; then
-    case "$MSYSTEM" in
-      MINGW64|UCRT64|CLANG64)
+    if [[ $MSYSTEM == "MINGW64" ]]; then
       arch=x86_64
-      ;;
-      MINGW32|CLANG32)
+    else
       arch=i686
-      ;;
-      CLANGARM64)
-      arch=aarch64
-      ;;
-    esac
+    fi
   fi
   echo "$arch"
 }

scripts/innosetup/innosetup.sh

@@ -29,24 +29,13 @@ main() {
   local version
   local output
 
-  case "$MSYSTEM" in
-    MINGW64|UCRT64|CLANG64)
+  if [[ $MSYSTEM == "MINGW64" ]]; then
     arch=x64
     arch_file=x86_64
-    ;;
-    MINGW32|CLANG32)
-    arch=x86
+  else
+    arch=i686;
     arch_file=i686
-    ;;
-    CLANGARM64)
-    arch=arm64
-    arch_file=aarch64
-    ;;
-    *)
-    echo "error: unsupported MSYSTEM type: $MSYSTEM"
-    exit 1
-    ;;
-  esac
+  fi
 
   initial_arg_count=$#
 

scripts/package.sh

@@ -213,18 +213,14 @@ main() {
     if [[ $platform == "windows" ]]; then
       exe_file="${exe_file}.exe"
       stripcmd="strip --strip-all"
-      if command -v ntldd >/dev/null 2>&1; then
-        # Copy MinGW libraries dependencies.
-        # MSYS2 ldd command seems to be only 64bit, so use ntldd
-        # see https://github.com/msys2/MINGW-packages/issues/4164
-        ntldd -R "${exe_file}" \
-          | grep mingw \
-          | awk '{print $3}' \
-          | sed 's#\\#/#g' \
-          | xargs -I '{}' cp -v '{}' "$(pwd)/${dest_dir}/"
-      else
-        echo "WARNING: ntldd not found; assuming program is static"
-      fi
+      # Copy MinGW libraries dependencies.
+      # MSYS2 ldd command seems to be only 64bit, so use ntldd
+      # see https://github.com/msys2/MINGW-packages/issues/4164
+      ntldd -R "${exe_file}" \
+        | grep mingw \
+        | awk '{print $3}' \
+        | sed 's#\\#/#g' \
+        | xargs -I '{}' cp -v '{}' "$(pwd)/${dest_dir}/"
     else
       # Windows archive is always portable
       package_name+="-portable"

src/api/dirmonitor/inodewatcher.cpp

@@ -1,75 +0,0 @@
-#include <AK/NumericLimits.h>
-#include <Kernel/API/InodeWatcherEvent.h>
-#include <Kernel/API/InodeWatcherFlags.h>
-#include <cstring>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
-
-extern "C" {
-struct dirmonitor_internal* init_dirmonitor();
-void deinit_dirmonitor(struct dirmonitor_internal*);
-int get_changes_dirmonitor(struct dirmonitor_internal*, char*, int);
-int translate_changes_dirmonitor(struct dirmonitor_internal*, char*, int, int (*)(int, const char*, void*), void*);
-int add_dirmonitor(struct dirmonitor_internal*, const char*);
-void remove_dirmonitor(struct dirmonitor_internal*, int);
-int get_mode_dirmonitor();
-}
-
-struct dirmonitor_internal {
-  int fd;
-  // a pipe is used to wake the thread in case of exit
-  int sig[2];
-};
-
-
-struct dirmonitor_internal* init_dirmonitor() {
-  struct dirmonitor_internal* monitor = (struct dirmonitor_internal*)calloc(sizeof(struct dirmonitor_internal), 1);
-  monitor->fd = create_inode_watcher(0);
-  pipe(monitor->sig);
-  fcntl(monitor->sig[0], F_SETFD, FD_CLOEXEC);
-  fcntl(monitor->sig[1], F_SETFD, FD_CLOEXEC);
-  return monitor;
-}
-
-
-void deinit_dirmonitor(struct dirmonitor_internal* monitor) {
-  close(monitor->fd);
-  close(monitor->sig[0]);
-  close(monitor->sig[1]);
-}
-
-
-
-int get_changes_dirmonitor(struct dirmonitor_internal* monitor, char* buffer, int length) {
-  struct pollfd fds[2] = { { .fd = monitor->fd, .events = POLLIN | POLLERR, .revents = 0 }, { .fd = monitor->sig[0], .events = POLLIN | POLLERR, .revents = 0 } };
-  poll(fds, 2, -1);
-  return read(monitor->fd, buffer, length);
-}
-
-
-int translate_changes_dirmonitor(struct dirmonitor_internal* monitor, char* buffer, int length, int (*change_callback)(int, const char*, void*), void* data) {
-  InodeWatcherEvent* event = (InodeWatcherEvent*)buffer;
-  change_callback(event->watch_descriptor, NULL, data);
-  return 0;
-}
-
-
-int add_dirmonitor(struct dirmonitor_internal* monitor, const char* path) {
-  return inode_watcher_add_watch(monitor->fd, path, strlen(path),
-      static_cast<unsigned>(
-        InodeWatcherEvent::Type::MetadataModified |
-        InodeWatcherEvent::Type::ContentModified |
-        InodeWatcherEvent::Type::Deleted |
-        InodeWatcherEvent::Type::ChildCreated |
-        InodeWatcherEvent::Type::ChildDeleted
-      ));
-}
-
-
-void remove_dirmonitor(struct dirmonitor_internal* monitor, int fd) {
-  inode_watcher_remove_watch(monitor->fd, fd);
-}
-
-int get_mode_dirmonitor() { return 2; }

src/api/process.c

@@ -851,7 +851,7 @@ static int g_read(lua_State* L, int stream, unsigned long read_size) {
     return luaL_error(L, "error: redirect to handles, FILE* and paths are not supported");
   #if _WIN32
     int writable_stream_idx = stream - 1;
-    if (self->reading[writable_stream_idx] || !ReadFile(self->child_pipes[stream][0], self->buffer[writable_stream_idx], read_size > READ_BUF_SIZE ? READ_BUF_SIZE : read_size, NULL, &self->overlapped[writable_stream_idx])) {
+    if (self->reading[writable_stream_idx] || !ReadFile(self->child_pipes[stream][0], self->buffer[writable_stream_idx], READ_BUF_SIZE, NULL, &self->overlapped[writable_stream_idx])) {
       if (self->reading[writable_stream_idx] || GetLastError() == ERROR_IO_PENDING) {
         self->reading[writable_stream_idx] = true;
         DWORD bytesTransferred = 0;

src/main.c

@@ -9,7 +9,7 @@
 
 #ifdef _WIN32
   #include <windows.h>
-#elif defined(__linux__) || defined(__serenity__)
+#elif defined(__linux__)
   #include <unistd.h>
 #elif defined(__APPLE__)
   #include <mach-o/dyld.h>
@@ -34,7 +34,7 @@ static void get_exe_filename(char *buf, int sz) {
   } else {
     buf[0] = '\0';
   }
-#elif __linux__ || __serenity__
+#elif __linux__
   char path[] = "/proc/self/exe";
   ssize_t len = readlink(path, buf, sz - 1);
   if (len > 0)
@@ -110,9 +110,6 @@ void set_macos_bundle_resources(lua_State *L);
     #define ARCH_PLATFORM "freebsd"
   #elif __APPLE__
     #define ARCH_PLATFORM "darwin"
-  #elif __serenity__
-    #define ARCH_PLATFORM "serenity"
-  #else
   #endif
 
   #if !defined(ARCH_PROCESSOR) || !defined(ARCH_PLATFORM)

src/meson.build

@@ -11,31 +11,20 @@ lite_sources = [
     'main.c',
 ]
 
-lite_sources += 'api/dirmonitor.c'
 # dirmonitor backend
 if get_option('dirmonitor_backend') == ''
     if cc.has_function('inotify_init', prefix : '#include<sys/inotify.h>')
         dirmonitor_backend = 'inotify'
-        lite_sources += 'api/dirmonitor/inotify.c'
     elif host_machine.system() == 'darwin' and cc.check_header('CoreServices/CoreServices.h')
         dirmonitor_backend = 'fsevents'
-        lite_sources += 'api/dirmonitor/fsevents.c'
     elif cc.has_function('kqueue', prefix : '#include<sys/event.h>')
         dirmonitor_backend = 'kqueue'
-        lite_sources += 'api/dirmonitor/kqueue.c'
-    elif cc.has_function('create_inode_watcher', prefix : '#include<fcntl.h>')
-        dirmonitor_backend = 'inodewatcher'
-        add_languages('cpp')
-        lite_sources += 'api/dirmonitor/inodewatcher.cpp'
     elif dependency('libkqueue', required : false).found()
         dirmonitor_backend = 'kqueue'
-        lite_sources += 'api/dirmonitor/kqueue.c'
     elif host_machine.system() == 'windows'
         dirmonitor_backend = 'win32'
-        lite_sources += 'api/dirmonitor/win32.c'
     else
         dirmonitor_backend = 'dummy'
-        lite_sources += 'api/dirmonitor/dummy.c'
         warning('no suitable backend found, defaulting to dummy backend')
     endif
 else
@@ -51,6 +40,12 @@ if dirmonitor_backend == 'kqueue'
     endif
 endif
 
+lite_sources += [
+    'api/dirmonitor.c',
+    'api/dirmonitor/' + dirmonitor_backend + '.c',
+]
+
+
 lite_rc = []
 if host_machine.system() == 'windows'
     windows = import('windows')