Merge branch 'CommentPluginFix' into dev

Author: Neko-Box-Coder

runtime/plugins/comment/comment.lua

@@ -63,18 +63,21 @@ ft["zscript"] = "// %s"
 ft["zsh"] = "# %s"
 
 function updateCommentType(buf)
-    -- NOTE: Don't use SetOptionNative() to set "comment.type",
-    -- otherwise "comment.type" can't be reset by a "filetype" change.
-    if buf.Settings["comment.type"] == "" then
+    -- NOTE: Using DoSetOptionNative to avoid LocalSettings[option] = true
+    -- so that "comment.type" can be reset by a "filetype" change to default.
+    if (buf.Settings["comment.type"] == "") then
+        -- NOTE: This won't get triggered if a filetype is change via `setlocal filetype`
+        -- since it is not registered with `RegisterGlobalOption()``
         if buf.Settings["commenttype"] ~= nil then
             micro.InfoBar():Error("\"commenttype\" option has been renamed to \"comment.type\"",
                                   ", please update your configuration")
-        end
-
-        if ft[buf.Settings["filetype"]] ~= nil then
-            buf.Settings["comment.type"] = ft[buf.Settings["filetype"]]
+            buf:DoSetOptionNative("comment.type", buf.Settings["commenttype"])
         else
-            buf.Settings["comment.type"] = "# %s"
+            if (ft[buf.Settings["filetype"]] ~= nil) then
+                buf:DoSetOptionNative("comment.type", ft[buf.Settings["filetype"]])
+            else
+                buf:DoSetOptionNative("comment.type", "# %s")
+            end
         end
     end
 end

runtime/plugins/comment/help/comment.md

@@ -80,18 +80,18 @@ but it is only available for certain filetypes:
 * zsh: `# %s`
 
 If your filetype is not available here, you can simply modify
-the `commenttype` option:
+the `comment.type` option:
 
 ```
-set commenttype "/* %s */"
+set comment.type "/* %s */"
 ```
 
 Or in your `settings.json`:
 
 ```json
 {
     "*.c": {
-        "commenttype": "/* %s */"
+        "comment.type": "/* %s */"
     }
 }
 ```