Added 'scintillua.comment.[lang]' property for parent lexers with chi…

…ldren. Editors can use this for toggling comments.
orbitalquark · Dec 22, 2022 · c6acb54 · c6acb54
1 parent 994990f
commit c6acb54
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Scintillua.cxx b/Scintillua.cxx
@@ -167,8 +167,10 @@ int lexer_field_newindex(lua_State *L) {
   lua_getfield(L, LUA_REGISTRYINDEX, "scintillua"); // REGISTRY.scintillua
   const auto lexer = reinterpret_cast<Scintillua *>(lua_touserdata(L, -1));
   if (field == "property") {
-    static constexpr const char *validKeys[] = {"scintillua.comment", "scintillua.angle.braces"};
-    luaL_checkoption(L, 2, nullptr, validKeys);
+    if (strncmp(lua_tostring(L, 2), "scintillua.comment.", strlen("scintillua.comment.")) != 0) {
+      static constexpr const char *validKeys[] = {"scintillua.comment", "scintillua.angle.braces"};
+      luaL_checkoption(L, 2, nullptr, validKeys);
+    }
     lexer->PropertySet(luaL_checkstring(L, 2), luaL_checkstring(L, 3));
   } else if (field == "line_state") {
     if (lua_getfield(L, LUA_REGISTRYINDEX, "buffer") != LUA_TLIGHTUSERDATA) // REGISTRY.buffer

diff --git a/lexers/lexer.lua b/lexers/lexer.lua
@@ -1556,6 +1556,8 @@ function M.load(name, alt_name)
     lexer._parent_name, lexer._name = lexer._name, alt_name or name
   end
 
+  M.property['scintillua.comment.' .. (alt_name or name)] = M.property['scintillua.comment']
+
   return lexer
 end