From 978e5ba0e70cc5fbfe7575e4b1ac8834ce10f97d Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Thu, 16 Apr 2020 23:48:33 -0400
Subject: Handle more Scintilla constants that need to be incremented by one.

---
 scripts/gen_iface.lua | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/gen_iface.lua b/scripts/gen_iface.lua
index f8386e84..edd48e1d 100755
--- a/scripts/gen_iface.lua
+++ b/scripts/gen_iface.lua
@@ -19,11 +19,8 @@ local ignores = { -- constants to ignore
   '^SCLEX_', '^UNDO_MAY_COALESCE'
 }
 local increments = { -- constants to increment by one
-  'MARKER_MAX', 'MAX_MARGIN', 'STYLE_MAX', 'INDIC_CONTAINER', 'INDIC_IME',
-  'INDIC_IME_MAX', 'INDIC_MAX', 'INDICATOR_CONTAINER', 'INDICATOR_IME',
-  'INDICATOR_IME_MAX', 'INDICATOR_MAX'
+  '^MARKER_MAX', '^MARKNUM_', '^MAX_MARGIN', '^STYLE_', '^INDICATOR_'
 }
-for _, v in ipairs(increments) do increments[v] = true end
 local changed_setter = {} -- holds properties changed to setter functions
 local function to_lua_name(camel_case)
   return camel_case:gsub('([a-z])([A-Z])', '%1_%2'):
@@ -45,8 +42,10 @@ for line in io.lines('../src/scintilla/include/Scintilla.iface') do
     if name == 'FIND_REGEXP' then
       value = tostring(tonumber(value) + 2^23) -- add SCFIND_CXX11REGEX
       value = value:gsub('%.0$', '') -- Lua 5.3+ may append this
-    elseif increments[name] or name:find('^MARKNUM') then
-      value = tonumber(value) + 1
+    else
+      for i = 1, #increments do
+        if name:find(increments[i]) then value = tonumber(value) + 1 end
+      end
     end
     constants[#constants + 1] = string.format('%s=%s', name, value)
   elseif line:find('^evt ') then
-- 
cgit v1.2.3